@friggframework/devtools 2.0.0--canary.490.eec7dcd.0 → 2.0.0--canary.490.7d57f02.0

package/infrastructure/domains/shared/cloudformation-discovery.js

@@ -111,6 +111,74 @@ class CloudFormationDiscovery {
         }
     }
 
+    /**
+     * Extract external resource references from stack resource properties
+     * 
+     * When VPC/subnets/NAT are external, they're referenced in routing resources' properties.
+     * We query EC2 to get the actual VPC ID, NAT Gateway ID, and subnet IDs from the route table.
+     * 
+     * @private
+     * @param {string} stackName - Stack name  
+     * @param {Array} resources - CloudFormation stack resources
+     * @param {Object} discovered - Object to populate with discovered resources
+     */
+    async _extractExternalReferencesFromStackResources(stackName, resources, discovered) {
+        if (!this.provider || !this.provider.getEC2Client) {
+            console.log('  ℹ Skipping external reference extraction (EC2 client not available)');
+            return;
+        }
+
+        try {
+            // If we found a route table in the stack, query EC2 for its details
+            // This gives us VPC ID, NAT Gateway ID, and subnet IDs
+            if (discovered.routeTableId) {
+                try {
+                    console.log(`  ℹ Querying route table ${discovered.routeTableId} for external references...`);
+                    const { DescribeRouteTablesCommand } = require('@aws-sdk/client-ec2');
+                    const ec2 = this.provider.getEC2Client();
+                    const rtResponse = await ec2.send(new DescribeRouteTablesCommand({
+                        RouteTableIds: [discovered.routeTableId]
+                    }));
+                    
+                    if (rtResponse.RouteTables && rtResponse.RouteTables.length > 0) {
+                        const routeTable = rtResponse.RouteTables[0];
+                        
+                        // Extract VPC ID
+                        if (routeTable.VpcId && !discovered.defaultVpcId) {
+                            discovered.defaultVpcId = routeTable.VpcId;
+                            console.log(`  ✓ Extracted VPC ID from route table: ${routeTable.VpcId}`);
+                        }
+                        
+                        // Extract NAT Gateway ID from routes
+                        const natRoute = routeTable.Routes?.find(r => r.NatGatewayId);
+                        if (natRoute && natRoute.NatGatewayId && !discovered.natGatewayId) {
+                            discovered.natGatewayId = natRoute.NatGatewayId;
+                            discovered.existingNatGatewayId = natRoute.NatGatewayId;
+                            console.log(`  ✓ Extracted NAT Gateway ID from routes: ${natRoute.NatGatewayId}`);
+                        }
+                        
+                        // Extract subnet IDs from route table associations
+                        const associations = routeTable.Associations || [];
+                        const subnetAssociations = associations.filter(a => a.SubnetId);
+                        
+                        if (subnetAssociations.length >= 1 && !discovered.privateSubnetId1) {
+                            discovered.privateSubnetId1 = subnetAssociations[0].SubnetId;
+                            console.log(`  ✓ Extracted private subnet 1 from associations: ${subnetAssociations[0].SubnetId}`);
+                        }
+                        if (subnetAssociations.length >= 2 && !discovered.privateSubnetId2) {
+                            discovered.privateSubnetId2 = subnetAssociations[1].SubnetId;
+                            console.log(`  ✓ Extracted private subnet 2 from associations: ${subnetAssociations[1].SubnetId}`);
+                        }
+                    }
+                } catch (error) {
+                    console.warn(`  ⚠️  Could not query route table for external references: ${error.message}`);
+                }
+            }
+        } catch (error) {
+            console.warn(`  ⚠️  Error extracting external references: ${error.message}`);
+        }
+    }
+
     /**
      * Extract discovered resources from CloudFormation stack resources
      *
@@ -342,6 +410,10 @@ class CloudFormationDiscovery {
             }
         }
 
+        // Extract VPC ID and other external references from routing resource properties
+        // This handles the pattern where VPC is external but routing is in the stack
+        await this._extractExternalReferencesFromStackResources(stackName, resources, discovered);
+
         // If we have a VPC ID but no subnet IDs, query EC2 for Frigg-managed subnets
         if (discovered.defaultVpcId && this.provider &&
             !discovered.privateSubnetId1 && !discovered.publicSubnetId1) {

package/infrastructure/domains/shared/providers/aws-provider-adapter.js

@@ -536,6 +536,29 @@ class AWSProviderAdapter extends CloudProviderAdapter {
             return [];
         }
     }
+
+    /**
+     * Describe a specific stack resource to get its full details including properties
+     * @param {string} stackName - Stack name
+     * @param {string} logicalResourceId - Logical resource ID
+     * @returns {Promise<Object>} Resource details
+     */
+    async describeStackResource(stackName, logicalResourceId) {
+        const cf = this.getCloudFormationClient();
+        
+        try {
+            const { DescribeStackResourceCommand } = require('@aws-sdk/client-cloudformation');
+            const response = await cf.send(new DescribeStackResourceCommand({
+                StackName: stackName,
+                LogicalResourceId: logicalResourceId,
+            }));
+            
+            return response.StackResourceDetail || null;
+        } catch (error) {
+            console.warn(`Failed to describe stack resource ${logicalResourceId}:`, error.message);
+            return null;
+        }
+    }
 }
 
 module.exports = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.490.eec7dcd.0",
+  "version": "2.0.0--canary.490.7d57f02.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -16,9 +16,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.490.eec7dcd.0",
-    "@friggframework/schemas": "2.0.0--canary.490.eec7dcd.0",
-    "@friggframework/test": "2.0.0--canary.490.eec7dcd.0",
+    "@friggframework/core": "2.0.0--canary.490.7d57f02.0",
+    "@friggframework/schemas": "2.0.0--canary.490.7d57f02.0",
+    "@friggframework/test": "2.0.0--canary.490.7d57f02.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -46,8 +46,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.490.eec7dcd.0",
-    "@friggframework/prettier-config": "2.0.0--canary.490.eec7dcd.0",
+    "@friggframework/eslint-config": "2.0.0--canary.490.7d57f02.0",
+    "@friggframework/prettier-config": "2.0.0--canary.490.7d57f02.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eec7dcdaf12585353103eb99ebc141dfa60a6743"
+  "gitHead": "7d57f02625ea51ce9dadd5e1535aac1c4491b9da"
 }