feat: migrate sqs plugin to serverless v4

Author: agnusha

packages/serverless-offline-sqs/src/index.js

@@ -12,8 +12,6 @@ const {
   toPairs
 } = require('lodash/fp');
 
-const log = require('@serverless/utils/log').log;
-
 const SQS = require('./sqs');
 
 const OFFLINE_OPTION = 'serverless-offline';
@@ -32,15 +30,21 @@ const defaultOptions = {
 const omitUndefined = omitBy(isUndefined);
 
 class ServerlessOfflineSQS {
-  constructor(serverless, cliOptions) {
+  constructor(serverless, cliOptions, {log} = {}) {
     this.cliOptions = null;
     this.options = null;
+    this.log = null;
     this.sqs = null;
     this.lambda = null;
     this.serverless = null;
 
     this.cliOptions = cliOptions;
     this.serverless = serverless;
+    this.log = log || {
+      debug: console.debug.bind(console),
+      notice: console.log.bind(console),
+      warning: console.warn.bind(console)
+    };
 
     this.hooks = {
       'offline:start:init': this.start.bind(this),
@@ -67,9 +71,7 @@ class ServerlessOfflineSQS {
 
     await Promise.all(eventModules);
 
-    this.serverless.cli.log(
-      `Starting Offline SQS at stage ${this.options.stage} (${this.options.region})`
-    );
+    this.log.notice(`Starting Offline SQS at stage ${this.options.stage} (${this.options.region})`);
   }
 
   ready() {
@@ -83,7 +85,7 @@ class ServerlessOfflineSQS {
 
     signals.map(signal =>
       process.on(signal, async () => {
-        this.serverless.cli.log(`Got ${signal} signal. Offline Halting...`);
+        this.log.notice(`Got ${signal} signal. Offline Halting...`);
 
         await this.end();
       })
@@ -100,7 +102,7 @@ class ServerlessOfflineSQS {
       return;
     }
 
-    this.serverless.cli.log('Halting offline server');
+    this.log.notice('Halting offline server');
 
     const eventModules = [];
 
@@ -129,7 +131,7 @@ class ServerlessOfflineSQS {
   async _createSqs(events, skipStart) {
     const resources = this._getResources();
 
-    this.sqs = new SQS(this.lambda, resources, this.options);
+    this.sqs = new SQS(this.lambda, resources, this.options, this.log);
 
     await this.sqs.create(events);
 
@@ -155,7 +157,7 @@ class ServerlessOfflineSQS {
       omitUndefined(this.cliOptions)
     );
 
-    log.debug('options:', this.options);
+    this.log.debug('sqs options:', this.options);
   }
 
   _getEvents() {

packages/serverless-offline-sqs/src/sqs.js

@@ -11,7 +11,6 @@ const {
   toString,
   values
 } = require('lodash/fp');
-const log = require('@serverless/utils/log').log;
 const {default: PQueue} = require('p-queue');
 const SQSEventDefinition = require('./sqs-event-definition');
 const SQSEvent = require('./sqs-event');
@@ -21,21 +20,37 @@ const delay = timeout =>
     setTimeout(resolve, timeout);
   });
 
+const defaultLog = {
+  debug: console.debug.bind(console),
+  notice: console.log.bind(console),
+  warning: console.warn.bind(console)
+};
+
 class SQS {
-  constructor(lambda, resources, options) {
+  constructor(lambda, resources, options, log = defaultLog) {
     this.lambda = null;
     this.resources = null;
     this.options = null;
+    this.log = null;
 
     this.lambda = lambda;
     this.resources = resources;
     this.options = options;
+    this.log = log || defaultLog;
 
     this.client = new SQSClient(this.options);
 
     this.queue = new PQueue({autoStart: false});
   }
 
+  _safeLog(level, message) {
+    if (this.log && typeof this.log[level] === 'function') {
+      this.log[level](message);
+    } else if (console[level]) {
+      console[level](message);
+    }
+  }
+
   create(events) {
     return Promise.all(events.map(({functionKey, sqs}) => this._create(functionKey, sqs)));
   }
@@ -138,7 +153,7 @@ class SQS {
             )
           );
         } catch (err) {
-          log.warning(err.stack);
+          this._safeLog('warning', err.stack);
         }
       }
 
@@ -170,7 +185,7 @@ class SQS {
     } catch (err) {
       if (remainingTry > 0 && err.name === 'AWS.SimpleQueueService.NonExistentQueue')
         return this._createQueue({queueName}, remainingTry - 1);
-      log.warning(err.stack);
+      this._safeLog('warning', err.stack);
     }
   }
 }