@friggframework/devtools 2.0.0--canary.490.9b2c8b2.0 → 2.0.0--canary.490.b93c127.0

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

@@ -164,6 +164,7 @@ class CloudFormationDiscovery {
                         const subnetAssociations = associations.filter(a => a.SubnetId);
                         
                         console.log(`  DEBUG: Route table has ${associations.length} associations, ${subnetAssociations.length} with SubnetId`);
+                        console.log(`  DEBUG: Route table structure:`, JSON.stringify(routeTable, null, 2).substring(0, 500));
                         console.log(`  DEBUG: discovered.privateSubnetId1 = ${discovered.privateSubnetId1}, discovered.privateSubnetId2 = ${discovered.privateSubnetId2}`);
                         
                         if (subnetAssociations.length >= 1 && !discovered.privateSubnetId1) {
@@ -371,6 +372,18 @@ class CloudFormationDiscovery {
                 }
                 discovered.routeTableAssociations.push(PhysicalResourceId);
                 console.log(`  ✓ Found route table association: ${LogicalResourceId}`);
+                
+                // CRITICAL: Extract subnet ID from association physical ID by querying EC2
+                // Physical ID is the association ID (rtbassoc-xxx), need to query to get subnet
+                if (this.provider && this.provider.getEC2Client && 
+                    (LogicalResourceId === 'FriggSubnet1RouteAssociation' || LogicalResourceId === 'FriggPrivateSubnet1RouteTableAssociation')) {
+                    // Store association ID to query later (after loop)
+                    discovered._subnet1AssociationId = PhysicalResourceId;
+                }
+                if (this.provider && this.provider.getEC2Client && 
+                    (LogicalResourceId === 'FriggSubnet2RouteAssociation' || LogicalResourceId === 'FriggPrivateSubnet2RouteTableAssociation')) {
+                    discovered._subnet2AssociationId = PhysicalResourceId;
+                }
             }
 
             // VPC - direct extraction (primary method)
@@ -545,6 +558,66 @@ class CloudFormationDiscovery {
             }
         }
 
+        // Extract subnet IDs from route table associations (if route table query didn't populate them)
+        // Query EC2 to describe the association and get the subnet ID
+        console.log(`  DEBUG: Checking subnet association extraction - _subnet1AssociationId: ${discovered._subnet1AssociationId}, _subnet2AssociationId: ${discovered._subnet2AssociationId}`);
+        
+        if (!discovered.privateSubnetId1 && discovered._subnet1AssociationId && this.provider && this.provider.getEC2Client) {
+            try {
+                console.log(`  Querying EC2 for subnet from association ${discovered._subnet1AssociationId}...`);
+                const { DescribeRouteTablesCommand } = require('@aws-sdk/client-ec2');
+                const ec2 = this.provider.getEC2Client();
+                
+                // Query route table by association ID to get subnet
+                const rtResponse = await ec2.send(new DescribeRouteTablesCommand({
+                    Filters: [
+                        { Name: 'association.association-id', Values: [discovered._subnet1AssociationId] }
+                    ]
+                }));
+                
+                if (rtResponse.RouteTables && rtResponse.RouteTables[0]) {
+                    const assoc = rtResponse.RouteTables[0].Associations.find(a => 
+                        a.RouteTableAssociationId === discovered._subnet1AssociationId
+                    );
+                    if (assoc && assoc.SubnetId) {
+                        discovered.privateSubnetId1 = assoc.SubnetId;
+                        console.log(`  ✓ Extracted private subnet 1 from association query: ${assoc.SubnetId}`);
+                    }
+                }
+            } catch (error) {
+                console.warn(`  ⚠️  Could not query subnet from association: ${error.message}`);
+            }
+        }
+
+        if (!discovered.privateSubnetId2 && discovered._subnet2AssociationId && this.provider && this.provider.getEC2Client) {
+            try {
+                const { DescribeRouteTablesCommand } = require('@aws-sdk/client-ec2');
+                const ec2 = this.provider.getEC2Client();
+                
+                const rtResponse = await ec2.send(new DescribeRouteTablesCommand({
+                    Filters: [
+                        { Name: 'association.association-id', Values: [discovered._subnet2AssociationId] }
+                    ]
+                }));
+                
+                if (rtResponse.RouteTables && rtResponse.RouteTables[0]) {
+                    const assoc = rtResponse.RouteTables[0].Associations.find(a => 
+                        a.RouteTableAssociationId === discovered._subnet2AssociationId
+                    );
+                    if (assoc && assoc.SubnetId) {
+                        discovered.privateSubnetId2 = assoc.SubnetId;
+                        console.log(`  ✓ Extracted private subnet 2 from association query: ${assoc.SubnetId}`);
+                    }
+                }
+            } catch (error) {
+                console.warn(`  ⚠️  Could not query subnet from association: ${error.message}`);
+            }
+        }
+
+        // Clean up temporary association IDs
+        delete discovered._subnet1AssociationId;
+        delete discovered._subnet2AssociationId;
+
         // Check for KMS key alias via AWS API if not found in stack resources
         // This handles cases where the alias was created outside CloudFormation
         if (!discovered.defaultKmsKeyId && !discovered.kmsKeyAlias &&

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.490.9b2c8b2.0",
+  "version": "2.0.0--canary.490.b93c127.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.9b2c8b2.0",
-    "@friggframework/schemas": "2.0.0--canary.490.9b2c8b2.0",
-    "@friggframework/test": "2.0.0--canary.490.9b2c8b2.0",
+    "@friggframework/core": "2.0.0--canary.490.b93c127.0",
+    "@friggframework/schemas": "2.0.0--canary.490.b93c127.0",
+    "@friggframework/test": "2.0.0--canary.490.b93c127.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.9b2c8b2.0",
-    "@friggframework/prettier-config": "2.0.0--canary.490.9b2c8b2.0",
+    "@friggframework/eslint-config": "2.0.0--canary.490.b93c127.0",
+    "@friggframework/prettier-config": "2.0.0--canary.490.b93c127.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": "9b2c8b2f68fb28726197404adf9531f5f6e0b229"
+  "gitHead": "b93c1271110aaecf2fb36d5b9b39d35fad1c4dc5"
 }