@friggframework/devtools 2.0.0--canary.497.a3f25f9.0 → 2.0.0--canary.490.fd1ef7f.0

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

@@ -284,8 +284,13 @@ async function deployCommand(options) {
 
     console.log('\n✓ Deployment completed successfully!');
 
-    // Run post-deployment health check (unless --skip-doctor)
-    if (!options.skipDoctor) {
+    // Run post-deployment health check (unless disabled)
+    // Can be disabled via:
+    // 1. CLI flag: --skip-doctor
+    // 2. AppDefinition: deployment.skipPostDeploymentHealthCheck: true
+    const skipHealthCheck = options.skipDoctor || appDefinition?.deployment?.skipPostDeploymentHealthCheck;
+    
+    if (!skipHealthCheck) {
         const stackName = getStackName(appDefinition, options);
 
         if (stackName) {
@@ -295,7 +300,8 @@ async function deployCommand(options) {
             console.log('   Run "frigg doctor <stack-name>" manually to check stack health');
         }
     } else {
-        console.log('\n⏭️  Skipping post-deployment health check (--skip-doctor)');
+        const reason = options.skipDoctor ? '--skip-doctor flag' : 'deployment.skipPostDeploymentHealthCheck: true';
+        console.log(`\n⏭️  Skipping post-deployment health check (${reason})`);
     }
 }
 

package/infrastructure/README.md

@@ -257,6 +257,34 @@ aws lambda get-function-configuration \
   --query 'Layers[*].Arn'
 ```
 
+**Disabling Prisma Layer (Bundle with Functions):**
+
+By default, Frigg uses a Lambda Layer for Prisma. You can disable this and bundle Prisma directly with each function:
+
+```javascript
+const appDefinition = {
+    name: 'my-app',
+    usePrismaLambdaLayer: false,  // Bundle Prisma with each function
+    integrations: [{ Definition: { name: 'asana' } }],
+};
+```
+
+**When to disable the Prisma Layer:**
+
+-   ✅ CI/CD IAM user lacks `lambda:PublishLayerVersion` permission
+-   ✅ Deploying to environments with Lambda layer restrictions
+-   ✅ Prefer simpler deployment without layer management
+-   ✅ Debugging Prisma client loading issues
+
+**Trade-offs:**
+
+| Mode | Function Size | Deploy Speed | IAM Permissions Required |
+|------|--------------|--------------|-------------------------|
+| **Layer (default)** | ~45MB per function | Faster (layer cached) | `lambda:PublishLayerVersion` |
+| **Bundled** | ~80MB per function | Slower (Prisma uploaded 5x) | None (layer-related) |
+
+**Note:** When `usePrismaLambdaLayer: false`, Prisma client automatically detects the bundled location at runtime. No additional configuration needed.
+
 ## Usage Examples
 
 ### Basic Deployment

package/infrastructure/domains/database/migration-builder.js

@@ -57,6 +57,9 @@ class MigrationBuilder extends InfrastructureBuilder {
         // Backwards compatibility: Translate old schema to new ownership schema
         appDefinition = this.translateLegacyConfig(appDefinition, discoveredResources);
 
+        // Determine if using Prisma Lambda Layer
+        const usePrismaLayer = appDefinition.usePrismaLambdaLayer !== false;
+
         const result = {
             functions: {}, // Lambda function definitions
             resources: {},
@@ -76,7 +79,7 @@ class MigrationBuilder extends InfrastructureBuilder {
         console.log(`     Queue: ${decisions.queue.ownership} - ${decisions.queue.reason}`);
 
         // Build resources based on ownership decisions
-        await this.buildFromDecisions(decisions, appDefinition, discoveredResources, result);
+        await this.buildFromDecisions(decisions, appDefinition, discoveredResources, result, usePrismaLayer);
 
         console.log(`[${this.name}] ✅ Migration infrastructure configuration completed`);
         return result;
@@ -207,7 +210,7 @@ class MigrationBuilder extends InfrastructureBuilder {
     /**
      * Build migration resources based on ownership decisions
      */
-    async buildFromDecisions(decisions, appDefinition, discoveredResources, result) {
+    async buildFromDecisions(decisions, appDefinition, discoveredResources, result, usePrismaLayer = true) {
         // Determine if we need to create resources or use existing ones
         const shouldCreateBucket = decisions.bucket.ownership === ResourceOwnership.STACK;
         const shouldCreateQueue = decisions.queue.ownership === ResourceOwnership.STACK;
@@ -215,12 +218,12 @@ class MigrationBuilder extends InfrastructureBuilder {
         if (shouldCreateBucket && shouldCreateQueue && !decisions.bucket.physicalId && !decisions.queue.physicalId) {
             // Create all new migration infrastructure
             console.log('  → Creating new migration infrastructure in stack');
-            await this.createMigrationInfrastructure(appDefinition, result);
+            await this.createMigrationInfrastructure(appDefinition, result, usePrismaLayer);
         } else if ((decisions.bucket.ownership === ResourceOwnership.STACK && decisions.bucket.physicalId) ||
                    (decisions.queue.ownership === ResourceOwnership.STACK && decisions.queue.physicalId)) {
             // Resources exist in stack - add definitions (CloudFormation idempotency)
             console.log('  → Adding migration definitions to template (existing in stack)');
-            await this.createMigrationInfrastructure(appDefinition, result);
+            await this.createMigrationInfrastructure(appDefinition, result, usePrismaLayer);
         } else {
             // Use external resources
             console.log('  → Using external migration resources');
@@ -232,18 +235,21 @@ class MigrationBuilder extends InfrastructureBuilder {
      * Create Lambda function definitions for database migrations
      * Based on refactor/add-better-support-for-commands branch implementation
      */
-    async createFunctionDefinitions(result) {
+    async createFunctionDefinitions(result, usePrismaLayer = true) {
         console.log('  🔍 DEBUG: createFunctionDefinitions called');
         console.log('  🔍 DEBUG: result.functions is:', typeof result.functions, result.functions);
         // Migration WORKER package config (needs Prisma CLI WASM files)
         const migrationWorkerPackageConfig = {
             individually: true,
             exclude: [
-                // Exclude Prisma runtime client - it's in the Lambda Layer
-                'node_modules/@prisma/client/**',
-                'node_modules/.prisma/**',
-                'node_modules/@friggframework/core/generated/**',
-                // But KEEP node_modules/prisma/** (the CLI with WASM)
+                // Conditionally exclude Prisma (only if using layer)
+                ...(usePrismaLayer ? [
+                    // Exclude Prisma runtime client - it's in the Lambda Layer
+                    'node_modules/@prisma/client/**',
+                    'node_modules/.prisma/**',
+                    'node_modules/@friggframework/core/generated/**',
+                    // But KEEP node_modules/prisma/** (the CLI with WASM)
+                ] : []),
 
                 // Exclude ALL nested node_modules
                 'node_modules/**/node_modules/**',
@@ -422,7 +428,7 @@ class MigrationBuilder extends InfrastructureBuilder {
         console.log('  🔍 DEBUG: About to create dbMigrationWorker...');
         result.functions.dbMigrationWorker = {
             handler: 'node_modules/@friggframework/core/handlers/workers/db-migration.handler',
-            layers: [{ Ref: 'PrismaLambdaLayer' }], // Use layer for Prisma client runtime
+            ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }), // Conditionally use layer
             skipEsbuild: true,
             timeout: 900, // 15 minutes for long migrations
             memorySize: 1024, // Extra memory for Prisma operations
@@ -484,12 +490,12 @@ class MigrationBuilder extends InfrastructureBuilder {
      * Create migration infrastructure CloudFormation resources
      * Creates S3 bucket, SQS queue, and Lambda function definitions
      */
-    async createMigrationInfrastructure(appDefinition, result) {
+    async createMigrationInfrastructure(appDefinition, result, usePrismaLayer = true) {
         console.log('  🔍 DEBUG: createMigrationInfrastructure called');
         console.log('  🔍 DEBUG: result object before createFunctionDefinitions:', Object.keys(result));
 
         // Create Lambda function definitions first (they reference the queue)
-        await this.createFunctionDefinitions(result);
+        await this.createFunctionDefinitions(result, usePrismaLayer);
 
         console.log('  🔍 DEBUG: result.functions after createFunctionDefinitions:', Object.keys(result.functions || {}));
 

package/infrastructure/domains/database/migration-builder.test.js

@@ -290,5 +290,62 @@ describe('MigrationBuilder', () => {
             expect(builder.getName()).toBe('MigrationBuilder');
         });
     });
+
+    describe('usePrismaLayer configuration', () => {
+        it('should include Prisma layer in migration worker when usePrismaLayer=true (default)', async () => {
+            const appDef = {
+                database: {
+                    postgres: { enable: true },
+                },
+                usePrismaLambdaLayer: true,
+            };
+
+            const result = await builder.build(appDef, {});
+
+            expect(result.functions.dbMigrationWorker.layers).toEqual([{ Ref: 'PrismaLambdaLayer' }]);
+            
+            // Prisma client should be excluded from package (but not CLI)
+            expect(result.functions.dbMigrationWorker.package.exclude).toEqual(
+                expect.arrayContaining([
+                    'node_modules/@prisma/client/**',
+                    'node_modules/.prisma/**',
+                    'node_modules/@friggframework/core/generated/**',
+                ])
+            );
+        });
+
+        it('should NOT include Prisma layer when usePrismaLayer=false', async () => {
+            const appDef = {
+                database: {
+                    postgres: { enable: true },
+                },
+                usePrismaLambdaLayer: false,
+            };
+
+            const result = await builder.build(appDef, {});
+
+            expect(result.functions.dbMigrationWorker.layers).toBeUndefined();
+        });
+
+        it('should bundle Prisma CLI with migration worker when usePrismaLayer=false', async () => {
+            const appDef = {
+                database: {
+                    postgres: { enable: true },
+                },
+                usePrismaLambdaLayer: false,
+            };
+
+            const result = await builder.build(appDef, {});
+
+            // Prisma should NOT be excluded from package (will be bundled)
+            expect(result.functions.dbMigrationWorker.package.exclude).not.toEqual(
+                expect.arrayContaining([
+                    'node_modules/@prisma/client/**',
+                    'node_modules/.prisma/**',
+                    'node_modules/@friggframework/core/generated/**',
+                ])
+            );
+        });
+    });
 });
 

package/infrastructure/domains/integration/integration-builder.js

@@ -62,6 +62,9 @@ class IntegrationBuilder extends InfrastructureBuilder {
         console.log(`\n[${this.name}] Configuring integrations...`);
         console.log(`  Processing ${appDefinition.integrations.length} integrations...`);
 
+        // Determine if using Prisma Lambda Layer
+        const usePrismaLayer = appDefinition.usePrismaLambdaLayer !== false;
+
         const result = {
             functions: {},
             resources: {},
@@ -87,7 +90,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
         });
 
         // Build resources based on ownership decisions
-        await this.buildFromDecisions(decisions, appDefinition, result);
+        await this.buildFromDecisions(decisions, appDefinition, result, usePrismaLayer);
 
         console.log(`[${this.name}] ✅ Integration configuration completed`);
         return result;
@@ -142,7 +145,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
     /**
      * Build integration resources based on ownership decisions
      */
-    async buildFromDecisions(decisions, appDefinition, result) {
+    async buildFromDecisions(decisions, appDefinition, result, usePrismaLayer = true) {
         // Create InternalErrorQueue if ownership = STACK
         const shouldCreateInternalErrorQueue = decisions.internalErrorQueue.ownership === ResourceOwnership.STACK;
 
@@ -155,7 +158,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
         }
 
         // Create Lambda function definitions and queue resources for each integration
-        const functionPackageConfig = this.createFunctionPackageConfig();
+        const functionPackageConfig = this.createFunctionPackageConfig(usePrismaLayer);
 
         for (const integration of appDefinition.integrations) {
             const integrationName = integration.Definition.name;
@@ -164,7 +167,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
             console.log(`\n    Adding integration: ${integrationName}`);
 
             // Create Lambda function definitions (serverless template code)
-            await this.createFunctionDefinitions(integration, functionPackageConfig, result);
+            await this.createFunctionDefinitions(integration, functionPackageConfig, result, usePrismaLayer);
 
             // Create or reference SQS queue based on ownership decision
             const shouldCreateQueue = queueDecision.ownership === ResourceOwnership.STACK;
@@ -182,18 +185,20 @@ class IntegrationBuilder extends InfrastructureBuilder {
     /**
      * Create function package exclusion configuration
      */
-    createFunctionPackageConfig() {
+    createFunctionPackageConfig(usePrismaLayer = true) {
         return {
             exclude: [
                 // Exclude AWS SDK (provided by Lambda runtime)
                 'node_modules/aws-sdk/**',
                 'node_modules/@aws-sdk/**',
 
-                // Exclude Prisma (provided via Lambda Layer)
-                'node_modules/@prisma/**',
-                'node_modules/.prisma/**',
-                'node_modules/prisma/**',
-                'node_modules/@friggframework/core/generated/**',
+                // Conditionally exclude Prisma (only if using Lambda Layer)
+                ...(usePrismaLayer ? [
+                    'node_modules/@prisma/**',
+                    'node_modules/.prisma/**',
+                    'node_modules/prisma/**',
+                    'node_modules/@friggframework/core/generated/**',
+                ] : []),
 
                 // Exclude ALL nested node_modules
                 'node_modules/**/node_modules/**',
@@ -249,7 +254,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
      * Create Lambda function definitions for an integration
      * These are serverless framework template function definitions
      */
-    async createFunctionDefinitions(integration, functionPackageConfig, result) {
+    async createFunctionDefinitions(integration, functionPackageConfig, result, usePrismaLayer = true) {
         const integrationName = integration.Definition.name;
 
         // Add webhook handler if enabled (BEFORE catch-all proxy route)
@@ -261,9 +266,9 @@ class IntegrationBuilder extends InfrastructureBuilder {
 
             result.functions[webhookFunctionName] = {
                 handler: `node_modules/@friggframework/core/handlers/routers/integration-webhook-routers.handlers.${integrationName}Webhook.handler`,
+                ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
                 skipEsbuild: true,  // Nested exports in node_modules - skip esbuild bundling
                 package: functionPackageConfig,
-                layers: [{ Ref: 'PrismaLambdaLayer' }],  // Webhook handlers need Prisma for credential lookups
                 events: [
                     {
                         httpApi: {
@@ -285,9 +290,9 @@ class IntegrationBuilder extends InfrastructureBuilder {
         // Create HTTP API handler for integration (catch-all route AFTER webhooks)
         result.functions[integrationName] = {
             handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${integrationName}.handler`,
+            ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
             skipEsbuild: true,  // Nested exports in node_modules - skip esbuild bundling
             package: functionPackageConfig,
-            layers: [{ Ref: 'PrismaLambdaLayer' }],  // HTTP handlers need Prisma for integration queries
             events: [
                 {
                     httpApi: {
@@ -303,9 +308,9 @@ class IntegrationBuilder extends InfrastructureBuilder {
         const queueWorkerName = `${integrationName}QueueWorker`;
         result.functions[queueWorkerName] = {
             handler: `node_modules/@friggframework/core/handlers/workers/integration-defined-workers.handlers.${integrationName}.queueWorker`,
+            ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
             skipEsbuild: true,  // Nested exports in node_modules - skip esbuild bundling
             package: functionPackageConfig,
-            layers: [{ Ref: 'PrismaLambdaLayer' }],  // Queue workers need Prisma for database operations
             reservedConcurrency: 5,
             events: [
                 {

package/infrastructure/domains/integration/integration-builder.test.js

@@ -589,79 +589,5 @@ describe('IntegrationBuilder', () => {
             expect(result.functions.testWebhook.package.exclude).toContain('node_modules/@prisma/**');
         });
     });
-
-    describe('Prisma Layer Configuration', () => {
-        it('should attach Prisma Lambda layer to queue worker functions', async () => {
-            const appDefinition = {
-                integrations: [
-                    { Definition: { name: 'hubspot' } },
-                ],
-            };
-
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            // Queue workers need Prisma layer for database operations
-            expect(result.functions.hubspotQueueWorker.layers).toEqual([
-                { Ref: 'PrismaLambdaLayer' }
-            ]);
-        });
-
-        it('should attach Prisma layer to multiple queue workers', async () => {
-            const appDefinition = {
-                integrations: [
-                    { Definition: { name: 'hubspot' } },
-                    { Definition: { name: 'salesforce' } },
-                    { Definition: { name: 'slack' } },
-                ],
-            };
-
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            expect(result.functions.hubspotQueueWorker.layers).toEqual([
-                { Ref: 'PrismaLambdaLayer' }
-            ]);
-            expect(result.functions.salesforceQueueWorker.layers).toEqual([
-                { Ref: 'PrismaLambdaLayer' }
-            ]);
-            expect(result.functions.slackQueueWorker.layers).toEqual([
-                { Ref: 'PrismaLambdaLayer' }
-            ]);
-        });
-
-        it('should attach Prisma layer to HTTP handlers for database access', async () => {
-            const appDefinition = {
-                integrations: [
-                    { Definition: { name: 'stripe' } },
-                ],
-            };
-
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            // HTTP handlers also need Prisma for integration queries
-            expect(result.functions.stripe.layers).toEqual([
-                { Ref: 'PrismaLambdaLayer' }
-            ]);
-        });
-
-        it('should attach Prisma layer to webhook handlers', async () => {
-            const appDefinition = {
-                integrations: [
-                    {
-                        Definition: {
-                            name: 'hubspot',
-                            webhooks: true,
-                        }
-                    },
-                ],
-            };
-
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            // Webhook handlers need Prisma for credential lookups
-            expect(result.functions.hubspotWebhook.layers).toEqual([
-                { Ref: 'PrismaLambdaLayer' }
-            ]);
-        });
-    });
 });