@friggframework/devtools 2.0.0--canary.461.44b70fc.0 → 2.0.0--canary.461.e679ea5.0

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

@@ -148,8 +148,8 @@ class VpcBuilder extends InfrastructureBuilder {
                 break;
         }
 
-        // Build subnets
-        await this.buildSubnets(appDefinition, discoveredResources, result);
+        // Build subnets - pass normalized management mode for correct CIDR generation
+        await this.buildSubnets(appDefinition, discoveredResources, result, management);
 
         // Build NAT Gateway if needed
         await this.buildNatGateway(appDefinition, discoveredResources, result);
@@ -385,9 +385,9 @@ class VpcBuilder extends InfrastructureBuilder {
 
     /**
      * Build subnet infrastructure
+     * @param {Object} vpcManagement - Normalized VPC management mode (passed from build() to ensure consistency)
      */
-    async buildSubnets(appDefinition, discoveredResources, result) {
-        const vpcManagement = appDefinition.vpc.management || 'discover';
+    async buildSubnets(appDefinition, discoveredResources, result, vpcManagement) {
         // Default subnet management depends on context:
         // - use-existing mode with subnet IDs provided: use-existing
         // - create-new mode: create

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

@@ -855,11 +855,20 @@ describe('VpcBuilder', () => {
             // Should create new VPC (ignore discovered resources)
             expect(result.vpcId).toEqual({ Ref: 'FriggVPC' });
             expect(result.resources.FriggVPC).toBeDefined();
+            expect(result.resources.FriggVPC.Properties.CidrBlock).toBe('10.0.0.0/16');
             
-            // Should create stage-specific subnets
+            // Should create stage-specific subnets with Fn::Cidr (dynamic from VPC CIDR)
             expect(result.resources.FriggPrivateSubnet1).toBeDefined();
             expect(result.resources.FriggPrivateSubnet2).toBeDefined();
             
+            // Subnets should use CloudFormation Fn::Cidr, NOT hardcoded 172.31.x.x
+            expect(result.resources.FriggPrivateSubnet1.Properties.CidrBlock).toEqual({
+                'Fn::Select': [0, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
+            });
+            expect(result.resources.FriggPrivateSubnet2.Properties.CidrBlock).toEqual({
+                'Fn::Select': [1, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
+            });
+            
             // Should create new NAT Gateway
             expect(result.resources.FriggNATGateway).toBeDefined();
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.44b70fc.0",
+  "version": "2.0.0--canary.461.e679ea5.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -11,8 +11,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.461.44b70fc.0",
-    "@friggframework/test": "2.0.0--canary.461.44b70fc.0",
+    "@friggframework/schemas": "2.0.0--canary.461.e679ea5.0",
+    "@friggframework/test": "2.0.0--canary.461.e679ea5.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -34,8 +34,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.461.44b70fc.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.44b70fc.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.e679ea5.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.e679ea5.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44b70fce55d47259bf67cc71056376941940ba9b"
+  "gitHead": "e679ea5502f29133d25b93b6f5b36f9b3099f82c"
 }