@friggframework/serverless-plugin 2.0.0--canary.663.9683f8b.0 → 2.0.0--canary.639.4058469.0

package/index.js

@@ -99,19 +99,23 @@ class FriggServerlessPlugin {
       });
   }
 
+  /**
+   * SQS client for LocalStack, used by `serverless offline` (`frigg start`)
+   * to create the app's queues locally. The aggregated AWS SDK v3 `SQS`
+   * client also accepts Node-style callbacks, which LocalStackQueueService
+   * uses.
+   */
   createLocalStackSQSClient() {
-    const AWS = require('aws-sdk');
+    const { SQS } = require('@aws-sdk/client-sqs');
 
-    AWS.config.update({
+    return new SQS({
       region: process.env.AWS_REGION || 'us-east-1',
       endpoint: process.env.AWS_ENDPOINT || 'http://localhost:4566',
-      accessKeyId: process.env.AWS_ACCESS_KEY_ID || 'root',
-      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY || 'root',
-      s3ForcePathStyle: true,
-      sslEnabled: false,
+      credentials: {
+        accessKeyId: process.env.AWS_ACCESS_KEY_ID || 'root',
+        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY || 'root',
+      },
     });
-
-    return new AWS.SQS({ sslEnabled: false });
   }
 
   async beforePackageInitialize() {

package/index.test.js

@@ -3,10 +3,12 @@ const FriggServerlessPlugin = require('./index');
 jest.mock('./lib/queue-environment-mapper');
 jest.mock('./lib/localstack-queue-service');
 jest.mock('./lib/esbuild-directory-manager');
+jest.mock('@aws-sdk/client-sqs', () => ({ SQS: jest.fn() }));
 
 const { QueueEnvironmentMapper } = require('./lib/queue-environment-mapper');
 const { LocalStackQueueService } = require('./lib/localstack-queue-service');
 const { EsbuildDirectoryManager } = require('./lib/esbuild-directory-manager');
+const { SQS } = require('@aws-sdk/client-sqs');
 
 describe('FriggServerlessPlugin', () => {
   let plugin;
@@ -158,6 +160,57 @@ describe('FriggServerlessPlugin', () => {
     });
   });
 
+  describe('createLocalStackSQSClient', () => {
+    const ENV_KEYS = [
+      'AWS_REGION',
+      'AWS_ENDPOINT',
+      'AWS_ACCESS_KEY_ID',
+      'AWS_SECRET_ACCESS_KEY',
+    ];
+    let savedEnv;
+
+    beforeEach(() => {
+      savedEnv = Object.fromEntries(ENV_KEYS.map((k) => [k, process.env[k]]));
+      ENV_KEYS.forEach((k) => delete process.env[k]);
+    });
+
+    afterEach(() => {
+      ENV_KEYS.forEach((k) => {
+        if (savedEnv[k] === undefined) delete process.env[k];
+        else process.env[k] = savedEnv[k];
+      });
+    });
+
+    it('creates an AWS SDK v3 SQS client pointed at LocalStack by default', () => {
+      plugin = new FriggServerlessPlugin(mockServerless, mockOptions);
+
+      const client = plugin.createLocalStackSQSClient();
+
+      expect(SQS).toHaveBeenCalledWith({
+        region: 'us-east-1',
+        endpoint: 'http://localhost:4566',
+        credentials: { accessKeyId: 'root', secretAccessKey: 'root' },
+      });
+      expect(client).toBeInstanceOf(SQS);
+    });
+
+    it('honours AWS_* overrides from the environment', () => {
+      process.env.AWS_REGION = 'eu-west-1';
+      process.env.AWS_ENDPOINT = 'http://localstack:4566';
+      process.env.AWS_ACCESS_KEY_ID = 'key';
+      process.env.AWS_SECRET_ACCESS_KEY = 'secret';
+      plugin = new FriggServerlessPlugin(mockServerless, mockOptions);
+
+      plugin.createLocalStackSQSClient();
+
+      expect(SQS).toHaveBeenCalledWith({
+        region: 'eu-west-1',
+        endpoint: 'http://localstack:4566',
+        credentials: { accessKeyId: 'key', secretAccessKey: 'secret' },
+      });
+    });
+  });
+
   describe('extractQueueDefinitions', () => {
     it('should extract queue definitions from custom config', () => {
       plugin = new FriggServerlessPlugin(mockServerless, mockOptions);

package/package.json

@@ -1,15 +1,18 @@
 {
   "name": "@friggframework/serverless-plugin",
-  "version": "2.0.0--canary.663.9683f8b.0",
+  "version": "2.0.0--canary.639.4058469.0",
   "description": "Plugin to help dynamically load frigg resources",
   "main": "index.js",
   "scripts": {
     "test": "jest"
   },
   "author": "Left Hook, Inc.",
+  "dependencies": {
+    "@aws-sdk/client-sqs": "^3.588.0"
+  },
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9683f8b4ecbbb8a91b497c63e04277490769bad8"
+  "gitHead": "4058469d1cf369ff715559377522175a046ba52f"
 }