@friggframework/devtools 2.0.0--canary.461.3d6d8ad.0 → 2.0.0--canary.461.0a68e4c.0

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

@@ -463,8 +463,8 @@ class VpcBuilder extends InfrastructureBuilder {
 
         const subnetVpcId = vpcManagement === 'create-new' ? { Ref: 'FriggVPC' } : result.vpcId;
 
-        // Generate CIDRs
-        const cidrs = this.generateSubnetCidrs(vpcManagement);
+        // Generate CIDRs - pass discovered resources to avoid conflicts
+        const cidrs = this.generateSubnetCidrs(vpcManagement, discoveredResources);
 
         // Private Subnet 1
         result.resources.FriggPrivateSubnet1 = {
@@ -597,8 +597,9 @@ class VpcBuilder extends InfrastructureBuilder {
 
     /**
      * Generate subnet CIDR blocks
+     * Finds available CIDRs that don't conflict with existing subnets
      */
-    generateSubnetCidrs(vpcManagement) {
+    generateSubnetCidrs(vpcManagement, discoveredResources) {
         if (vpcManagement === 'create-new') {
             // Use CloudFormation Fn::Cidr for dynamic generation
             return {
@@ -608,13 +609,47 @@ class VpcBuilder extends InfrastructureBuilder {
                 public2: { 'Fn::Select': [3, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }] },
             };
         } else {
-            // Static CIDRs for existing VPC (default VPC range)
-            return {
-                private1: '172.31.240.0/24',
-                private2: '172.31.241.0/24',
-                public1: '172.31.250.0/24',
-                public2: '172.31.251.0/24',
+            // Find available CIDRs for existing VPC by checking existing subnets
+            const existingCidrs = new Set();
+            
+            // Collect all existing subnet CIDRs
+            if (discoveredResources?.subnets) {
+                for (const subnet of discoveredResources.subnets) {
+                    if (subnet.CidrBlock) {
+                        existingCidrs.add(subnet.CidrBlock);
+                    }
+                }
+            }
+            
+            console.log(`    Found ${existingCidrs.size} existing subnet CIDRs in VPC`);
+            
+            // Generate candidates in the default VPC range (172.31.0.0/16)
+            // Private subnets: 240-249, Public subnets: 250-255
+            const findAvailableCidr = (startOctet, endOctet) => {
+                for (let octet = startOctet; octet <= endOctet; octet++) {
+                    const candidate = `172.31.${octet}.0/24`;
+                    if (!existingCidrs.has(candidate)) {
+                        existingCidrs.add(candidate); // Mark as used immediately
+                        return candidate;
+                    }
+                }
+                // Fallback if range exhausted
+                return `172.31.${startOctet}.0/24`;
             };
+            
+            const privateRange = { start: 240, end: 249 };
+            const publicRange = { start: 250, end: 255 };
+            
+            const cidrs = {
+                private1: findAvailableCidr(privateRange.start, privateRange.end),
+                private2: findAvailableCidr(privateRange.start, privateRange.end),
+                public1: findAvailableCidr(publicRange.start, publicRange.end),
+                public2: findAvailableCidr(publicRange.start, publicRange.end),
+            };
+            
+            console.log(`    Using available CIDRs: ${Object.values(cidrs).join(', ')}`);
+            
+            return cidrs;
         }
     }
 

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

@@ -983,6 +983,93 @@ describe('VpcBuilder', () => {
         });
     });
 
+    describe('generateSubnetCidrs()', () => {
+        it('should use CloudFormation Fn::Cidr for create-new mode', () => {
+            const cidrs = vpcBuilder.generateSubnetCidrs('create-new', {});
+            
+            expect(cidrs.private1).toEqual({
+                'Fn::Select': [0, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
+            });
+            expect(cidrs.private2).toEqual({
+                'Fn::Select': [1, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
+            });
+            expect(cidrs.public1).toEqual({
+                'Fn::Select': [2, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
+            });
+            expect(cidrs.public2).toEqual({
+                'Fn::Select': [3, { 'Fn::Cidr': ['10.0.0.0/16', 4, 8] }]
+            });
+        });
+
+        it('should use default static CIDRs when no existing subnets in VPC', () => {
+            const discoveredResources = {
+                subnets: []
+            };
+            
+            const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
+            
+            expect(cidrs.private1).toBe('172.31.240.0/24');
+            expect(cidrs.private2).toBe('172.31.241.0/24');
+            expect(cidrs.public1).toBe('172.31.250.0/24');
+            expect(cidrs.public2).toBe('172.31.251.0/24');
+        });
+
+        it('should avoid CIDR conflicts with existing subnets', () => {
+            const discoveredResources = {
+                subnets: [
+                    { CidrBlock: '172.31.240.0/24' },  // Conflicts with default private1
+                    { CidrBlock: '172.31.241.0/24' },  // Conflicts with default private2
+                    { CidrBlock: '172.31.0.0/20' },    // Default VPC subnet
+                    { CidrBlock: '172.31.16.0/20' },   // Default VPC subnet
+                ]
+            };
+            
+            const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
+            
+            // Should skip 240 and 241 (already taken), use 242-243 for private, 250-251 for public
+            expect(cidrs.private1).toBe('172.31.242.0/24');
+            expect(cidrs.private2).toBe('172.31.243.0/24');
+            expect(cidrs.public1).toBe('172.31.250.0/24');  // Public range starts at 250
+            expect(cidrs.public2).toBe('172.31.251.0/24');
+        });
+
+        it('should find first available CIDR blocks when some in range are taken', () => {
+            const discoveredResources = {
+                subnets: [
+                    { CidrBlock: '172.31.240.0/24' },
+                    { CidrBlock: '172.31.242.0/24' },
+                    { CidrBlock: '172.31.244.0/24' },
+                ]
+            };
+            
+            const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
+            
+            // Should use 241, 243 for private (filling gaps), 250, 251 for public
+            expect(cidrs.private1).toBe('172.31.241.0/24');
+            expect(cidrs.private2).toBe('172.31.243.0/24');
+            expect(cidrs.public1).toBe('172.31.250.0/24');   // Public range starts at 250
+            expect(cidrs.public2).toBe('172.31.251.0/24');
+        });
+
+        it('should handle missing discoveredResources gracefully', () => {
+            const cidrs = vpcBuilder.generateSubnetCidrs('discover', null);
+            
+            // Should fallback to default CIDRs
+            expect(cidrs.private1).toBe('172.31.240.0/24');
+            expect(cidrs.private2).toBe('172.31.241.0/24');
+        });
+
+        it('should handle discoveredResources without subnets array', () => {
+            const discoveredResources = { vpcId: 'vpc-123' };
+            
+            const cidrs = vpcBuilder.generateSubnetCidrs('discover', discoveredResources);
+            
+            // Should fallback to default CIDRs
+            expect(cidrs.private1).toBe('172.31.240.0/24');
+            expect(cidrs.private2).toBe('172.31.241.0/24');
+        });
+    });
+
     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.3d6d8ad.0",
+  "version": "2.0.0--canary.461.0a68e4c.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.3d6d8ad.0",
-    "@friggframework/test": "2.0.0--canary.461.3d6d8ad.0",
+    "@friggframework/schemas": "2.0.0--canary.461.0a68e4c.0",
+    "@friggframework/test": "2.0.0--canary.461.0a68e4c.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.3d6d8ad.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.3d6d8ad.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.0a68e4c.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.0a68e4c.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": "3d6d8ad065c2530fee34dcda5ee304979c718a65"
+  "gitHead": "0a68e4cd99db73582144693112740ff3786d8e93"
 }