@friggframework/devtools 2.0.0--canary.490.97a854f.0 → 2.0.0--canary.490.9b2c8b2.0

package/infrastructure/domains/networking/vpc-builder.js

@@ -162,21 +162,24 @@ class VpcBuilder extends InfrastructureBuilder {
                 } else if (logicalId === 'FriggLambdaRouteTable') {
                     resourceType = 'AWS::EC2::RouteTable';
                     physicalId = flatDiscovery.routeTableId;
-                } else if (logicalId === 'FriggS3VPCEndpoint') {
+                } else if (logicalId === 'FriggS3VPCEndpoint' || logicalId === 'VPCEndpointS3') {
                     resourceType = 'AWS::EC2::VPCEndpoint';
                     physicalId = flatDiscovery.s3VpcEndpointId;
-                } else if (logicalId === 'FriggDynamoDBVPCEndpoint') {
+                } else if (logicalId === 'FriggDynamoDBVPCEndpoint' || logicalId === 'VPCEndpointDynamoDB') {
                     resourceType = 'AWS::EC2::VPCEndpoint';
                     physicalId = flatDiscovery.dynamodbVpcEndpointId;
-                } else if (logicalId === 'FriggKMSVPCEndpoint') {
+                } else if (logicalId === 'FriggKMSVPCEndpoint' || logicalId === 'VPCEndpointKMS') {
                     resourceType = 'AWS::EC2::VPCEndpoint';
                     physicalId = flatDiscovery.kmsVpcEndpointId;
-                } else if (logicalId === 'FriggSecretsManagerVPCEndpoint') {
+                } else if (logicalId === 'FriggSecretsManagerVPCEndpoint' || logicalId === 'VPCEndpointSecretsManager') {
                     resourceType = 'AWS::EC2::VPCEndpoint';
                     physicalId = flatDiscovery.secretsManagerVpcEndpointId;
-                } else if (logicalId === 'FriggSQSVPCEndpoint') {
+                } else if (logicalId === 'FriggSQSVPCEndpoint' || logicalId === 'VPCEndpointSQS') {
                     resourceType = 'AWS::EC2::VPCEndpoint';
                     physicalId = flatDiscovery.sqsVpcEndpointId;
+                } else if (logicalId === 'FriggNATRoute' || logicalId === 'FriggPrivateRoute') {
+                    resourceType = 'AWS::EC2::Route';
+                    physicalId = flatDiscovery.natRoute;
                 }
 
                 if (physicalId && typeof physicalId === 'string') {

package/infrastructure/domains/networking/vpc-builder.test.js

@@ -1535,6 +1535,47 @@ describe('VpcBuilder', () => {
             // Route table should still be created
             expect(result.resources.FriggLambdaRouteTable).toBeDefined();
         });
+
+        it('should convert OLD logical IDs to structured discovery stackManaged array', () => {
+            // TDD test: Verify that VPCEndpointS3 in existingLogicalIds gets added to stackManaged
+            const flatDiscovery = {
+                fromCloudFormationStack: true,
+                stackName: 'create-frigg-app-production',
+                existingLogicalIds: [
+                    'VPCEndpointS3',        // OLD naming
+                    'VPCEndpointDynamoDB',  // OLD naming
+                    'FriggNATRoute'         // OLD naming
+                ],
+                s3VpcEndpointId: 'vpce-0352ceac2124c14be',
+                dynamodbVpcEndpointId: 'vpce-0b06c4f631199ea68',
+                natRoute: 'rtb-xxx|0.0.0.0/0'
+            };
+
+            const structured = vpcBuilder.convertFlatDiscoveryToStructured(flatDiscovery);
+
+            // CRITICAL: Old logical IDs should be in stackManaged array
+            expect(structured.stackManaged).toContainEqual(
+                expect.objectContaining({
+                    logicalId: 'VPCEndpointS3',
+                    physicalId: 'vpce-0352ceac2124c14be',
+                    resourceType: 'AWS::EC2::VPCEndpoint'
+                })
+            );
+            expect(structured.stackManaged).toContainEqual(
+                expect.objectContaining({
+                    logicalId: 'VPCEndpointDynamoDB',
+                    physicalId: 'vpce-0b06c4f631199ea68',
+                    resourceType: 'AWS::EC2::VPCEndpoint'
+                })
+            );
+            expect(structured.stackManaged).toContainEqual(
+                expect.objectContaining({
+                    logicalId: 'FriggNATRoute',
+                    physicalId: 'rtb-xxx|0.0.0.0/0',
+                    resourceType: 'AWS::EC2::Route'
+                })
+            );
+        });
     });
 
     describe('convertFlatDiscoveryToStructured - Direct Properties', () => {

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

@@ -163,6 +163,9 @@ class CloudFormationDiscovery {
                         const associations = routeTable.Associations || [];
                         const subnetAssociations = associations.filter(a => a.SubnetId);
                         
+                        console.log(`  DEBUG: Route table has ${associations.length} associations, ${subnetAssociations.length} with SubnetId`);
+                        console.log(`  DEBUG: discovered.privateSubnetId1 = ${discovered.privateSubnetId1}, discovered.privateSubnetId2 = ${discovered.privateSubnetId2}`);
+                        
                         if (subnetAssociations.length >= 1 && !discovered.privateSubnetId1) {
                             discovered.privateSubnetId1 = subnetAssociations[0].SubnetId;
                             console.log(`  ✓ Extracted private subnet 1 from associations: ${subnetAssociations[0].SubnetId}`);

package/package.json

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