@friggframework/devtools 2.0.0--canary.398.a2fbc38.0 → 2.0.0--canary.398.90b58c8.0

package/frigg-cli/build-command/index.js

@@ -4,28 +4,7 @@ const path = require('path');
 async function buildCommand(options) {
     console.log('Building the serverless application...');
     
-    // Run AWS discovery first
-    try {
-        const discoveryPath = path.resolve(__dirname, '../../infrastructure/run-discovery.js');
-        console.log('🔍 Running AWS resource discovery...');
-        
-        const discoveryResult = spawnSync('node', [discoveryPath], {
-            stdio: 'inherit',
-            shell: true,
-            env: process.env
-        });
-        
-        if (discoveryResult.status !== 0) {
-            console.error('❌ AWS discovery failed. Build cannot continue.');
-            console.error('   See error messages above for troubleshooting steps.');
-            process.exit(1);
-        }
-    } catch (error) {
-        console.error('❌ Could not run AWS discovery:', error.message);
-        console.error('   This may indicate a configuration or dependency issue.');
-        process.exit(1);
-    }
-    
+    // AWS discovery is now handled directly in serverless-template.js
     console.log('📦 Packaging serverless application...');
     const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';

package/frigg-cli/deploy-command/index.js

@@ -4,28 +4,7 @@ const path = require('path');
 async function deployCommand(options) {
     console.log('Deploying the serverless application...');
     
-    // Run AWS discovery first
-    try {
-        const discoveryPath = path.resolve(__dirname, '../../infrastructure/run-discovery.js');
-        console.log('🔍 Running AWS resource discovery...');
-        
-        const discoveryResult = spawnSync('node', [discoveryPath], {
-            stdio: 'inherit',
-            shell: true,
-            env: process.env
-        });
-        
-        if (discoveryResult.status !== 0) {
-            console.error('❌ AWS discovery failed. Deployment cannot continue.');
-            console.error('   See error messages above for troubleshooting steps.');
-            process.exit(1);
-        }
-    } catch (error) {
-        console.error('❌ Could not run AWS discovery:', error.message);
-        console.error('   This may indicate a configuration or dependency issue.');
-        process.exit(1);
-    }
-    
+    // AWS discovery is now handled directly in serverless-template.js
     console.log('🚀 Deploying serverless application...');
     const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';

package/infrastructure/aws-discovery.js

@@ -149,27 +149,71 @@ class AWSDiscovery {
      */
     async isSubnetPrivate(subnetId) {
         try {
-            const command = new DescribeRouteTablesCommand({
+            // First, get the subnet details to find its VPC
+            const subnetCommand = new DescribeSubnetsCommand({
+                SubnetIds: [subnetId]
+            });
+            const subnetResponse = await this.ec2Client.send(subnetCommand);
+            
+            if (!subnetResponse.Subnets || subnetResponse.Subnets.length === 0) {
+                throw new Error(`Subnet ${subnetId} not found`);
+            }
+            
+            const subnet = subnetResponse.Subnets[0];
+            const vpcId = subnet.VpcId;
+            
+            // Get all route tables for this VPC
+            const routeTablesCommand = new DescribeRouteTablesCommand({
                 Filters: [
                     {
-                        Name: 'association.subnet-id',
-                        Values: [subnetId]
+                        Name: 'vpc-id',
+                        Values: [vpcId]
                     }
                 ]
             });
             
-            const response = await this.ec2Client.send(command);
+            const routeTablesResponse = await this.ec2Client.send(routeTablesCommand);
             
-            for (const routeTable of response.RouteTables || []) {
-                for (const route of routeTable.Routes || []) {
-                    // If there's a route to an Internet Gateway, it's a public subnet
-                    if (route.GatewayId && route.GatewayId.startsWith('igw-')) {
-                        return false;
+            // Find the route table for this subnet
+            let routeTable = null;
+            
+            // First check for explicit association
+            for (const rt of routeTablesResponse.RouteTables || []) {
+                for (const assoc of rt.Associations || []) {
+                    if (assoc.SubnetId === subnetId) {
+                        routeTable = rt;
+                        break;
+                    }
+                }
+                if (routeTable) break;
+            }
+            
+            // If no explicit association, use the main route table
+            if (!routeTable) {
+                for (const rt of routeTablesResponse.RouteTables || []) {
+                    for (const assoc of rt.Associations || []) {
+                        if (assoc.Main === true) {
+                            routeTable = rt;
+                            break;
+                        }
                     }
+                    if (routeTable) break;
+                }
+            }
+            
+            if (!routeTable) {
+                console.warn(`No route table found for subnet ${subnetId}`);
+                return true; // Default to private for safety
+            }
+            
+            // Check if route table has a route to an Internet Gateway
+            for (const route of routeTable.Routes || []) {
+                if (route.GatewayId && route.GatewayId.startsWith('igw-')) {
+                    return false; // It's a public subnet
                 }
             }
             
-            return true; // No IGW route found, assume private
+            return true; // No IGW route found, it's private
         } catch (error) {
             console.warn(`Could not determine if subnet ${subnetId} is private:`, error);
             return true; // Default to private for safety

package/infrastructure/create-frigg-infrastructure.js

@@ -4,7 +4,7 @@ const { composeServerlessDefinition } = require('./serverless-template');
 
 const { findNearestBackendPackageJson } = require('@friggframework/core');
 
-function createFriggInfrastructure() {
+async function createFriggInfrastructure() {
     const backendPath = findNearestBackendPackageJson();
     if (!backendPath) {
         throw new Error('Could not find backend package.json');
@@ -23,7 +23,7 @@ function createFriggInfrastructure() {
     //     __dirname,
     //     './serverless-template.js'
     // ));
-    const definition = composeServerlessDefinition(
+    const definition = await composeServerlessDefinition(
         appDefinition,
         backend.IntegrationFactory
     );

package/infrastructure/run-discovery.js

@@ -10,6 +10,8 @@ const { findNearestBackendPackageJson } = require('@friggframework/core');
 const path = require('path');
 
 async function runDiscovery() {
+    let appDefinition;
+    
     try {
         console.log('🔍 Starting AWS resource discovery...');
         
@@ -30,7 +32,7 @@ async function runDiscovery() {
 
         // Load the app definition
         const backend = require(backendFilePath);
-        const appDefinition = backend.Definition;
+        appDefinition = backend.Definition;
 
         if (!appDefinition) {
             console.log('⚠️  No Definition found in backend/index.js, skipping discovery');

package/infrastructure/serverless-template.js

@@ -1,5 +1,17 @@
 const path = require('path');
 const fs = require('fs');
+const { AWSDiscovery } = require('./aws-discovery');
+
+/**
+ * Check if AWS discovery should run based on AppDefinition
+ * @param {Object} AppDefinition - Application definition
+ * @returns {boolean} True if discovery should run
+ */
+const shouldRunDiscovery = (AppDefinition) => {
+    return AppDefinition.vpc?.enable === true || 
+           AppDefinition.encryption?.useDefaultKMSForFieldLevelEncryption === true ||
+           AppDefinition.ssm?.enable === true;
+};
 
 /**
  * Find the actual path to node_modules directory
@@ -438,7 +450,44 @@ const createVPCInfrastructure = (AppDefinition) => {
  * @param {boolean} [AppDefinition.websockets.enable=false] - Enable WebSocket support for live update streaming
  * @returns {Object} Complete serverless framework configuration
  */
-const composeServerlessDefinition = (AppDefinition) => {
+const composeServerlessDefinition = async (AppDefinition) => {
+    // Store discovered resources
+    let discoveredResources = {};
+    
+    // Run AWS discovery if needed
+    if (shouldRunDiscovery(AppDefinition)) {
+        console.log('🔍 Running AWS resource discovery for serverless template...');
+        try {
+            const region = process.env.AWS_REGION || 'us-east-1';
+            const discovery = new AWSDiscovery(region);
+            
+            const config = {
+                vpc: AppDefinition.vpc || {},
+                encryption: AppDefinition.encryption || {},
+                ssm: AppDefinition.ssm || {}
+            };
+            
+            discoveredResources = await discovery.discoverResources(config);
+            
+            console.log('✅ AWS discovery completed successfully!');
+            if (discoveredResources.defaultVpcId) {
+                console.log(`   VPC: ${discoveredResources.defaultVpcId}`);
+            }
+            if (discoveredResources.privateSubnetIds) {
+                console.log(`   Subnets: ${discoveredResources.privateSubnetIds.join(', ')}`);
+            }
+            if (discoveredResources.defaultSecurityGroupId) {
+                console.log(`   Security Group: ${discoveredResources.defaultSecurityGroupId}`);
+            }
+            if (discoveredResources.defaultKmsKeyId) {
+                console.log(`   KMS Key: ${discoveredResources.defaultKmsKeyId}`);
+            }
+        } catch (error) {
+            console.error('❌ AWS discovery failed:', error.message);
+            throw new Error(`AWS discovery failed: ${error.message}`);
+        }
+    }
+    
     const definition = {
         frameworkVersion: '>=3.17.0',
         service: AppDefinition.name || 'create-frigg-app',
@@ -456,6 +505,14 @@ const composeServerlessDefinition = (AppDefinition) => {
             environment: {
                 STAGE: '${opt:stage}',
                 AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1,
+                // 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.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 }),
             },
             iamRoleStatements: [
                 {
@@ -666,7 +723,7 @@ const composeServerlessDefinition = (AppDefinition) => {
 
         // Configure KMS grants with discovered default key
         definition.custom.kmsGrants = {
-            kmsKeyId: '${env:AWS_DISCOVERY_KMS_KEY_ID}'
+            kmsKeyId: discoveredResources.defaultKmsKeyId || '${env:AWS_DISCOVERY_KMS_KEY_ID}'
         };
     }
 
@@ -720,11 +777,11 @@ const composeServerlessDefinition = (AppDefinition) => {
             // VPC configuration using discovered or explicitly provided resources
             const vpcConfig = {
                 securityGroupIds: AppDefinition.vpc.securityGroupIds || 
-                                  ['${env:AWS_DISCOVERY_SECURITY_GROUP_ID}'],
-                subnetIds: AppDefinition.vpc.subnetIds || [
-                    '${env:AWS_DISCOVERY_SUBNET_ID_1}',
-                    '${env:AWS_DISCOVERY_SUBNET_ID_2}'
-                ]
+                                  (discoveredResources.defaultSecurityGroupId ? [discoveredResources.defaultSecurityGroupId] : ['${env:AWS_DISCOVERY_SECURITY_GROUP_ID}']),
+                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}'])
             };
 
             // Set VPC config for Lambda functions
@@ -746,7 +803,7 @@ const composeServerlessDefinition = (AppDefinition) => {
                 Type: 'AWS::EC2::NatGateway',
                 Properties: {
                     AllocationId: { 'Fn::GetAtt': ['FriggNATGatewayEIP', 'AllocationId'] },
-                    SubnetId: '${env:AWS_DISCOVERY_PUBLIC_SUBNET_ID}', // Discovery finds public subnet
+                    SubnetId: discoveredResources.publicSubnetId || '${env:AWS_DISCOVERY_PUBLIC_SUBNET_ID}', // Discovery finds public subnet
                     Tags: [
                         { Key: 'Name', Value: '${self:service}-${self:provider.stage}-nat-gateway' }
                     ]
@@ -757,7 +814,7 @@ const composeServerlessDefinition = (AppDefinition) => {
             definition.resources.Resources.FriggLambdaRouteTable = {
                 Type: 'AWS::EC2::RouteTable',
                 Properties: {
-                    VpcId: '${env:AWS_DISCOVERY_VPC_ID}',
+                    VpcId: discoveredResources.defaultVpcId || '${env:AWS_DISCOVERY_VPC_ID}',
                     Tags: [
                         { Key: 'Name', Value: '${self:service}-${self:provider.stage}-lambda-rt' }
                     ]
@@ -777,7 +834,7 @@ const composeServerlessDefinition = (AppDefinition) => {
             definition.resources.Resources.FriggSubnet1RouteAssociation = {
                 Type: 'AWS::EC2::SubnetRouteTableAssociation',
                 Properties: {
-                    SubnetId: '${env:AWS_DISCOVERY_SUBNET_ID_1}',
+                    SubnetId: discoveredResources.privateSubnetIds?.[0] || '${env:AWS_DISCOVERY_SUBNET_ID_1}',
                     RouteTableId: { Ref: 'FriggLambdaRouteTable' }
                 }
             };
@@ -785,7 +842,7 @@ const composeServerlessDefinition = (AppDefinition) => {
             definition.resources.Resources.FriggSubnet2RouteAssociation = {
                 Type: 'AWS::EC2::SubnetRouteTableAssociation',
                 Properties: {
-                    SubnetId: '${env:AWS_DISCOVERY_SUBNET_ID_2}',
+                    SubnetId: discoveredResources.privateSubnetIds?.[1] || '${env:AWS_DISCOVERY_SUBNET_ID_2}',
                     RouteTableId: { Ref: 'FriggLambdaRouteTable' }
                 }
             };
@@ -795,7 +852,7 @@ const composeServerlessDefinition = (AppDefinition) => {
                 definition.resources.Resources.VPCEndpointS3 = {
                     Type: 'AWS::EC2::VPCEndpoint',
                     Properties: {
-                        VpcId: '${env:AWS_DISCOVERY_VPC_ID}',
+                        VpcId: discoveredResources.defaultVpcId || '${env:AWS_DISCOVERY_VPC_ID}',
                         ServiceName: 'com.amazonaws.${self:provider.region}.s3',
                         VpcEndpointType: 'Gateway',
                         RouteTableIds: [{ Ref: 'FriggLambdaRouteTable' }]
@@ -805,7 +862,7 @@ const composeServerlessDefinition = (AppDefinition) => {
                 definition.resources.Resources.VPCEndpointDynamoDB = {
                     Type: 'AWS::EC2::VPCEndpoint',
                     Properties: {
-                        VpcId: '${env:AWS_DISCOVERY_VPC_ID}',
+                        VpcId: discoveredResources.defaultVpcId || '${env:AWS_DISCOVERY_VPC_ID}',
                         ServiceName: 'com.amazonaws.${self:provider.region}.dynamodb',
                         VpcEndpointType: 'Gateway',
                         RouteTableIds: [{ Ref: 'FriggLambdaRouteTable' }]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.398.a2fbc38.0",
+  "version": "2.0.0--canary.398.90b58c8.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.a2fbc38.0",
+    "@friggframework/test": "2.0.0--canary.398.90b58c8.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.a2fbc38.0",
-    "@friggframework/prettier-config": "2.0.0--canary.398.a2fbc38.0",
+    "@friggframework/eslint-config": "2.0.0--canary.398.90b58c8.0",
+    "@friggframework/prettier-config": "2.0.0--canary.398.90b58c8.0",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a2fbc389033dc1b5ea73edc30fe53292f36887b4"
+  "gitHead": "90b58c8e19b569bca169038b097a8b7358ca3268"
 }