@friggframework/devtools 2.0.0--canary.652.60de836.0 → 2.0.0--canary.653.af34bd7.0

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

@@ -32,6 +32,10 @@ const {
 const {
     nestedNodeModulesExcludes,
 } = require('../shared/utilities/nested-node-modules');
+const {
+    INTEGRATION_QUEUE_MAX_RECEIVE_COUNT,
+    QUEUE_MAX_RECEIVE_COUNT_ENV,
+} = require('@friggframework/core/queues/queue-delivery');
 
 class IntegrationBuilder extends InfrastructureBuilder {
     constructor() {
@@ -569,7 +573,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
                 MessageRetentionPeriod: 345600, // 4 days (SQS default)
                 VisibilityTimeout: 1800,
                 RedrivePolicy: {
-                    maxReceiveCount: 3,
+                    maxReceiveCount: INTEGRATION_QUEUE_MAX_RECEIVE_COUNT,
                     deadLetterTargetArn: {
                         'Fn::GetAtt': ['InternalErrorQueue', 'Arn'],
                     },
@@ -577,6 +581,14 @@ class IntegrationBuilder extends InfrastructureBuilder {
             },
         };
 
+        const queueWorker = result.functions[`${integrationName}QueueWorker`];
+        queueWorker.environment = {
+            ...queueWorker.environment,
+            [QUEUE_MAX_RECEIVE_COUNT_ENV]: String(
+                INTEGRATION_QUEUE_MAX_RECEIVE_COUNT
+            ),
+        };
+
         // Add queue URL to environment
         this.setQueueUrlEnvironment(
             integrationName,

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

@@ -4,6 +4,10 @@
  * Tests integration-specific Lambda functions and SQS queues
  */
 
+const {
+    INTEGRATION_QUEUE_MAX_RECEIVE_COUNT,
+    QUEUE_MAX_RECEIVE_COUNT_ENV,
+} = require('@friggframework/core/queues/queue-delivery');
 const { IntegrationBuilder } = require('./integration-builder');
 const { ValidationResult } = require('../shared/base-builder');
 
@@ -207,6 +211,54 @@ describe('IntegrationBuilder', () => {
             });
         });
 
+        it('takes the redrive max receive count from the core runtime contract', async () => {
+            const result = await integrationBuilder.build(
+                { integrations: [{ Definition: { name: 'test' } }] },
+                {}
+            );
+
+            expect(
+                result.resources.TestQueue.Properties.RedrivePolicy
+                    .maxReceiveCount
+            ).toBe(INTEGRATION_QUEUE_MAX_RECEIVE_COUNT);
+        });
+
+        it('tells the queue worker the max receive count of the queue it owns', async () => {
+            const result = await integrationBuilder.build(
+                { integrations: [{ Definition: { name: 'test' } }] },
+                {}
+            );
+
+            expect(
+                result.functions.testQueueWorker.environment[
+                    QUEUE_MAX_RECEIVE_COUNT_ENV
+                ]
+            ).toBe('3');
+        });
+
+        it('leaves the max receive count unset for an external queue', async () => {
+            const result = await integrationBuilder.build(
+                {
+                    integrations: [
+                        {
+                            Definition: { name: 'test' },
+                            ownership: { queue: 'external' },
+                            queue: {
+                                url: 'https://sqs.us-east-1.amazonaws.com/123456789012/test-queue',
+                            },
+                        },
+                    ],
+                },
+                {}
+            );
+
+            expect(
+                result.functions.testQueueWorker.environment?.[
+                    QUEUE_MAX_RECEIVE_COUNT_ENV
+                ]
+            ).toBeUndefined();
+        });
+
         it('should create queue worker function', async () => {
             const appDefinition = {
                 integrations: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.652.60de836.0",
+  "version": "2.0.0--canary.653.af34bd7.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -26,9 +26,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.652.60de836.0",
-    "@friggframework/schemas": "2.0.0--canary.652.60de836.0",
-    "@friggframework/test": "2.0.0--canary.652.60de836.0",
+    "@friggframework/core": "2.0.0--canary.653.af34bd7.0",
+    "@friggframework/schemas": "2.0.0--canary.653.af34bd7.0",
+    "@friggframework/test": "2.0.0--canary.653.af34bd7.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.18.0",
@@ -56,8 +56,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.652.60de836.0",
-    "@friggframework/prettier-config": "2.0.0--canary.652.60de836.0",
+    "@friggframework/eslint-config": "2.0.0--canary.653.af34bd7.0",
+    "@friggframework/prettier-config": "2.0.0--canary.653.af34bd7.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "60de83654af65d71fc331c7dbfee727c4f2534ff"
+  "gitHead": "af34bd7c677948dcd9f4a7a8dc0a59b038c35c48"
 }