@friggframework/devtools 2.0.0--canary.461.637e5e4.0 → 2.0.0--canary.461.4e47399.0

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

@@ -384,6 +384,7 @@ class VpcBuilder extends InfrastructureBuilder {
         // Private Subnet 1
         result.resources.FriggPrivateSubnet1 = {
             Type: 'AWS::EC2::Subnet',
+            DeletionPolicy: 'Retain',
             Properties: {
                 VpcId: subnetVpcId,
                 CidrBlock: cidrs.private1,
@@ -399,6 +400,7 @@ class VpcBuilder extends InfrastructureBuilder {
         // Private Subnet 2
         result.resources.FriggPrivateSubnet2 = {
             Type: 'AWS::EC2::Subnet',
+            DeletionPolicy: 'Retain',
             Properties: {
                 VpcId: subnetVpcId,
                 CidrBlock: cidrs.private2,
@@ -612,6 +614,23 @@ class VpcBuilder extends InfrastructureBuilder {
             },
         };
 
+        // Associate route table with private subnets
+        result.resources.FriggPrivateSubnet1RouteTableAssociation = {
+            Type: 'AWS::EC2::SubnetRouteTableAssociation',
+            Properties: {
+                SubnetId: { Ref: 'FriggPrivateSubnet1' },
+                RouteTableId: { Ref: 'FriggLambdaRouteTable' },
+            },
+        };
+
+        result.resources.FriggPrivateSubnet2RouteTableAssociation = {
+            Type: 'AWS::EC2::SubnetRouteTableAssociation',
+            Properties: {
+                SubnetId: { Ref: 'FriggPrivateSubnet2' },
+                RouteTableId: { Ref: 'FriggLambdaRouteTable' },
+            },
+        };
+
         console.log('    ✅ NAT Gateway infrastructure created');
     }
 

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

@@ -543,6 +543,46 @@ describe('VpcBuilder', () => {
             expect(result.resources.FriggNATGateway.Type).toBe('AWS::EC2::NatGateway');
         });
 
+        it('should create route table associations for private subnets with NAT Gateway', async () => {
+            const appDefinition = {
+                vpc: {
+                    enable: true,
+                    management: 'discover',
+                    subnets: { management: 'create' },
+                    natGateway: {
+                        management: 'createAndManage',
+                    },
+                    selfHeal: true,
+                },
+            };
+
+            const discoveredResources = {
+                defaultVpcId: 'vpc-123',
+                publicSubnetId: 'subnet-public',
+            };
+
+            const result = await vpcBuilder.build(appDefinition, discoveredResources);
+
+            // Verify route table is created
+            expect(result.resources.FriggLambdaRouteTable).toBeDefined();
+            expect(result.resources.FriggLambdaRouteTable.Type).toBe('AWS::EC2::RouteTable');
+
+            // Verify route to NAT Gateway
+            expect(result.resources.FriggPrivateRoute).toBeDefined();
+            expect(result.resources.FriggPrivateRoute.Properties.NatGatewayId).toEqual({ Ref: 'FriggNATGateway' });
+
+            // Verify subnet route table associations
+            expect(result.resources.FriggPrivateSubnet1RouteTableAssociation).toBeDefined();
+            expect(result.resources.FriggPrivateSubnet1RouteTableAssociation.Type).toBe('AWS::EC2::SubnetRouteTableAssociation');
+            expect(result.resources.FriggPrivateSubnet1RouteTableAssociation.Properties.SubnetId).toEqual({ Ref: 'FriggPrivateSubnet1' });
+            expect(result.resources.FriggPrivateSubnet1RouteTableAssociation.Properties.RouteTableId).toEqual({ Ref: 'FriggLambdaRouteTable' });
+
+            expect(result.resources.FriggPrivateSubnet2RouteTableAssociation).toBeDefined();
+            expect(result.resources.FriggPrivateSubnet2RouteTableAssociation.Type).toBe('AWS::EC2::SubnetRouteTableAssociation');
+            expect(result.resources.FriggPrivateSubnet2RouteTableAssociation.Properties.SubnetId).toEqual({ Ref: 'FriggPrivateSubnet2' });
+            expect(result.resources.FriggPrivateSubnet2RouteTableAssociation.Properties.RouteTableId).toEqual({ Ref: 'FriggLambdaRouteTable' });
+        });
+
         it('should not create NAT when existing NAT is properly placed', async () => {
             const appDefinition = {
                 vpc: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.637e5e4.0",
+  "version": "2.0.0--canary.461.4e47399.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.637e5e4.0",
-    "@friggframework/test": "2.0.0--canary.461.637e5e4.0",
+    "@friggframework/schemas": "2.0.0--canary.461.4e47399.0",
+    "@friggframework/test": "2.0.0--canary.461.4e47399.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.637e5e4.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.637e5e4.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.4e47399.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.4e47399.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": "637e5e421b5de0794ae99dc8a6578726dfd97f27"
+  "gitHead": "4e4739922e59468d0c85a3f2c15df25b240082d9"
 }