@friggframework/serverless-plugin 2.0.0--canary.580.1003d8d.0 → 2.0.0--canary.580.4487187.0

package/lib/localstack-queue-service.js

@@ -43,6 +43,19 @@ class LocalStackQueueService {
    * Serialize a CloudFormation `Properties` object into the
    * `Attributes` shape the SQS `CreateQueue` API accepts (string
    * values only; object values like `RedrivePolicy` get JSON-encoded).
+   *
+   * Attributes whose value still contains an unresolved CloudFormation
+   * intrinsic (`Fn::GetAtt`, `Ref`, `Fn::Sub`, …) are DROPPED rather
+   * than stringified. Example: integration-builder.js emits
+   * `RedrivePolicy.deadLetterTargetArn: {'Fn::GetAtt': [...]}`, which
+   * CloudFormation resolves to a real ARN in AWS but is still a raw
+   * intrinsic object at local plugin-time. Forwarding that JSON blob
+   * to SQS `CreateQueue` would fail (`deadLetterTargetArn` must be a
+   * valid ARN string) or produce malformed config. Dropping the
+   * attribute gives local parity on every other queue property
+   * (notably `VisibilityTimeout`, which is the main reason this code
+   * exists) while leaving the DLQ association intentionally un-wired
+   * locally — matching the pre-PR behavior for that one attribute.
    * @private
    */
   _propertiesToAttributes(properties = {}) {
@@ -50,12 +63,46 @@ class LocalStackQueueService {
     for (const key of LocalStackQueueService.PROPERTY_ATTRIBUTE_KEYS) {
       const value = properties[key];
       if (value === undefined || value === null) continue;
+      if (LocalStackQueueService._containsUnresolvedIntrinsic(value)) {
+        console.warn(
+          `[frigg-plugin] Skipping queue attribute "${key}" because it contains an unresolved CloudFormation intrinsic. ` +
+            `Deployed AWS will apply it via CloudFormation; local emulation will fall back to the AWS default for this attribute.`
+        );
+        continue;
+      }
       attributes[key] =
         typeof value === 'object' ? JSON.stringify(value) : String(value);
     }
     return attributes;
   }
 
+  /**
+   * Recursively checks whether a value still contains a CloudFormation
+   * intrinsic function key (`Fn::*` or `Ref`). Such values are unsafe
+   * to pass through to SQS `CreateQueue` — AWS's runtime API doesn't
+   * understand CloudFormation intrinsics; they're only valid inside
+   * serverless.yml / CloudFormation templates.
+   * @private
+   */
+  static _containsUnresolvedIntrinsic(value) {
+    if (value === null || value === undefined) return false;
+    if (typeof value !== 'object') return false;
+    if (Array.isArray(value)) {
+      return value.some((v) =>
+        LocalStackQueueService._containsUnresolvedIntrinsic(v)
+      );
+    }
+    for (const key of Object.keys(value)) {
+      if (key === 'Ref' || key.startsWith('Fn::')) return true;
+      if (
+        LocalStackQueueService._containsUnresolvedIntrinsic(value[key])
+      ) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * @param {string} queueName - Name of queue to create
    * @param {Object} [attributes] - SQS CreateQueue Attributes (already

package/lib/localstack-queue-service.test.js

@@ -109,6 +109,68 @@ describe('LocalStackQueueService', () => {
     it('returns an empty object when properties are missing', () => {
       expect(service._propertiesToAttributes()).toEqual({});
     });
+
+    it('drops attributes containing unresolved CloudFormation intrinsics', () => {
+      const warnSpy = jest.spyOn(console, 'warn').mockImplementation();
+      const attrs = service._propertiesToAttributes({
+        VisibilityTimeout: 1800,
+        RedrivePolicy: {
+          maxReceiveCount: 3,
+          deadLetterTargetArn: {
+            'Fn::GetAtt': ['InternalErrorQueue', 'Arn'],
+          },
+        },
+      });
+
+      // VisibilityTimeout survives; RedrivePolicy is dropped because
+      // deadLetterTargetArn is still an unresolved Fn::GetAtt intrinsic
+      // (real AWS resolves it via CloudFormation; LocalStack cannot).
+      expect(attrs).toEqual({ VisibilityTimeout: '1800' });
+      expect(attrs).not.toHaveProperty('RedrivePolicy');
+      expect(warnSpy).toHaveBeenCalledWith(
+        expect.stringContaining('Skipping queue attribute "RedrivePolicy"')
+      );
+      warnSpy.mockRestore();
+    });
+
+    it('drops attributes with Ref intrinsics', () => {
+      jest.spyOn(console, 'warn').mockImplementation();
+      const attrs = service._propertiesToAttributes({
+        VisibilityTimeout: 60,
+        KmsMasterKeyId: { Ref: 'MyKmsKey' },
+      });
+      expect(attrs).toEqual({ VisibilityTimeout: '60' });
+    });
+
+    it('detects intrinsics nested deep inside objects and arrays', () => {
+      expect(
+        LocalStackQueueService._containsUnresolvedIntrinsic({
+          a: { b: [{ c: { 'Fn::Sub': '${AWS::Region}' } }] },
+        })
+      ).toBe(true);
+      expect(
+        LocalStackQueueService._containsUnresolvedIntrinsic({
+          a: { b: [{ c: 'hello' }] },
+        })
+      ).toBe(false);
+      expect(LocalStackQueueService._containsUnresolvedIntrinsic(null)).toBe(false);
+      expect(LocalStackQueueService._containsUnresolvedIntrinsic('str')).toBe(false);
+    });
+
+    it('retains resolved RedrivePolicy (ARN already a string)', () => {
+      const attrs = service._propertiesToAttributes({
+        RedrivePolicy: {
+          maxReceiveCount: 3,
+          deadLetterTargetArn: 'arn:aws:sqs:us-east-1:x:dlq',
+        },
+      });
+      expect(attrs.RedrivePolicy).toBe(
+        JSON.stringify({
+          maxReceiveCount: 3,
+          deadLetterTargetArn: 'arn:aws:sqs:us-east-1:x:dlq',
+        })
+      );
+    });
   });
 
   describe('createQueues', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@friggframework/serverless-plugin",
-  "version": "2.0.0--canary.580.1003d8d.0",
+  "version": "2.0.0--canary.580.4487187.0",
   "description": "Plugin to help dynamically load frigg resources",
   "main": "index.js",
   "scripts": {
@@ -11,5 +11,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1003d8deff8f587be3cd9210f1c35c5dc92531be"
+  "gitHead": "44871876975b9e507ed635e9df4075b2215685d1"
 }