@friggframework/devtools 2.0.0--canary.608.e6b65ff.0 → 2.0.0--canary.610.ca077d5.0

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

@@ -196,8 +196,6 @@ class IntegrationBuilder extends InfrastructureBuilder {
             );
         }
 
-        this.createUserActionQueue(result, functionPackageConfig, usePrismaLayer);
-
         for (const integration of appDefinition.integrations) {
             const integrationName = integration.Definition.name;
             const queueDecision = decisions.integrations[integrationName].queue;
@@ -474,99 +472,6 @@ class IntegrationBuilder extends InfrastructureBuilder {
         console.log('  ✓ Created InternalErrorQueue resource');
     }
 
-    /**
-     * App-level FIFO queue + DLQ + worker for `dispatch: 'queue'` events. One
-     * queue serves all integrations; MessageGroupId = integrationId serializes
-     * per integration. Always created, like the InternalErrorQueue.
-     */
-    createUserActionQueue(result, functionPackageConfig, usePrismaLayer = true) {
-        const queueName =
-            '${self:service}-${self:provider.stage}-FriggUserActionQueue.fifo';
-        const dlqName =
-            '${self:service}-${self:provider.stage}-FriggUserActionDLQ.fifo';
-
-        result.custom.FriggUserActionQueue = queueName;
-        result.custom.FriggUserActionDLQ = dlqName;
-
-        // A FIFO source queue can only redrive to a FIFO DLQ.
-        result.resources.FriggUserActionDLQ = {
-            Type: 'AWS::SQS::Queue',
-            Properties: {
-                QueueName: '${self:custom.FriggUserActionDLQ}',
-                FifoQueue: true,
-                MessageRetentionPeriod: 1209600, // 14 days
-            },
-        };
-
-        // No ContentBasedDeduplication: the producer sends a unique dedup id so
-        // two distinct requests with identical bodies both run (not deduped).
-        result.resources.FriggUserActionQueue = {
-            Type: 'AWS::SQS::Queue',
-            Properties: {
-                QueueName: '${self:custom.FriggUserActionQueue}',
-                FifoQueue: true,
-                MessageRetentionPeriod: 345600, // 4 days
-                VisibilityTimeout: 1800, // >= worker timeout (900s)
-                RedrivePolicy: {
-                    maxReceiveCount: 2,
-                    deadLetterTargetArn: {
-                        'Fn::GetAtt': ['FriggUserActionDLQ', 'Arn'],
-                    },
-                },
-            },
-        };
-
-        result.environment.USER_ACTION_QUEUE_URL = {
-            Ref: 'FriggUserActionQueue',
-        };
-
-        result.resources.FriggUserActionDLQAlarm = {
-            Type: 'AWS::CloudWatch::Alarm',
-            Properties: {
-                AlarmDescription:
-                    'Messages in FriggUserActionDLQ — eventual (queued) integration event failures',
-                Namespace: 'AWS/SQS',
-                MetricName: 'ApproximateNumberOfMessagesVisible',
-                Statistic: 'Maximum',
-                Threshold: 0,
-                ComparisonOperator: 'GreaterThanThreshold',
-                EvaluationPeriods: 1,
-                Period: 300,
-                AlarmActions: [{ Ref: 'InternalErrorBridgeTopic' }],
-                Dimensions: [
-                    {
-                        Name: 'QueueName',
-                        Value: {
-                            'Fn::GetAtt': ['FriggUserActionDLQ', 'QueueName'],
-                        },
-                    },
-                ],
-            },
-        };
-
-        // No reservedConcurrency: FIFO already serializes per group; capping
-        // would serialize across all integrations.
-        result.functions.userActionQueueWorker = {
-            handler:
-                'node_modules/@friggframework/core/handlers/workers/user-action-worker.userActionQueueWorker',
-            skipEsbuild: true,
-            package: functionPackageConfig,
-            ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
-            timeout: 900,
-            events: [
-                {
-                    sqs: {
-                        arn: { 'Fn::GetAtt': ['FriggUserActionQueue', 'Arn'] },
-                        batchSize: 1,
-                        functionResponseType: 'ReportBatchItemFailures',
-                    },
-                },
-            ],
-        };
-
-        console.log('  ✓ Created FriggUserActionQueue (.fifo) + DLQ + worker');
-    }
-
     /**
      * Use external InternalErrorQueue
      */

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

@@ -751,10 +751,9 @@ describe('IntegrationBuilder', () => {
 
             const functionKeys = Object.keys(result.functions);
 
-            // App-level functions (dlqProcessor, userActionQueueWorker) come first.
+            // Expected order: dlqProcessor (from InternalErrorQueue), webhook, integration, queueWorker
             expect(functionKeys).toEqual([
                 'dlqProcessor',
-                'userActionQueueWorker',
                 'testWebhook',
                 'test',
                 'testQueueWorker',
@@ -936,122 +935,5 @@ describe('IntegrationBuilder', () => {
             );
         });
     });
-
-    describe('User-Action FIFO queue', () => {
-        const appDefinition = {
-            integrations: [{ Definition: { name: 'test' } }],
-        };
-
-        it('creates a FIFO queue without ContentBasedDeduplication', async () => {
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            const q = result.resources.FriggUserActionQueue;
-            expect(q).toBeDefined();
-            expect(q.Type).toBe('AWS::SQS::Queue');
-            expect(q.Properties.FifoQueue).toBe(true);
-            expect(q.Properties.ContentBasedDeduplication).toBeUndefined();
-            expect(q.Properties.VisibilityTimeout).toBe(1800);
-            expect(q.Properties.MessageRetentionPeriod).toBe(345600);
-        });
-
-        it('redrives to the FIFO DLQ with maxReceiveCount 2', async () => {
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            expect(
-                result.resources.FriggUserActionQueue.Properties.RedrivePolicy
-            ).toEqual({
-                maxReceiveCount: 2,
-                deadLetterTargetArn: {
-                    'Fn::GetAtt': ['FriggUserActionDLQ', 'Arn'],
-                },
-            });
-        });
-
-        it('creates a FIFO DLQ with 14-day retention', async () => {
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            const dlq = result.resources.FriggUserActionDLQ;
-            expect(dlq).toBeDefined();
-            expect(dlq.Properties.FifoQueue).toBe(true);
-            expect(dlq.Properties.MessageRetentionPeriod).toBe(1209600);
-        });
-
-        it('creates the worker bound to the FIFO queue ARN with no reservedConcurrency', async () => {
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            const worker = result.functions.userActionQueueWorker;
-            expect(worker).toBeDefined();
-            expect(worker.handler).toBe(
-                'node_modules/@friggframework/core/handlers/workers/user-action-worker.userActionQueueWorker'
-            );
-            expect(worker.timeout).toBe(900);
-            expect(worker.reservedConcurrency).toBeUndefined();
-            expect(worker.events).toEqual([
-                {
-                    sqs: {
-                        arn: { 'Fn::GetAtt': ['FriggUserActionQueue', 'Arn'] },
-                        batchSize: 1,
-                        functionResponseType: 'ReportBatchItemFailures',
-                    },
-                },
-            ]);
-        });
-
-        it('exposes USER_ACTION_QUEUE_URL to all Lambdas', async () => {
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            expect(result.environment.USER_ACTION_QUEUE_URL).toEqual({
-                Ref: 'FriggUserActionQueue',
-            });
-        });
-
-        it('alarms on the FIFO DLQ via the InternalErrorBridgeTopic', async () => {
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            const alarm = result.resources.FriggUserActionDLQAlarm;
-            expect(alarm).toBeDefined();
-            expect(alarm.Properties.AlarmActions).toEqual([
-                { Ref: 'InternalErrorBridgeTopic' },
-            ]);
-        });
-
-        it('creates exactly one FIFO queue + worker regardless of integration count', async () => {
-            const result = await integrationBuilder.build(
-                {
-                    integrations: [
-                        { Definition: { name: 'hubspot' } },
-                        { Definition: { name: 'salesforce' } },
-                        { Definition: { name: 'slack' } },
-                    ],
-                },
-                {}
-            );
-
-            const fifoQueues = Object.keys(result.resources).filter(
-                (k) => k === 'FriggUserActionQueue'
-            );
-            expect(fifoQueues).toHaveLength(1);
-            expect(result.functions.userActionQueueWorker).toBeDefined();
-        });
-
-        it('does not make per-integration queues FIFO', async () => {
-            const result = await integrationBuilder.build(appDefinition, {});
-
-            expect(
-                result.resources.TestQueue.Properties.FifoQueue
-            ).toBeUndefined();
-        });
-
-        it('omits the Prisma layer on the worker when usePrismaLambdaLayer=false', async () => {
-            const result = await integrationBuilder.build(
-                { usePrismaLambdaLayer: false, integrations: [{ Definition: { name: 'test' } }] },
-                {}
-            );
-
-            expect(
-                result.functions.userActionQueueWorker.layers
-            ).toBeUndefined();
-        });
-    });
 });
 

