@friggframework/devtools 2.0.0--canary.398.90b58c8.0 → 2.0.0--canary.398.53eac55.0

package/infrastructure/serverless-template.js

@@ -473,8 +473,8 @@ const composeServerlessDefinition = async (AppDefinition) => {
             if (discoveredResources.defaultVpcId) {
                 console.log(`   VPC: ${discoveredResources.defaultVpcId}`);
             }
-            if (discoveredResources.privateSubnetIds) {
-                console.log(`   Subnets: ${discoveredResources.privateSubnetIds.join(', ')}`);
+            if (discoveredResources.privateSubnetId1 && discoveredResources.privateSubnetId2) {
+                console.log(`   Subnets: ${discoveredResources.privateSubnetId1}, ${discoveredResources.privateSubnetId2}`);
             }
             if (discoveredResources.defaultSecurityGroupId) {
                 console.log(`   Security Group: ${discoveredResources.defaultSecurityGroupId}`);
@@ -508,8 +508,8 @@ const composeServerlessDefinition = async (AppDefinition) => {
                 // Add discovered resources to environment if available
                 ...(discoveredResources.defaultVpcId && { AWS_DISCOVERY_VPC_ID: discoveredResources.defaultVpcId }),
                 ...(discoveredResources.defaultSecurityGroupId && { AWS_DISCOVERY_SECURITY_GROUP_ID: discoveredResources.defaultSecurityGroupId }),
-                ...(discoveredResources.privateSubnetIds && discoveredResources.privateSubnetIds[0] && { AWS_DISCOVERY_SUBNET_ID_1: discoveredResources.privateSubnetIds[0] }),
-                ...(discoveredResources.privateSubnetIds && discoveredResources.privateSubnetIds[1] && { AWS_DISCOVERY_SUBNET_ID_2: discoveredResources.privateSubnetIds[1] }),
+                ...(discoveredResources.privateSubnetId1 && { AWS_DISCOVERY_SUBNET_ID_1: discoveredResources.privateSubnetId1 }),
+                ...(discoveredResources.privateSubnetId2 && { AWS_DISCOVERY_SUBNET_ID_2: discoveredResources.privateSubnetId2 }),
                 ...(discoveredResources.publicSubnetId && { AWS_DISCOVERY_PUBLIC_SUBNET_ID: discoveredResources.publicSubnetId }),
                 ...(discoveredResources.defaultRouteTableId && { AWS_DISCOVERY_ROUTE_TABLE_ID: discoveredResources.defaultRouteTableId }),
                 ...(discoveredResources.defaultKmsKeyId && { AWS_DISCOVERY_KMS_KEY_ID: discoveredResources.defaultKmsKeyId }),
@@ -777,52 +777,53 @@ const composeServerlessDefinition = async (AppDefinition) => {
             // VPC configuration using discovered or explicitly provided resources
             const vpcConfig = {
                 securityGroupIds: AppDefinition.vpc.securityGroupIds || 
-                                  (discoveredResources.defaultSecurityGroupId ? [discoveredResources.defaultSecurityGroupId] : ['${env:AWS_DISCOVERY_SECURITY_GROUP_ID}']),
+                                  (discoveredResources.defaultSecurityGroupId ? [discoveredResources.defaultSecurityGroupId] : []),
                 subnetIds: AppDefinition.vpc.subnetIds || 
-                          (discoveredResources.privateSubnetIds && discoveredResources.privateSubnetIds.length >= 2 ? 
-                           [discoveredResources.privateSubnetIds[0], discoveredResources.privateSubnetIds[1]] :
-                           ['${env:AWS_DISCOVERY_SUBNET_ID_1}', '${env:AWS_DISCOVERY_SUBNET_ID_2}'])
+                          (discoveredResources.privateSubnetId1 && discoveredResources.privateSubnetId2 ? 
+                           [discoveredResources.privateSubnetId1, discoveredResources.privateSubnetId2] :
+                           [])
             };
 
-            // Set VPC config for Lambda functions
-            definition.provider.vpc = vpcConfig;
-
-            // Add NAT Gateway for Lambda internet access (required for external API calls)
-            // Even with existing VPC, Lambdas need guaranteed internet access for integrations
-            definition.resources.Resources.FriggNATGatewayEIP = {
-                Type: 'AWS::EC2::EIP',
-                Properties: {
-                    Domain: 'vpc',
-                    Tags: [
-                        { Key: 'Name', Value: '${self:service}-${self:provider.stage}-nat-eip' }
-                    ]
-                }
-            };
+            // Set VPC config for Lambda functions only if we have valid subnet IDs
+            if (vpcConfig.subnetIds.length >= 2 && vpcConfig.securityGroupIds.length > 0) {
+                definition.provider.vpc = vpcConfig;
+                
+                // Always create NAT Gateway for Lambda internet access
+                // Default VPCs don't have NAT gateways, so we need to create them
+                definition.resources.Resources.FriggNATGatewayEIP = {
+                    Type: 'AWS::EC2::EIP',
+                    Properties: {
+                        Domain: 'vpc',
+                        Tags: [
+                            { Key: 'Name', Value: '${self:service}-${self:provider.stage}-nat-eip' }
+                        ]
+                    }
+                };
 
-            definition.resources.Resources.FriggNATGateway = {
-                Type: 'AWS::EC2::NatGateway',
-                Properties: {
-                    AllocationId: { 'Fn::GetAtt': ['FriggNATGatewayEIP', 'AllocationId'] },
-                    SubnetId: discoveredResources.publicSubnetId || '${env:AWS_DISCOVERY_PUBLIC_SUBNET_ID}', // Discovery finds public subnet
-                    Tags: [
-                        { Key: 'Name', Value: '${self:service}-${self:provider.stage}-nat-gateway' }
-                    ]
-                }
-            };
+                definition.resources.Resources.FriggNATGateway = {
+                    Type: 'AWS::EC2::NatGateway',
+                    Properties: {
+                        AllocationId: { 'Fn::GetAtt': ['FriggNATGatewayEIP', 'AllocationId'] },
+                        SubnetId: discoveredResources.publicSubnetId || discoveredResources.privateSubnetId1, // Use first discovered subnet if no public subnet found
+                        Tags: [
+                            { Key: 'Name', Value: '${self:service}-${self:provider.stage}-nat-gateway' }
+                        ]
+                    }
+                };
 
-            // Create route table for Lambda subnets to use NAT Gateway
-            definition.resources.Resources.FriggLambdaRouteTable = {
-                Type: 'AWS::EC2::RouteTable',
-                Properties: {
-                    VpcId: discoveredResources.defaultVpcId || '${env:AWS_DISCOVERY_VPC_ID}',
-                    Tags: [
-                        { Key: 'Name', Value: '${self:service}-${self:provider.stage}-lambda-rt' }
-                    ]
-                }
-            };
+                // Create route table for Lambda subnets to use NAT Gateway
+                definition.resources.Resources.FriggLambdaRouteTable = {
+                    Type: 'AWS::EC2::RouteTable',
+                    Properties: {
+                        VpcId: discoveredResources.defaultVpcId || { Ref: 'FriggVPC' },
+                        Tags: [
+                            { Key: 'Name', Value: '${self:service}-${self:provider.stage}-lambda-rt' }
+                        ]
+                    }
+                };
 
-            definition.resources.Resources.FriggNATRoute = {
-                Type: 'AWS::EC2::Route',
+                definition.resources.Resources.FriggNATRoute = {
+                    Type: 'AWS::EC2::Route',
                 Properties: {
                     RouteTableId: { Ref: 'FriggLambdaRouteTable' },
                     DestinationCidrBlock: '0.0.0.0/0',
@@ -830,44 +831,45 @@ const composeServerlessDefinition = async (AppDefinition) => {
                 }
             };
 
-            // Associate Lambda subnets with NAT Gateway route table
-            definition.resources.Resources.FriggSubnet1RouteAssociation = {
-                Type: 'AWS::EC2::SubnetRouteTableAssociation',
+                // Associate Lambda subnets with NAT Gateway route table
+                definition.resources.Resources.FriggSubnet1RouteAssociation = {
+                    Type: 'AWS::EC2::SubnetRouteTableAssociation',
                 Properties: {
-                    SubnetId: discoveredResources.privateSubnetIds?.[0] || '${env:AWS_DISCOVERY_SUBNET_ID_1}',
+                    SubnetId: vpcConfig.subnetIds[0],
                     RouteTableId: { Ref: 'FriggLambdaRouteTable' }
                 }
             };
 
-            definition.resources.Resources.FriggSubnet2RouteAssociation = {
-                Type: 'AWS::EC2::SubnetRouteTableAssociation',
+                definition.resources.Resources.FriggSubnet2RouteAssociation = {
+                    Type: 'AWS::EC2::SubnetRouteTableAssociation',
                 Properties: {
-                    SubnetId: discoveredResources.privateSubnetIds?.[1] || '${env:AWS_DISCOVERY_SUBNET_ID_2}',
+                    SubnetId: vpcConfig.subnetIds[1],
                     RouteTableId: { Ref: 'FriggLambdaRouteTable' }
                 }
             };
 
-            // Add VPC endpoints for AWS service optimization (optional but recommended)
-            if (AppDefinition.vpc.enableVPCEndpoints !== false) {
-                definition.resources.Resources.VPCEndpointS3 = {
+                // Add VPC endpoints for AWS service optimization (optional but recommended)
+                if (AppDefinition.vpc.enableVPCEndpoints !== false) {
+                    definition.resources.Resources.VPCEndpointS3 = {
                     Type: 'AWS::EC2::VPCEndpoint',
                     Properties: {
-                        VpcId: discoveredResources.defaultVpcId || '${env:AWS_DISCOVERY_VPC_ID}',
+                        VpcId: discoveredResources.defaultVpcId,
                         ServiceName: 'com.amazonaws.${self:provider.region}.s3',
                         VpcEndpointType: 'Gateway',
                         RouteTableIds: [{ Ref: 'FriggLambdaRouteTable' }]
                     }
                 };
 
-                definition.resources.Resources.VPCEndpointDynamoDB = {
+                    definition.resources.Resources.VPCEndpointDynamoDB = {
                     Type: 'AWS::EC2::VPCEndpoint',
                     Properties: {
-                        VpcId: discoveredResources.defaultVpcId || '${env:AWS_DISCOVERY_VPC_ID}',
+                        VpcId: discoveredResources.defaultVpcId,
                         ServiceName: 'com.amazonaws.${self:provider.region}.dynamodb',
                         VpcEndpointType: 'Gateway',
                         RouteTableIds: [{ Ref: 'FriggLambdaRouteTable' }]
                     }
                 };
+                }
             }
         }
     }
@@ -962,28 +964,8 @@ const composeServerlessDefinition = async (AppDefinition) => {
         definition.custom[queueReference] = queueName;
     }
 
-    // Check if AWS discovery environment variables are missing and error
-    const needsDiscovery = AppDefinition.vpc?.enable || 
-                          AppDefinition.encryption?.useDefaultKMSForFieldLevelEncryption ||
-                          AppDefinition.ssm?.enable;
-    
-    if (needsDiscovery && !process.env.AWS_DISCOVERY_VPC_ID) {
-        console.error('❌ AWS discovery environment variables not found');
-        console.error('');
-        console.error('🚨 Your AppDefinition requires AWS discovery but variables are missing:');
-        if (AppDefinition.vpc?.enable) console.error('   ❌ VPC support (vpc.enable: true)');
-        if (AppDefinition.encryption?.useDefaultKMSForFieldLevelEncryption) console.error('   ❌ KMS encryption (encryption.useDefaultKMSForFieldLevelEncryption: true)');
-        if (AppDefinition.ssm?.enable) console.error('   ❌ SSM parameters (ssm.enable: true)');
-        console.error('');
-        console.error('💡 Run AWS discovery before building:');
-        console.error('   node node_modules/@friggframework/devtools/infrastructure/run-discovery.js');
-        console.error('');
-        console.error('🔧 Or use the build command which runs discovery automatically:');
-        console.error('   npx frigg build');
-        
-        // Exit the process instead of throwing to avoid serverless circular reference issues
-        process.exit(1);
-    }
+    // Discovery has already run successfully at this point if needed
+    // The discoveredResources object contains all the necessary AWS resources
 
     // Add websocket function if enabled
     if (AppDefinition.websockets?.enable === true) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.398.90b58c8.0",
+  "version": "2.0.0--canary.398.53eac55.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,7 +9,7 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/test": "2.0.0--canary.398.90b58c8.0",
+    "@friggframework/test": "2.0.0--canary.398.53eac55.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -31,8 +31,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.398.90b58c8.0",
-    "@friggframework/prettier-config": "2.0.0--canary.398.90b58c8.0",
+    "@friggframework/eslint-config": "2.0.0--canary.398.53eac55.0",
+    "@friggframework/prettier-config": "2.0.0--canary.398.53eac55.0",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "90b58c8e19b569bca169038b097a8b7358ca3268"
+  "gitHead": "53eac553535657eaeb3110634f14870418fbbeda"
 }