@friggframework/devtools 2.0.0--canary.461.05cdcd5.0 → 2.0.0--canary.461.a5281ce.0

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

@@ -558,6 +558,9 @@ class VpcBuilder extends InfrastructureBuilder {
         if (discoveredResources.existingNatGatewayId && !discoveredResources.natGatewayInPrivateSubnet) {
             console.log(`    Reusing discovered NAT Gateway: ${discoveredResources.existingNatGatewayId}`);
             result.natGatewayId = discoveredResources.existingNatGatewayId;
+            
+            // Still need to create route table and associations for discovered NAT
+            this.createNatGatewayRouting(appDefinition, discoveredResources, result, discoveredResources.existingNatGatewayId);
             return;
         }
 
@@ -593,32 +596,48 @@ class VpcBuilder extends InfrastructureBuilder {
             },
         };
 
+        // Create routing for the new NAT Gateway
+        this.createNatGatewayRouting(appDefinition, discoveredResources, result, { Ref: 'FriggNATGateway' });
+
+        console.log('    ✅ NAT Gateway infrastructure created');
+    }
+
+    /**
+     * Create route table and associations for NAT Gateway
+     */
+    createNatGatewayRouting(appDefinition, discoveredResources, result, natGatewayId) {
         // Private route table with NAT Gateway route
-        result.resources.FriggLambdaRouteTable = {
-            Type: 'AWS::EC2::RouteTable',
-            Properties: {
-                VpcId: result.vpcId,
-                Tags: [
-                    { Key: 'Name', Value: '${self:service}-${self:provider.stage}-lambda-rt' },
-                    { Key: 'ManagedBy', Value: 'Frigg' },
-                ],
-            },
-        };
+        if (!result.resources.FriggLambdaRouteTable) {
+            result.resources.FriggLambdaRouteTable = {
+                Type: 'AWS::EC2::RouteTable',
+                Properties: {
+                    VpcId: result.vpcId,
+                    Tags: [
+                        { Key: 'Name', Value: '${self:service}-${self:provider.stage}-lambda-rt' },
+                        { Key: 'ManagedBy', Value: 'Frigg' },
+                    ],
+                },
+            };
+        }
 
         result.resources.FriggPrivateRoute = {
             Type: 'AWS::EC2::Route',
             Properties: {
                 RouteTableId: { Ref: 'FriggLambdaRouteTable' },
                 DestinationCidrBlock: '0.0.0.0/0',
-                NatGatewayId: { Ref: 'FriggNATGateway' },
+                NatGatewayId: natGatewayId,
             },
         };
 
         // Associate route table with private subnets
+        // Use discovered subnet IDs or CloudFormation references
+        const subnet1Id = discoveredResources.privateSubnetId1 || { Ref: 'FriggPrivateSubnet1' };
+        const subnet2Id = discoveredResources.privateSubnetId2 || { Ref: 'FriggPrivateSubnet2' };
+
         result.resources.FriggPrivateSubnet1RouteTableAssociation = {
             Type: 'AWS::EC2::SubnetRouteTableAssociation',
             Properties: {
-                SubnetId: { Ref: 'FriggPrivateSubnet1' },
+                SubnetId: subnet1Id,
                 RouteTableId: { Ref: 'FriggLambdaRouteTable' },
             },
         };
@@ -626,12 +645,12 @@ class VpcBuilder extends InfrastructureBuilder {
         result.resources.FriggPrivateSubnet2RouteTableAssociation = {
             Type: 'AWS::EC2::SubnetRouteTableAssociation',
             Properties: {
-                SubnetId: { Ref: 'FriggPrivateSubnet2' },
+                SubnetId: subnet2Id,
                 RouteTableId: { Ref: 'FriggLambdaRouteTable' },
             },
         };
 
-        console.log('    ✅ NAT Gateway infrastructure created');
+        console.log('    ✅ Route table and subnet associations created');
     }
 
     /**

package/infrastructure/domains/shared/environment-builder.js

@@ -85,6 +85,7 @@ function getAppEnvironmentVars(appDefinition) {
 function buildEnvironment(appEnvironmentVars, discoveredResources) {
     const environment = {
         ...appEnvironmentVars,
+        STAGE: '${self:provider.stage}',  // Used by encryption bypass logic
         FRIGG_STACK: '${self:service}',
         FRIGG_STAGE: '${self:provider.stage}',
         FRIGG_REGION: '${self:provider.region}',

package/infrastructure/domains/shared/environment-builder.test.js

@@ -118,6 +118,7 @@ describe('Environment Builder', () => {
             const result = buildEnvironment(appEnvironmentVars, discoveredResources);
 
             expect(result.API_KEY).toBe("${env:API_KEY, ''}");
+            expect(result.STAGE).toBe('${self:provider.stage}');
             expect(result.FRIGG_STACK).toBe('${self:service}');
             expect(result.FRIGG_STAGE).toBe('${self:provider.stage}');
             expect(result.FRIGG_REGION).toBe('${self:provider.region}');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.461.05cdcd5.0",
+  "version": "2.0.0--canary.461.a5281ce.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.05cdcd5.0",
-    "@friggframework/test": "2.0.0--canary.461.05cdcd5.0",
+    "@friggframework/schemas": "2.0.0--canary.461.a5281ce.0",
+    "@friggframework/test": "2.0.0--canary.461.a5281ce.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.05cdcd5.0",
-    "@friggframework/prettier-config": "2.0.0--canary.461.05cdcd5.0",
+    "@friggframework/eslint-config": "2.0.0--canary.461.a5281ce.0",
+    "@friggframework/prettier-config": "2.0.0--canary.461.a5281ce.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": "05cdcd50575f815cc79e9686993cf272a24005b8"
+  "gitHead": "a5281ced43fde23f359098090034ef3bddb234ac"
 }