@friggframework/devtools 2.0.0--canary.553.7a28e41.0 → 2.0.0--canary.553.4228f35.0

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

@@ -145,20 +145,20 @@ class IntegrationBuilder extends InfrastructureBuilder {
      * Build integration resources based on ownership decisions
      */
     async buildFromDecisions(decisions, appDefinition, result, usePrismaLayer = true) {
+        // Create package config first — needed by all Lambda functions including DLQ processor
+        const functionPackageConfig = this.createFunctionPackageConfig(usePrismaLayer);
+
         // Create InternalErrorQueue if ownership = STACK
         const shouldCreateInternalErrorQueue = decisions.internalErrorQueue.ownership === ResourceOwnership.STACK;
 
         if (shouldCreateInternalErrorQueue) {
             console.log('  → Creating InternalErrorQueue in stack');
-            this.createInternalErrorQueue(result);
+            this.createInternalErrorQueue(result, functionPackageConfig);
         } else {
             console.log('  → Using external InternalErrorQueue');
-            this.useExternalInternalErrorQueue(decisions.internalErrorQueue, result);
+            this.useExternalInternalErrorQueue(decisions.internalErrorQueue, result, functionPackageConfig);
         }
 
-        // Create Lambda function definitions and queue resources for each integration
-        const functionPackageConfig = this.createFunctionPackageConfig(usePrismaLayer);
-
         for (const integration of appDefinition.integrations) {
             const integrationName = integration.Definition.name;
             const queueDecision = decisions.integrations[integrationName].queue;
@@ -328,16 +328,46 @@ class IntegrationBuilder extends InfrastructureBuilder {
     /**
      * Create InternalErrorQueue CloudFormation resource
      */
-    createInternalErrorQueue(result) {
+    createInternalErrorQueue(result, functionPackageConfig) {
         result.resources.InternalErrorQueue = {
             Type: 'AWS::SQS::Queue',
             Properties: {
                 QueueName: '${self:service}-${self:provider.stage}-InternalErrorQueue',
                 MessageRetentionPeriod: 1209600, // 14 days
-                VisibilityTimeout: 60, // Must be >= DLQ processor Lambda timeout
+                VisibilityTimeout: 60, // Must be >= DLQ processor Lambda timeout (30s)
             },
         };
 
+        this.createDLQObservability(result, functionPackageConfig, {
+            'Fn::GetAtt': ['InternalErrorQueue', 'Arn'],
+        }, {
+            'Fn::GetAtt': ['InternalErrorQueue', 'QueueName'],
+        });
+
+        console.log('  ✓ Created InternalErrorQueue resource');
+    }
+
+    /**
+     * Use external InternalErrorQueue
+     */
+    useExternalInternalErrorQueue(decision, result, functionPackageConfig) {
+        // Add ARN to environment for Lambda functions
+        result.environment.INTERNAL_ERROR_QUEUE_ARN = decision.physicalId;
+
+        // Extract queue name from ARN for CloudWatch dimensions
+        const arnParts = decision.physicalId.split(':');
+        const queueName = arnParts[arnParts.length - 1];
+
+        this.createDLQObservability(result, functionPackageConfig, decision.physicalId, queueName);
+
+        console.log(`  ✓ Using external InternalErrorQueue: ${decision.physicalId}`);
+    }
+
+    /**
+     * Create DLQ observability resources (alarm + processor Lambda).
+     * Called for both stack-owned and external InternalErrorQueues.
+     */
+    createDLQObservability(result, functionPackageConfig, queueArn, queueName) {
         // CloudWatch Alarm: fires when any message lands in the DLQ
         result.resources.DLQMessageAlarm = {
             Type: 'AWS::CloudWatch::Alarm',
@@ -350,11 +380,9 @@ class IntegrationBuilder extends InfrastructureBuilder {
                 ComparisonOperator: 'GreaterThanThreshold',
                 EvaluationPeriods: 1,
                 Period: 60,
+                AlarmActions: [{ Ref: 'InternalErrorBridgeTopic' }],
                 Dimensions: [
-                    {
-                        Name: 'QueueName',
-                        Value: { 'Fn::GetAtt': ['InternalErrorQueue', 'QueueName'] },
-                    },
+                    { Name: 'QueueName', Value: queueName },
                 ],
             },
         };
@@ -362,33 +390,25 @@ class IntegrationBuilder extends InfrastructureBuilder {
         // DLQ processor Lambda: logs failed messages with structured context
         result.functions.dlqProcessor = {
             handler: 'node_modules/@friggframework/core/handlers/workers/dlq-processor.dlqProcessor',
+            skipEsbuild: true,
+            package: functionPackageConfig,
             reservedConcurrency: 1,
             timeout: 30,
             events: [
                 {
                     sqs: {
-                        arn: { 'Fn::GetAtt': ['InternalErrorQueue', 'Arn'] },
+                        arn: queueArn,
                         batchSize: 10,
+                        functionResponseType: 'ReportBatchItemFailures',
                     },
                 },
             ],
         };
 
-        console.log('  ✓ Created InternalErrorQueue resource');
         console.log('  ✓ Created DLQ CloudWatch alarm');
         console.log('  ✓ Created DLQ processor Lambda');
     }
 
-    /**
-     * Use external InternalErrorQueue
-     */
-    useExternalInternalErrorQueue(decision, result) {
-        // Add ARN to environment for Lambda functions
-        result.environment.INTERNAL_ERROR_QUEUE_ARN = decision.physicalId;
-
-        console.log(`  ✓ Using external InternalErrorQueue: ${decision.physicalId}`);
-    }
-
     /**
      * Create integration-specific SQS queue CloudFormation resource
      */

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

@@ -412,6 +412,18 @@ describe('IntegrationBuilder', () => {
             expect(result.resources.DLQMessageAlarm.Properties.Threshold).toBe(0);
         });
 
+        it('should wire alarm to InternalErrorBridgeTopic for notifications', async () => {
+            const appDefinition = {
+                integrations: [{ Definition: { name: 'test' } }],
+            };
+
+            const result = await integrationBuilder.build(appDefinition, {});
+
+            expect(result.resources.DLQMessageAlarm.Properties.AlarmActions).toEqual([
+                { Ref: 'InternalErrorBridgeTopic' },
+            ]);
+        });
+
         it('should create a DLQ processor Lambda triggered by InternalErrorQueue', async () => {
             const appDefinition = {
                 integrations: [{ Definition: { name: 'test' } }],
@@ -420,19 +432,21 @@ describe('IntegrationBuilder', () => {
             const result = await integrationBuilder.build(appDefinition, {});
 
             expect(result.functions.dlqProcessor).toBeDefined();
-            expect(result.functions.dlqProcessor.events[0].sqs).toBeDefined();
             expect(result.functions.dlqProcessor.events[0].sqs.arn).toEqual({
                 'Fn::GetAtt': ['InternalErrorQueue', 'Arn'],
             });
+            expect(result.functions.dlqProcessor.events[0].sqs.functionResponseType).toBe('ReportBatchItemFailures');
         });
 
-        it('DLQ processor should have short timeout and low concurrency', async () => {
+        it('DLQ processor should have skipEsbuild, short timeout, and low concurrency', async () => {
             const appDefinition = {
                 integrations: [{ Definition: { name: 'test' } }],
             };
 
             const result = await integrationBuilder.build(appDefinition, {});
 
+            expect(result.functions.dlqProcessor.skipEsbuild).toBe(true);
+            expect(result.functions.dlqProcessor.package).toBeDefined();
             expect(result.functions.dlqProcessor.timeout).toBeLessThanOrEqual(60);
             expect(result.functions.dlqProcessor.reservedConcurrency).toBe(1);
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.553.7a28e41.0",
+  "version": "2.0.0--canary.553.4228f35.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -25,9 +25,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.553.7a28e41.0",
-    "@friggframework/schemas": "2.0.0--canary.553.7a28e41.0",
-    "@friggframework/test": "2.0.0--canary.553.7a28e41.0",
+    "@friggframework/core": "2.0.0--canary.553.4228f35.0",
+    "@friggframework/schemas": "2.0.0--canary.553.4228f35.0",
+    "@friggframework/test": "2.0.0--canary.553.4228f35.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.553.7a28e41.0",
-    "@friggframework/prettier-config": "2.0.0--canary.553.7a28e41.0",
+    "@friggframework/eslint-config": "2.0.0--canary.553.4228f35.0",
+    "@friggframework/prettier-config": "2.0.0--canary.553.4228f35.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7a28e41ce8d5620e78b80c4db24ebd32a626da0e"
+  "gitHead": "4228f350b711214a27e5d3229b2099243282035b"
 }