@friggframework/devtools 2.0.0--canary.428.1c210bc.0 → 2.0.0--canary.428.4968614.0

package/infrastructure/aws-discovery.js

@@ -559,8 +559,23 @@ class AWSDiscovery {
             const response = await this.ec2Client.send(command);
 
             if (response.NatGateways && response.NatGateways.length > 0) {
+                // Filter out any NAT Gateways that are not truly available
+                const availableNatGateways = response.NatGateways.filter(nat => {
+                    // Double-check the state is truly 'available'
+                    if (nat.State !== 'available') {
+                        console.warn(`Skipping NAT Gateway ${nat.NatGatewayId} with state: ${nat.State}`);
+                        return false;
+                    }
+                    return true;
+                });
+
+                if (availableNatGateways.length === 0) {
+                    console.warn('No truly available NAT Gateways found in VPC');
+                    return null;
+                }
+
                 // Sort NAT Gateways to prioritize Frigg-managed ones
-                const sortedNatGateways = response.NatGateways.sort((a, b) => {
+                const sortedNatGateways = availableNatGateways.sort((a, b) => {
                     const aIsFrigg =
                         a.Tags &&
                         a.Tags.some(
@@ -632,7 +647,7 @@ class AWSDiscovery {
 
                     if (isFriggNat) {
                         console.log(
-                            `Found existing Frigg-managed NAT Gateway: ${natGateway.NatGatewayId}`
+                            `Found existing Frigg-managed NAT Gateway: ${natGateway.NatGatewayId} (State: ${natGateway.State})`
                         );
                         natGateway._isInPrivateSubnet = false;
                         return natGateway;
@@ -640,7 +655,7 @@ class AWSDiscovery {
 
                     // Return first valid NAT Gateway that's in a public subnet
                     console.log(
-                        `Found existing NAT Gateway in public subnet: ${natGateway.NatGatewayId}`
+                        `Found existing NAT Gateway in public subnet: ${natGateway.NatGatewayId} (State: ${natGateway.State})`
                     );
                     natGateway._isInPrivateSubnet = false;
                     return natGateway;
@@ -1252,6 +1267,7 @@ class AWSDiscovery {
 
             return {
                 defaultVpcId: vpc.VpcId,
+                vpcCidr: vpc.CidrBlock, // Add VPC CIDR for security group configuration
                 defaultSecurityGroupId: securityGroup.GroupId,
                 privateSubnetId1: privateSubnets[0]?.SubnetId,
                 privateSubnetId2:

package/infrastructure/build-time-discovery.test.js

@@ -56,6 +56,7 @@ describe('BuildTimeDiscovery', () => {
     describe('discoverAndCreateConfig', () => {
         const mockResources = {
             defaultVpcId: 'vpc-12345678',
+            vpcCidr: '172.31.0.0/16',
             defaultSecurityGroupId: 'sg-12345678',
             privateSubnetId1: 'subnet-1',
             privateSubnetId2: 'subnet-2',
@@ -100,6 +101,7 @@ describe('BuildTimeDiscovery', () => {
     describe('replaceTemplateVariables', () => {
         const mockResources = {
             defaultVpcId: 'vpc-12345678',
+            vpcCidr: '172.31.0.0/16',
             defaultSecurityGroupId: 'sg-12345678',
             privateSubnetId1: 'subnet-1',
             privateSubnetId2: 'subnet-2',
@@ -225,6 +227,7 @@ describe('BuildTimeDiscovery', () => {
     describe('preBuildHook', () => {
         const mockResources = {
             defaultVpcId: 'vpc-12345678',
+            vpcCidr: '172.31.0.0/16',
             defaultSecurityGroupId: 'sg-12345678',
             privateSubnetId1: 'subnet-1',
             privateSubnetId2: 'subnet-2',

package/infrastructure/serverless-template.js

@@ -1893,6 +1893,8 @@ const composeServerlessDefinition = async (AppDefinition) => {
                 }
 
                 // Always add route table and routes (referencing the NAT, whether new or existing)
+                // IMPORTANT: Create a new route table to ensure clean routing configuration
+                // This avoids issues with stale routes pointing to deleted NAT Gateways
                 definition.resources.Resources.FriggLambdaRouteTable = {
                     Type: 'AWS::EC2::RouteTable',
                     Properties: {
@@ -1904,6 +1906,10 @@ const composeServerlessDefinition = async (AppDefinition) => {
                                 Key: 'Name',
                                 Value: '${self:service}-${self:provider.stage}-lambda-rt',
                             },
+                            {
+                                Key: 'ManagedBy',
+                                Value: 'Frigg',
+                            },
                         ],
                     },
                 };
@@ -1914,18 +1920,23 @@ const composeServerlessDefinition = async (AppDefinition) => {
                 if (reuseExistingNatGateway) {
                     // Use the existing NAT Gateway that we're reusing
                     natGatewayIdForRoute = discoveredResources.existingNatGatewayId;
+                    console.log(`Using discovered NAT Gateway for routing: ${natGatewayIdForRoute}`);
                 } else if (needsNewNatGateway && !reuseExistingNatGateway) {
                     // Reference the new NAT Gateway being created
                     natGatewayIdForRoute = { Ref: 'FriggNATGateway' };
+                    console.log('Using newly created NAT Gateway for routing');
                 } else if (discoveredResources.existingNatGatewayId) {
                     // Use the existing NAT Gateway ID
                     natGatewayIdForRoute = discoveredResources.existingNatGatewayId;
+                    console.log(`Using discovered NAT Gateway for routing: ${natGatewayIdForRoute}`);
                 } else if (AppDefinition.vpc.natGateway?.id) {
                     // Use explicitly provided NAT Gateway ID
                     natGatewayIdForRoute = AppDefinition.vpc.natGateway.id;
+                    console.log(`Using explicitly provided NAT Gateway for routing: ${natGatewayIdForRoute}`);
                 } else if (AppDefinition.vpc.selfHeal === true) {
                     // Self-healing enabled but no NAT Gateway - skip NAT route
                     natGatewayIdForRoute = null;
+                    console.log('No NAT Gateway available - skipping NAT route creation');
                 } else {
                     throw new Error(
                         'Unable to determine NAT Gateway ID for routing. ' +
@@ -1935,7 +1946,8 @@ const composeServerlessDefinition = async (AppDefinition) => {
 
                 // Only create NAT route if we have a NAT Gateway
                 if (natGatewayIdForRoute) {
-                        definition.resources.Resources.FriggNATRoute = {
+                    console.log(`Creating NAT route: 0.0.0.0/0 → ${natGatewayIdForRoute}`);
+                    definition.resources.Resources.FriggNATRoute = {
                         Type: 'AWS::EC2::Route',
                         Properties: {
                             RouteTableId: { Ref: 'FriggLambdaRouteTable' },
@@ -1943,6 +1955,8 @@ const composeServerlessDefinition = async (AppDefinition) => {
                             NatGatewayId: natGatewayIdForRoute,
                         },
                     };
+                } else {
+                    console.warn('⚠️  No NAT Gateway configured - Lambda functions will not have internet access');
                 }
 
                 // Associate Lambda subnets with NAT Gateway route table
@@ -2028,6 +2042,13 @@ const composeServerlessDefinition = async (AppDefinition) => {
                         AppDefinition.encryption?.fieldLevelEncryptionMethod ===
                         'kms'
                     ) {
+                        // Validate we have VPC CIDR for security group configuration
+                        if (!discoveredResources.vpcCidr) {
+                            console.warn(
+                                '⚠️  Warning: VPC CIDR not discovered. VPC endpoint security group may not work correctly.'
+                            );
+                        }
+
                         // Create security group for VPC endpoints if it doesn't exist
                         if (
                             !definition.resources.Resources
@@ -2040,16 +2061,16 @@ const composeServerlessDefinition = async (AppDefinition) => {
                                     GroupDescription:
                                         'Security group for VPC endpoints',
                                     VpcId: discoveredResources.defaultVpcId,
-                                    SecurityGroupIngress: [
-                                        {
-                                            IpProtocol: 'tcp',
-                                            FromPort: 443,
-                                            ToPort: 443,
-                                            CidrIp:
-                                                discoveredResources.vpcCidr ||
-                                                '10.0.0.0/16', // Dynamic VPC CIDR
-                                        },
-                                    ],
+                                    SecurityGroupIngress: discoveredResources.vpcCidr
+                                        ? [
+                                              {
+                                                  IpProtocol: 'tcp',
+                                                  FromPort: 443,
+                                                  ToPort: 443,
+                                                  CidrIp: discoveredResources.vpcCidr, // Use discovered VPC CIDR
+                                              },
+                                          ]
+                                        : [], // Empty array if no VPC CIDR discovered
                                     Tags: [
                                         {
                                             Key: 'Name',

package/infrastructure/serverless-template.test.js

@@ -7,6 +7,7 @@ jest.mock('./aws-discovery', () => {
             return {
                 discoverResources: jest.fn().mockResolvedValue({
                     defaultVpcId: 'vpc-123456',
+                    vpcCidr: '172.31.0.0/16', // Add VPC CIDR for security group configuration
                     defaultSecurityGroupId: 'sg-123456',
                     privateSubnetId1: 'subnet-123456',
                     privateSubnetId2: 'subnet-789012',
@@ -484,6 +485,10 @@ describe('composeServerlessDefinition', () => {
                             Key: 'Name',
                             Value: '${self:service}-${self:provider.stage}-frigg-kms-key'
                         },
+                        {
+                            Key: 'ManagedBy',
+                            Value: 'Frigg'
+                        },
                         {
                             Key: 'Purpose',
                             Value: 'Field-level encryption for Frigg application'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.428.1c210bc.0",
+  "version": "2.0.0--canary.428.4968614.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,8 +9,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.428.1c210bc.0",
-    "@friggframework/test": "2.0.0--canary.428.1c210bc.0",
+    "@friggframework/schemas": "2.0.0--canary.428.4968614.0",
+    "@friggframework/test": "2.0.0--canary.428.4968614.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -32,8 +32,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.428.1c210bc.0",
-    "@friggframework/prettier-config": "2.0.0--canary.428.1c210bc.0",
+    "@friggframework/eslint-config": "2.0.0--canary.428.4968614.0",
+    "@friggframework/prettier-config": "2.0.0--canary.428.4968614.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c210bc49b0013c033077c703eaa7e388927d4bf"
+  "gitHead": "49686143bbd8303507c1824ef167465d1efeaa1e"
 }