Updates and serverless@2 Support (#192)

godu · AdrieanKhisbe · web-flow · commit 1e632c910227 · 2021-08-19T14:58:17.000+02:00
* [ssm] Support serverless@2

* Drop node@10

* Update travis CI endpoint from org to com

and accidently trigger a test on the com CI

* Adds peerDependencies

Co-authored-by: AdrieanKhisbe &lt;adriean.khisbe@live.fr&gt;
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v10.21.0
+v12.22.4
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ sudo: required
 node_js:
   - "14"
   - "12"
-  - "10"
 
 services:
   - docker
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # :zap: Collection of Serverless Plugins :battery:
 
 [![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
-[![Build Status](https://travis-ci.org/CoorpAcademy/serverless-plugins.svg?branch=master)](https://travis-ci.org/CoorpAcademy/serverless-plugins)
+[![Build Status](https://travis-ci.com/CoorpAcademy/serverless-plugins.svg?branch=master)](https://travis-ci.com/CoorpAcademy/serverless-plugins)
 [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "serverless-plugins",
   "private": true,
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "scripts": {
     "postinstall": "lerna bootstrap",
@@ -18,13 +18,13 @@
     "publish": "lerna publish"
   },
   "dependencies": {
-    "lerna": "^3.22.1",
-    "serverless": "^1.83.0"
+    "lerna": "^4.0.0",
+    "serverless": "^2.55.0"
   },
   "devDependencies": {
-    "@coorpacademy/eslint-plugin-coorpacademy": "^10.2.0",
-    "ava": "^3.12.1",
-    "eslint": "^7.9.0",
+    "@coorpacademy/eslint-plugin-coorpacademy": "^10.3.1",
+    "ava": "^3.15.0",
+    "eslint": "^7.32.0",
     "nyc": "^15.1.0"
   }
 }
diff --git a/packages/dynamodb-streams-readable/package.json b/packages/dynamodb-streams-readable/package.json
@@ -17,10 +17,10 @@
   "author": "Arthur Weber @godu",
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "devDependencies": {
-    "uuid": "^8.3.0"
+    "uuid": "^8.3.2"
   },
   "keywords": [
     "dynamodb",
diff --git a/packages/serverless-apigateway-access-logs/package.json b/packages/serverless-apigateway-access-logs/package.json
@@ -17,11 +17,11 @@
   "author": "Adrien Becchis @Coorpacademy (https://github.com/AdrieanKhisbe)",
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "dependencies": {
-    "aws-sdk": "^2.757.0",
-    "lodash": "^4.17.20"
+    "aws-sdk": "^2.970.0",
+    "lodash": "^4.17.21"
   },
   "keywords": [
     "kinesis",
diff --git a/packages/serverless-offline-dynamodb-streams/package.json b/packages/serverless-offline-dynamodb-streams/package.json
@@ -20,18 +20,18 @@
   "author": "Arthur Weber @godu",
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "peerDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "dependencies": {
-    "aws-sdk": "^2.757.0",
+    "aws-sdk": "^2.970.0",
     "dynamodb-streams-readable": "^1.1.0",
-    "lodash": "^4.17.20"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "keywords": [
     "kinesis",
diff --git a/packages/serverless-offline-dynamodb-streams/src/dynamodb-streams.js b/packages/serverless-offline-dynamodb-streams/src/dynamodb-streams.js
@@ -63,14 +63,8 @@ class DynamodbStreams {
   }
 
   async _dynamodbStreamsEvent(functionKey, dynamodbStreamsEvent) {
-    const {
-      enabled,
-      tableName,
-      arn,
-      batchSize,
-      startingPosition,
-      maximumRetryAttempts
-    } = dynamodbStreamsEvent;
+    const {enabled, tableName, arn, batchSize, startingPosition, maximumRetryAttempts} =
+      dynamodbStreamsEvent;
 
     if (!enabled) return;
 
diff --git a/packages/serverless-offline-kinesis/package.json b/packages/serverless-offline-kinesis/package.json
@@ -24,18 +24,18 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "peerDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "dependencies": {
-    "aws-sdk": "^2.757.0",
+    "aws-sdk": "^2.970.0",
     "kinesis-readable": "^1.2.0",
-    "lodash": "^4.17.20"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "keywords": [
     "kinesis",
diff --git a/packages/serverless-offline-s3/package.json b/packages/serverless-offline-s3/package.json
@@ -24,19 +24,19 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "peerDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "dependencies": {
-    "aws-sdk": "^2.757.0",
-    "figures": "^3.2.0",
-    "lodash": "^4.17.20",
-    "minio": "^7.0.16"
+    "aws-sdk": "^2.970.0",
+    "figures": "^4.0.0",
+    "lodash": "^4.17.21",
+    "minio": "^7.0.18"
   },
   "devDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "keywords": [
     "s3",
diff --git a/packages/serverless-offline-sqs/package.json b/packages/serverless-offline-sqs/package.json
@@ -24,18 +24,18 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "peerDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "dependencies": {
-    "aws-sdk": "^2.757.0",
-    "lodash": "^4.17.20",
-    "p-queue": "^6.6.1"
+    "aws-sdk": "^2.970.0",
+    "lodash": "^4.17.21",
+    "p-queue": "^6.6.2"
   },
   "devDependencies": {
-    "serverless-offline": "^6.7.0"
+    "serverless-offline": "^8.0.0"
   },
   "keywords": [
     "sqs",
diff --git a/packages/serverless-offline-sqs/src/sqs.js b/packages/serverless-offline-sqs/src/sqs.js
@@ -1,8 +1,8 @@
-const {default: PQueue} = require('p-queue');
 const SQSClient = require('aws-sdk/clients/sqs');
 // eslint-disable-next-line no-shadow
 const {pipe, get, values, matches, find, mapValues, isPlainObject, toString} = require('lodash/fp');
 const {logWarning} = require('serverless-offline/dist/serverlessLog');
+const {default: PQueue} = require('p-queue');
 const SQSEventDefinition = require('./sqs-event-definition');
 const SQSEvent = require('./sqs-event');
 
diff --git a/packages/serverless-offline-ssm-provider/package.json b/packages/serverless-offline-ssm-provider/package.json
@@ -21,10 +21,13 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "dependencies": {
-    "lodash": "^4.17.20"
+    "lodash": "^4.17.21"
+  },
+  "peerDependencies": {
+    "serverless": "^1.26.0 || 2"
   },
   "keywords": [
     "ssm",
diff --git a/packages/serverless-offline-ssm-provider/src/index.js b/packages/serverless-offline-ssm-provider/src/index.js
@@ -1,10 +1,12 @@
 const fs = require('fs');
-const {fromPairs, get, map, pipe, split, trim} = require('lodash/fp');
-
-const fromCallback = fun => (...args) =>
-  new Promise((resolve, reject) => {
-    fun(...args, (err, data) => (err ? reject(err) : resolve(data)));
-  });
+const {fromPairs, get, map, pipe, split, trim, bind} = require('lodash/fp');
+
+const fromCallback =
+  fun =>
+  (...args) =>
+    new Promise((resolve, reject) => {
+      fun(...args, (err, data) => (err ? reject(err) : resolve(data)));
+    });
 const readFile = fromCallback(fs.readFile);
 
 const getValues = (path = '.ssm') => {
@@ -23,34 +25,26 @@ const getValues = (path = '.ssm') => {
   return key => values.then(get(key));
 };
 
+const SSM_PREFIX = 'ssm:';
+
 class ServerlessOfflineSSMProvider {
   constructor(serverless) {
     this.serverless = serverless;
     this.config = this.serverless.service.custom['serverless-offline-ssm-provider'];
     this.values = this.config ? getValues(this.config.file) : getValues();
 
-    const aws = this.serverless.getProvider('aws');
-    const request = aws.request.bind(aws);
+    const delegate = bind(serverless.variables.getValueFromSource, serverless.variables);
 
-    aws.request = (service, method, params, options) => {
-      if (service !== 'SSM' || method !== 'getParameter')
-        return request(service, method, params, options);
+    serverless.variables.getValueFromSource = async variableString => {
+      if (!variableString.startsWith(SSM_PREFIX)) return delegate(variableString);
 
-      return request(service, method, params, options).catch(async error => {
-        const {Name} = params;
-        const Value = await this.values(Name);
+      const ssmPath = variableString.replace(SSM_PREFIX, '');
+      const ssmValue = await this.values(ssmPath);
 
-        if (!Value) throw error;
+      if (!ssmValue) return delegate(variableString);
 
-        return {
-          Parameter: {
-            Value
-          }
-        };
-      });
+      return ssmValue;
     };
-
-    this.serverless.setProvider('aws', aws);
   }
 }
 
diff --git a/tests/serverless-plugins-integration/serverless.dynamodb-streams.yml b/tests/serverless-plugins-integration/serverless.dynamodb-streams.yml
@@ -3,7 +3,7 @@ service: serverless-offline-dynamodb-streams
 provider:
   name: aws
   region: eu-west-1
-  runtime: nodejs10.x
+  runtime: nodejs12.x
 
 plugins:
   localPath: '../../packages'
diff --git a/tests/serverless-plugins-integration/serverless.kinesis.yml b/tests/serverless-plugins-integration/serverless.kinesis.yml
@@ -3,7 +3,7 @@ service: serverless-offline-kinesis
 provider:
   name: aws
   region: eu-west-1
-  runtime: nodejs10.x
+  runtime: nodejs12.x
 
 plugins:
   localPath: '../../packages'
diff --git a/tests/serverless-plugins-integration/serverless.s3.yml b/tests/serverless-plugins-integration/serverless.s3.yml
@@ -3,7 +3,7 @@ service: serverless-offline-s3
 provider:
   name: aws
   region: eu-west-1
-  runtime: nodejs10.x
+  runtime: nodejs12.x
 
 plugins:
   localPath: '../../packages'
diff --git a/tests/serverless-plugins-integration/serverless.sqs.autocreate.yml b/tests/serverless-plugins-integration/serverless.sqs.autocreate.yml
@@ -3,7 +3,7 @@ service: serverless-offline-sqs
 provider:
   name: aws
   region: eu-west-1
-  runtime: nodejs10.x
+  runtime: nodejs12.x
 
 plugins:
   localPath: '../../packages'
diff --git a/tests/serverless-plugins-integration/serverless.sqs.yml b/tests/serverless-plugins-integration/serverless.sqs.yml
@@ -3,7 +3,7 @@ service: serverless-offline-sqs
 provider:
   name: aws
   region: eu-west-1
-  runtime: nodejs10.x
+  runtime: nodejs12.x
 
 plugins:
   localPath: '../../packages'
diff --git a/tests/serverless-plugins-integration/test-dynamodb-streams.js b/tests/serverless-plugins-integration/test-dynamodb-streams.js
@@ -68,9 +68,8 @@ pump(
 
       if (setupInProgress) return cb(); // do not consider lambda executions before we post the real items
 
-      const matches = /offline: \(λ: (.*)\) RequestId: .* Duration: .* ms {2}Billed Duration: .* ms/g.exec(
-        line
-      );
+      const matches =
+        /offline: \(λ: (.*)\) RequestId: .* Duration: .* ms {2}Billed Duration: .* ms/g.exec(line);
 
       if (matches) {
         invocationCount++;
