@friggframework/devtools 2.0.0--canary.398.ad248a6.0 → 2.0.0--canary.398.4f043c8.0

package/infrastructure/serverless-template.js

@@ -500,7 +500,7 @@ const composeServerlessDefinition = async (AppDefinition) => {
             name: AppDefinition.provider || 'aws',
             runtime: 'nodejs20.x',
             timeout: 30,
-            region: 'us-east-1',
+            region: process.env.AWS_REGION || 'us-east-1',
             stage: '${opt:stage}',
             environment: {
                 STAGE: '${opt:stage}',
@@ -563,7 +563,7 @@ const composeServerlessDefinition = async (AppDefinition) => {
                 autoCreate: false,
                 apiVersion: '2012-11-05',
                 endpoint: 'http://localhost:4566',
-                region: 'us-east-1',
+                region: process.env.AWS_REGION || 'us-east-1',
                 accessKeyId: 'root',
                 secretAccessKey: 'root',
                 skipCacheInvalidation: false,
@@ -906,11 +906,15 @@ const composeServerlessDefinition = async (AppDefinition) => {
     }
 
     // Add integration-specific functions and resources
-    for (const integration of AppDefinition.integrations) {
-        const integrationName = integration.Definition.name;
+    if (AppDefinition.integrations && Array.isArray(AppDefinition.integrations)) {
+        for (const integration of AppDefinition.integrations) {
+            if (!integration || !integration.Definition || !integration.Definition.name) {
+                throw new Error('Invalid integration: missing Definition or name');
+            }
+            const integrationName = integration.Definition.name;
 
-        // Add function for the integration
-        definition.functions[integrationName] = {
+            // Add function for the integration
+            definition.functions[integrationName] = {
             handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${integrationName}.handler`,
             events: [
                 {
@@ -923,11 +927,11 @@ const composeServerlessDefinition = async (AppDefinition) => {
             ],
         };
 
-        // Add SQS Queue for the integration
-        const queueReference = `${integrationName.charAt(0).toUpperCase() + integrationName.slice(1)
-            }Queue`;
-        const queueName = `\${self:service}--\${self:provider.stage}-${queueReference}`;
-        definition.resources.Resources[queueReference] = {
+            // Add SQS Queue for the integration
+            const queueReference = `${integrationName.charAt(0).toUpperCase() + integrationName.slice(1)
+                }Queue`;
+            const queueName = `\${self:service}--\${self:provider.stage}-${queueReference}`;
+            definition.resources.Resources[queueReference] = {
             Type: 'AWS::SQS::Queue',
             Properties: {
                 QueueName: `\${self:custom.${queueReference}}`,
@@ -942,9 +946,9 @@ const composeServerlessDefinition = async (AppDefinition) => {
             },
         };
 
-        // Add Queue Worker for the integration
-        const queueWorkerName = `${integrationName}QueueWorker`;
-        definition.functions[queueWorkerName] = {
+            // Add Queue Worker for the integration
+            const queueWorkerName = `${integrationName}QueueWorker`;
+            definition.functions[queueWorkerName] = {
             handler: `node_modules/@friggframework/core/handlers/workers/integration-defined-workers.handlers.${integrationName}.queueWorker`,
             reservedConcurrency: 5,
             events: [
@@ -960,15 +964,43 @@ const composeServerlessDefinition = async (AppDefinition) => {
             timeout: 600,
         };
 
-        // Add Queue URL for the integration to the ENVironment variables
-        definition.provider.environment = {
-            ...definition.provider.environment,
-            [`${integrationName.toUpperCase()}_QUEUE_URL`]: {
-                Ref: queueReference,
-            },
-        };
+            // Add Queue URL for the integration to the ENVironment variables
+            definition.provider.environment = {
+                ...definition.provider.environment,
+                [`${integrationName.toUpperCase()}_QUEUE_URL`]: {
+                    Ref: queueReference,
+                },
+            };
 
-        definition.custom[queueReference] = queueName;
+            definition.custom[queueReference] = queueName;
+        }
+    }
+
+    // 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) {
+        definition.functions.defaultWebsocket = {
+            handler: 'node_modules/@friggframework/core/handlers/routers/websocket.handler',
+            events: [
+                {
+                    websocket: {
+                        route: '$connect',
+                    },
+                },
+                {
+                    websocket: {
+                        route: '$default',
+                    },
+                },
+                {
+                    websocket: {
+                        route: '$disconnect',
+                    },
+                },
+            ],
+        };
     }
 
     // Discovery has already run successfully at this point if needed

package/infrastructure/serverless-template.test.js

@@ -1,11 +1,21 @@
 const { composeServerlessDefinition } = require('./serverless-template');
 
-// Mock the node_modules path finding functions
-jest.mock('./serverless-template', () => {
-    const originalModule = jest.requireActual('./serverless-template');
+// Mock AWS Discovery to prevent actual AWS calls
+jest.mock('./aws-discovery', () => {
     return {
-        ...originalModule,
-        composeServerlessDefinition: originalModule.composeServerlessDefinition
+        AWSDiscovery: jest.fn().mockImplementation(() => {
+            return {
+                discoverResources: jest.fn().mockResolvedValue({
+                    defaultVpcId: 'vpc-123456',
+                    defaultSecurityGroupId: 'sg-123456',
+                    privateSubnetId1: 'subnet-123456',
+                    privateSubnetId2: 'subnet-789012',
+                    publicSubnetId: 'subnet-public',
+                    defaultRouteTableId: 'rtb-123456',
+                    defaultKmsKeyId: 'arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012'
+                })
+            };
+        })
     };
 });
 
@@ -20,21 +30,26 @@ describe('composeServerlessDefinition', () => {
         };
 
         // Mock process.argv to avoid offline mode during tests
-        jest.spyOn(process, 'argv', 'get').mockReturnValue(['node', 'test']);
+        process.argv = ['node', 'test'];
+
+        // Clear AWS_REGION for tests
+        delete process.env.AWS_REGION;
     });
 
     afterEach(() => {
         jest.restoreAllMocks();
+        // Restore env
+        delete process.env.AWS_REGION;
     });
 
     describe('Basic Configuration', () => {
-        it('should create basic serverless definition with minimal app definition', () => {
+        it('should create basic serverless definition with minimal app definition', async () => {
             const appDefinition = {
                 name: 'test-app',
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.service).toBe('test-app');
             expect(result.provider.name).toBe('aws');
@@ -44,36 +59,64 @@ describe('composeServerlessDefinition', () => {
             expect(result.frameworkVersion).toBe('>=3.17.0');
         });
 
-        it('should use default service name when name not provided', () => {
+        it('should use default service name when name not provided', async () => {
             const appDefinition = {
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.service).toBe('create-frigg-app');
         });
 
-        it('should use custom provider when specified', () => {
+        it('should use custom provider when specified', async () => {
             const appDefinition = {
                 provider: 'custom-provider',
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.provider.name).toBe('custom-provider');
         });
+
+        it('should use AWS_REGION environment variable when set', async () => {
+            process.env.AWS_REGION = 'eu-west-1';
+
+            const appDefinition = {
+                name: 'test-app',
+                integrations: []
+            };
+
+            const result = await composeServerlessDefinition(appDefinition);
+
+            expect(result.provider.region).toBe('eu-west-1');
+            expect(result.custom['serverless-offline-sqs'].region).toBe('eu-west-1');
+        });
+
+        it('should default to us-east-1 when AWS_REGION is not set', async () => {
+            delete process.env.AWS_REGION;
+
+            const appDefinition = {
+                name: 'test-app',
+                integrations: []
+            };
+
+            const result = await composeServerlessDefinition(appDefinition);
+
+            expect(result.provider.region).toBe('us-east-1');
+            expect(result.custom['serverless-offline-sqs'].region).toBe('us-east-1');
+        });
     });
 
     describe('VPC Configuration', () => {
-        it('should add VPC configuration when vpc.enable is true', () => {
+        it('should add VPC configuration when vpc.enable is true', async () => {
             const appDefinition = {
                 vpc: { enable: true },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.provider.vpc).toBe('${self:custom.vpc.${self:provider.stage}}');
             expect(result.custom.vpc).toEqual({
@@ -87,13 +130,13 @@ describe('composeServerlessDefinition', () => {
             });
         });
 
-        it('should add VPC endpoint for S3 when VPC is enabled', () => {
+        it('should add VPC endpoint for S3 when VPC is enabled', async () => {
             const appDefinition = {
                 vpc: { enable: true },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.resources.Resources.VPCEndpointS3).toEqual({
                 Type: 'AWS::EC2::VPCEndpoint',
@@ -106,25 +149,25 @@ describe('composeServerlessDefinition', () => {
             });
         });
 
-        it('should not add VPC configuration when vpc.enable is false', () => {
+        it('should not add VPC configuration when vpc.enable is false', async () => {
             const appDefinition = {
                 vpc: { enable: false },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.provider.vpc).toBeUndefined();
             expect(result.custom.vpc).toBeUndefined();
             expect(result.resources.Resources.VPCEndpointS3).toBeUndefined();
         });
 
-        it('should not add VPC configuration when vpc is not defined', () => {
+        it('should not add VPC configuration when vpc is not defined', async () => {
             const appDefinition = {
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.provider.vpc).toBeUndefined();
             expect(result.custom.vpc).toBeUndefined();
@@ -132,13 +175,13 @@ describe('composeServerlessDefinition', () => {
     });
 
     describe('KMS Configuration', () => {
-        it('should add KMS configuration when encryption is enabled', () => {
+        it('should add KMS configuration when encryption is enabled', async () => {
             const appDefinition = {
                 encryption: { useDefaultKMSForFieldLevelEncryption: true },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             // Check IAM permissions
             const kmsPermission = result.provider.iamRoleStatements.find(
@@ -165,13 +208,13 @@ describe('composeServerlessDefinition', () => {
             });
         });
 
-        it('should not add KMS configuration when encryption is disabled', () => {
+        it('should not add KMS configuration when encryption is disabled', async () => {
             const appDefinition = {
                 encryption: { useDefaultKMSForFieldLevelEncryption: false },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             const kmsPermission = result.provider.iamRoleStatements.find(
                 statement => statement.Action && statement.Action.includes('kms:GenerateDataKey')
@@ -182,12 +225,12 @@ describe('composeServerlessDefinition', () => {
             expect(result.custom.kmsGrants).toBeUndefined();
         });
 
-        it('should not add KMS configuration when encryption is not defined', () => {
+        it('should not add KMS configuration when encryption is not defined', async () => {
             const appDefinition = {
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             const kmsPermission = result.provider.iamRoleStatements.find(
                 statement => statement.Action && statement.Action.includes('kms:GenerateDataKey')
@@ -198,13 +241,13 @@ describe('composeServerlessDefinition', () => {
     });
 
     describe('SSM Configuration', () => {
-        it('should add SSM configuration when ssm.enable is true', () => {
+        it('should add SSM configuration when ssm.enable is true', async () => {
             const appDefinition = {
                 ssm: { enable: true },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             // Check lambda layers
             expect(result.provider.layers).toEqual([
@@ -231,16 +274,16 @@ describe('composeServerlessDefinition', () => {
             expect(result.provider.environment.SSM_PARAMETER_PREFIX).toBe('/${self:service}/${self:provider.stage}');
         });
 
-        it('should not add SSM configuration when ssm.enable is false', () => {
+        it('should not add SSM configuration when ssm.enable is false', async () => {
             const appDefinition = {
                 ssm: { enable: false },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.provider.layers).toBeUndefined();
-            
+
             const ssmPermission = result.provider.iamRoleStatements.find(
                 statement => statement.Action && statement.Action.includes('ssm:GetParameter')
             );
@@ -248,12 +291,12 @@ describe('composeServerlessDefinition', () => {
             expect(result.provider.environment.SSM_PARAMETER_PREFIX).toBeUndefined();
         });
 
-        it('should not add SSM configuration when ssm is not defined', () => {
+        it('should not add SSM configuration when ssm is not defined', async () => {
             const appDefinition = {
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.provider.layers).toBeUndefined();
             expect(result.provider.environment.SSM_PARAMETER_PREFIX).toBeUndefined();
@@ -261,12 +304,12 @@ describe('composeServerlessDefinition', () => {
     });
 
     describe('Integration Configuration', () => {
-        it('should add integration-specific resources and functions', () => {
+        it('should add integration-specific resources and functions', async () => {
             const appDefinition = {
                 integrations: [mockIntegration]
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             // Check integration function
             expect(result.functions.testIntegration).toEqual({
@@ -320,7 +363,7 @@ describe('composeServerlessDefinition', () => {
             expect(result.custom.TestIntegrationQueue).toBe('${self:service}--${self:provider.stage}-TestIntegrationQueue');
         });
 
-        it('should handle multiple integrations', () => {
+        it('should handle multiple integrations', async () => {
             const secondIntegration = {
                 Definition: {
                     name: 'secondIntegration'
@@ -331,7 +374,7 @@ describe('composeServerlessDefinition', () => {
                 integrations: [mockIntegration, secondIntegration]
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.functions.testIntegration).toBeDefined();
             expect(result.functions.secondIntegration).toBeDefined();
@@ -343,7 +386,7 @@ describe('composeServerlessDefinition', () => {
     });
 
     describe('Combined Configurations', () => {
-        it('should combine VPC, KMS, and SSM configurations', () => {
+        it('should combine VPC, KMS, and SSM configurations', async () => {
             const appDefinition = {
                 vpc: { enable: true },
                 encryption: { useDefaultKMSForFieldLevelEncryption: true },
@@ -351,7 +394,7 @@ describe('composeServerlessDefinition', () => {
                 integrations: [mockIntegration]
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             // VPC
             expect(result.provider.vpc).toBeDefined();
@@ -382,14 +425,14 @@ describe('composeServerlessDefinition', () => {
             ]);
         });
 
-        it('should handle partial configuration combinations', () => {
+        it('should handle partial configuration combinations', async () => {
             const appDefinition = {
                 vpc: { enable: true },
                 encryption: { useDefaultKMSForFieldLevelEncryption: true },
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             // VPC and KMS should be present
             expect(result.provider.vpc).toBeDefined();
@@ -402,12 +445,12 @@ describe('composeServerlessDefinition', () => {
     });
 
     describe('Default Resources', () => {
-        it('should always include default resources', () => {
+        it('should always include default resources', async () => {
             const appDefinition = {
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             // Check default resources are always present
             expect(result.resources.Resources.InternalErrorQueue).toBeDefined();
@@ -426,12 +469,12 @@ describe('composeServerlessDefinition', () => {
             expect(result.plugins).toContain('@friggframework/serverless-plugin');
         });
 
-        it('should always include default IAM permissions', () => {
+        it('should always include default IAM permissions', async () => {
             const appDefinition = {
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             // Check SNS publish permission
             const snsPermission = result.provider.iamRoleStatements.find(
@@ -446,12 +489,12 @@ describe('composeServerlessDefinition', () => {
             expect(sqsPermission).toBeDefined();
         });
 
-        it('should include default environment variables', () => {
+        it('should include default environment variables', async () => {
             const appDefinition = {
                 integrations: []
             };
 
-            const result = composeServerlessDefinition(appDefinition);
+            const result = await composeServerlessDefinition(appDefinition);
 
             expect(result.provider.environment.STAGE).toBe('${opt:stage}');
             expect(result.provider.environment.AWS_NODEJS_CONNECTION_REUSE_ENABLED).toBe(1);
@@ -459,32 +502,32 @@ describe('composeServerlessDefinition', () => {
     });
 
     describe('Edge Cases', () => {
-        it('should handle empty app definition', () => {
+        it('should handle empty app definition', async () => {
             const appDefinition = {};
 
-            expect(() => composeServerlessDefinition(appDefinition)).not.toThrow();
-            const result = composeServerlessDefinition(appDefinition);
+            await expect(composeServerlessDefinition(appDefinition)).resolves.not.toThrow();
+            const result = await composeServerlessDefinition(appDefinition);
             expect(result.service).toBe('create-frigg-app');
         });
 
-        it('should handle null/undefined integrations', () => {
+        it('should handle null/undefined integrations', async () => {
             const appDefinition = {
                 integrations: null
             };
 
-            expect(() => composeServerlessDefinition(appDefinition)).toThrow();
+            await expect(composeServerlessDefinition(appDefinition)).rejects.toThrow();
         });
 
-        it('should handle integration with missing Definition', () => {
+        it('should handle integration with missing Definition', async () => {
             const invalidIntegration = {};
             const appDefinition = {
                 integrations: [invalidIntegration]
             };
 
-            expect(() => composeServerlessDefinition(appDefinition)).toThrow();
+            await expect(composeServerlessDefinition(appDefinition)).rejects.toThrow();
         });
 
-        it('should handle integration with missing name', () => {
+        it('should handle integration with missing name', async () => {
             const invalidIntegration = {
                 Definition: {}
             };
@@ -492,7 +535,7 @@ describe('composeServerlessDefinition', () => {
                 integrations: [invalidIntegration]
             };
 
-            expect(() => composeServerlessDefinition(appDefinition)).toThrow();
+            await expect(composeServerlessDefinition(appDefinition)).rejects.toThrow();
         });
     });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.398.ad248a6.0",
+  "version": "2.0.0--canary.398.4f043c8.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.ad248a6.0",
+    "@friggframework/test": "2.0.0--canary.398.4f043c8.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.ad248a6.0",
-    "@friggframework/prettier-config": "2.0.0--canary.398.ad248a6.0",
+    "@friggframework/eslint-config": "2.0.0--canary.398.4f043c8.0",
+    "@friggframework/prettier-config": "2.0.0--canary.398.4f043c8.0",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ad248a6f65e174c55e1881825ffc438f6e5b1c9a"
+  "gitHead": "4f043c83c9c0bddc961bdaf31a25dc18aba0668c"
 }