@friggframework/devtools 2.0.0--canary.461.d5b9ddf.0 → 2.0.0--canary.461.ae78cad.0

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

@@ -110,7 +110,23 @@ class VpcBuilder extends InfrastructureBuilder {
             Resource: '*',
         });
 
-        const management = appDefinition.vpc.management || 'discover';
+        // Normalize shareAcrossStages into management mode
+        // This provides a simpler API for users while maintaining backwards compatibility
+        let management = appDefinition.vpc.management;
+        if (!management && appDefinition.vpc.shareAcrossStages !== undefined) {
+            // Explicit shareAcrossStages setting overrides default
+            management = appDefinition.vpc.shareAcrossStages ? 'discover' : 'create-new';
+            console.log(`  VPC Sharing: ${appDefinition.vpc.shareAcrossStages ? 'shared' : 'isolated'} (translated to ${management})`);
+            
+            // When creating isolated VPC, also create isolated NAT Gateway
+            if (!appDefinition.vpc.shareAcrossStages && !appDefinition.vpc.natGateway?.management) {
+                appDefinition.vpc.natGateway = appDefinition.vpc.natGateway || {};
+                appDefinition.vpc.natGateway.management = 'createAndManage';
+                console.log(`  NAT Gateway: creating isolated NAT (shareAcrossStages=false)`);
+            }
+        } else {
+            management = management || 'discover'; // Default to sharing for backwards compatibility
+        }
         console.log(`  VPC Management Mode: ${management}`);
 
         // Handle self-healing if enabled

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

@@ -809,6 +809,81 @@ describe('VpcBuilder', () => {
         });
     });
 
+    describe('VPC Sharing Control', () => {
+        it('should share VPC across stages when shareAcrossStages is true (default)', async () => {
+            const appDefinition = {
+                vpc: {
+                    enable: true,
+                    shareAcrossStages: true, // Explicit opt-in to sharing
+                },
+            };
+
+            const discoveredResources = {
+                defaultVpcId: 'vpc-shared',
+                natGatewayId: 'nat-shared',
+            };
+
+            const result = await vpcBuilder.build(appDefinition, discoveredResources);
+
+            // Should use discovered VPC (not create new one)
+            expect(result.vpcId).toBe('vpc-shared');
+            expect(result.resources.FriggVPC).toBeUndefined();
+            
+            // Should create stage-specific subnets for isolation
+            expect(result.resources.FriggPrivateSubnet1).toBeDefined();
+            expect(result.resources.FriggPrivateSubnet2).toBeDefined();
+            
+            // Should reuse discovered NAT Gateway
+            expect(result.resources.FriggNATGateway).toBeUndefined();
+        });
+
+        it('should create isolated VPC when shareAcrossStages is false', async () => {
+            const appDefinition = {
+                vpc: {
+                    enable: true,
+                    shareAcrossStages: false, // Explicit opt-out of sharing
+                },
+            };
+
+            const discoveredResources = {
+                defaultVpcId: 'vpc-shared',
+                natGatewayId: 'nat-shared',
+            };
+
+            const result = await vpcBuilder.build(appDefinition, discoveredResources);
+
+            // Should create new VPC (ignore discovered resources)
+            expect(result.vpcId).toEqual({ Ref: 'FriggVPC' });
+            expect(result.resources.FriggVPC).toBeDefined();
+            
+            // Should create stage-specific subnets
+            expect(result.resources.FriggPrivateSubnet1).toBeDefined();
+            expect(result.resources.FriggPrivateSubnet2).toBeDefined();
+            
+            // Should create new NAT Gateway
+            expect(result.resources.FriggNATGateway).toBeDefined();
+        });
+
+        it('should default to shared VPC when shareAcrossStages is not specified', async () => {
+            const appDefinition = {
+                vpc: {
+                    enable: true,
+                    // shareAcrossStages not specified - should default to true
+                },
+            };
+
+            const discoveredResources = {
+                defaultVpcId: 'vpc-discovered',
+            };
+
+            const result = await vpcBuilder.build(appDefinition, discoveredResources);
+
+            // Should use discovered VPC by default (backwards compatibility)
+            expect(result.vpcId).toBe('vpc-discovered');
+            expect(result.resources.FriggVPC).toBeUndefined();
+        });
+    });
+
     describe('Outputs', () => {
         it.skip('should generate VPC ID output', async () => {
             const appDefinition = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.d5b9ddf.0",
+  "version": "2.0.0--canary.461.ae78cad.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.d5b9ddf.0",
-    "@friggframework/test": "2.0.0--canary.461.d5b9ddf.0",
+    "@friggframework/schemas": "2.0.0--canary.461.ae78cad.0",
+    "@friggframework/test": "2.0.0--canary.461.ae78cad.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.d5b9ddf.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.d5b9ddf.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.ae78cad.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.ae78cad.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": "d5b9ddfa8deb275e2275139ca229781776609fa4"
+  "gitHead": "ae78cad00740f759a7a99f5e6565bdfbea31b01e"
 }