package/infrastructure/domains/security/iam-generator.js

@@ -426,8 +426,6 @@ function generateIAMCloudFormation(options = {}) {
             ],
             Resource: [
                 { 'Fn::Sub': 'arn:aws:sqs:*:${AWS::AccountId}:*frigg*' },
-                // Case-sensitive: lowercase "*frigg*" won't match "FriggUserActionQueue.fifo".
-                { 'Fn::Sub': 'arn:aws:sqs:*:${AWS::AccountId}:*Frigg*' },
                 {
                     'Fn::Sub':
                         'arn:aws:sqs:*:${AWS::AccountId}:internal-error-queue-*',

package/infrastructure/domains/security/iam-generator.test.js

@@ -182,22 +182,6 @@ describe('IAM Generator', () => {
             expect(yaml).toContain('internal-error-queue-*');
         });
 
-        it('should include a case-sensitive *Frigg* SQS resource for the FIFO queue', () => {
-            const appDefinition = {
-                name: 'test-app',
-                integrations: [],
-            };
-
-            const summary = getFeatureSummary(appDefinition);
-            const yaml = generateIAMCloudFormation({
-                appName: summary.appName,
-                features: summary.features,
-            });
-
-            // The lowercase "*frigg*" glob would not match "...-FriggUserActionQueue.fifo".
-            expect(yaml).toContain(':*Frigg*');
-        });
-
         it('should generate outputs section', () => {
             const appDefinition = {
                 name: 'test-app',

package/infrastructure/domains/security/templates/frigg-deployment-iam-stack.yaml

@@ -205,8 +205,6 @@ Resources:
               - 'sqs:UntagQueue'
             Resource:
               - !Sub 'arn:aws:sqs:*:${AWS::AccountId}:*frigg*'
-              # Case-sensitive: lowercase "*frigg*" won't match "FriggUserActionQueue.fifo".
-              - !Sub 'arn:aws:sqs:*:${AWS::AccountId}:*Frigg*'
               - !Sub 'arn:aws:sqs:*:${AWS::AccountId}:internal-error-queue-*'
           
           # SNS permissions

package/infrastructure/domains/shared/utilities/base-definition-factory.js

@@ -196,8 +196,6 @@ function createBaseDefinition(
                     ],
                     Resource: [
                         { 'Fn::GetAtt': ['InternalErrorQueue', 'Arn'] },
-                        // Explicit: the "-*Queue" glob below doesn't match ".fifo".
-                        { 'Fn::GetAtt': ['FriggUserActionQueue', 'Arn'] },
                         {
                             'Fn::Join': [
                                 ':',

package/infrastructure/domains/shared/utilities/base-definition-factory.test.js

@@ -133,11 +133,6 @@ describe('Base Definition Factory', () => {
                 stmt => stmt.Action.includes('sqs:SendMessage')
             );
             expect(sqsPermission).toBeDefined();
-
-            // The "-*Queue" glob doesn't match ".fifo", so the ARN is explicit.
-            expect(sqsPermission.Resource).toContainEqual({
-                'Fn::GetAtt': ['FriggUserActionQueue', 'Arn'],
-            });
         });
 
         it('should include required plugins', () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.608.e6b65ff.0",
+  "version": "2.0.0--canary.610.ca077d5.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.608.e6b65ff.0",
-    "@friggframework/schemas": "2.0.0--canary.608.e6b65ff.0",
-    "@friggframework/test": "2.0.0--canary.608.e6b65ff.0",
+    "@friggframework/core": "2.0.0--canary.610.ca077d5.0",
+    "@friggframework/schemas": "2.0.0--canary.610.ca077d5.0",
+    "@friggframework/test": "2.0.0--canary.610.ca077d5.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.18.0",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.608.e6b65ff.0",
-    "@friggframework/prettier-config": "2.0.0--canary.608.e6b65ff.0",
+    "@friggframework/eslint-config": "2.0.0--canary.610.ca077d5.0",
+    "@friggframework/prettier-config": "2.0.0--canary.610.ca077d5.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": "e6b65ff3bf4a3b3e7777a1f2a6cf1cecd24bedd7"
+  "gitHead": "ca077d5f47ea8b69880c3adeebbdbd3a6ac5abb5"
 }