fix: Update dependencies (#865)

seb-cr · web-flow · commit fa1436ce72ef · 2022-08-22T10:17:42.000+01:00
* Update Babel * Update ESLint and config * Update Jest * Update Semantic Release * Other non-major updates * Fix lint * Update axios (0.21.1 -> 0.27.2) There are some breaking changes but none that affect us here. See https://github.com/axios/axios/blob/main/CHANGELOG.md#0270-april-25-2022 * Fix semver ranges for aws-sdk * Update GitHub Actions to use Node 14
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -1,13 +1,16 @@
 root: true
 
 extends:
-  - '@comicrelief/eslint-config/mixins/base'
-  - '@comicrelief/eslint-config/mixins/flowtype'
+  - '@comicrelief/eslint-config'
   - '@comicrelief/eslint-config/mixins/jsdoc'
-  - '@comicrelief/eslint-config/mixins/sonarjs'
-  - '@comicrelief/eslint-config/mixins/unicorn'
+
+parser: '@babel/eslint-parser'
 
 ignorePatterns:
   - node_modules
   - dist
   - coverage
+  - babel.config.js
+
+rules:
+  unicorn/prefer-node-protocol: off
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,10 +10,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14
 
       - name: Restore cache
         uses: actions/cache@v2
@@ -34,10 +33,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14
 
       - name: Restore cache
         uses: actions/cache@v2
diff --git a/package.json b/package.json
@@ -4,43 +4,49 @@
   "description": "Lambda wrapper for all Comic Relief Serverless Projects",
   "main": "dist/index.js",
   "scripts": {
-    "lint": "yarn eslint .",
+    "lint": "eslint src tests",
     "test": "jest --coverage",
     "build": "babel src --out-dir dist --copy-files",
     "prepublish": "yarn build"
   },
   "author": "Adam Clark",
   "license": "ISC",
   "devDependencies": {
-    "@babel/cli": "^7.12.10",
-    "@babel/core": "^7.12.10",
-    "@babel/node": "^7.12.10",
-    "@babel/plugin-syntax-flow": "^7.12.1",
-    "@babel/plugin-transform-flow-strip-types": "^7.12.10",
-    "@babel/preset-env": "^7.12.11",
-    "@comicrelief/eslint-config": "^1.3.3",
-    "@types/jest": "^26.0.20",
-    "aws-sdk": ">=2.831.0",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.3.3",
-    "eslint": "^7.18.0",
-    "jest": "^26.6.3",
+    "@babel/cli": "^7.18.10",
+    "@babel/core": "^7.18.10",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/node": "^7.18.10",
+    "@babel/plugin-syntax-flow": "^7.18.6",
+    "@babel/plugin-transform-flow-strip-types": "^7.18.9",
+    "@babel/plugin-transform-react-jsx": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "@comicrelief/eslint-config": "^2.0.3",
+    "@types/jest": "^28.1.6",
+    "aws-sdk": "^2.1194.0",
+    "babel-jest": "^28.1.3",
+    "eslint": "^8.22.0",
+    "eslint-plugin-flowtype": "^8.0.3",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-jsdoc": "^39.3.2",
+    "eslint-plugin-sonarjs": "^0.13.0",
+    "eslint-plugin-unicorn": "^42.0.0",
+    "jest": "^28.1.3",
     "nyc": "^15.1.0",
-    "semantic-release": "^17.3.7"
+    "semantic-release": "^19.0.3"
   },
   "peerDependencies": {
-    "aws-sdk": ">=2.831.0"
+    "aws-sdk": "^2.831.0"
   },
   "dependencies": {
     "@sentry/node": "^6.0.1",
     "alai": "1.0.3",
-    "async": "^3.2.0",
-    "axios": "^0.21.1",
-    "epsagon": "^1.104.2",
+    "async": "^3.2.4",
+    "axios": "^0.27.2",
+    "epsagon": "^1.123.2",
     "useragent": "2.3.0",
-    "uuid": "^8.2.0",
+    "uuid": "^8.3.2",
     "validate.js": "0.13.1",
-    "winston": "^3.3.3",
+    "winston": "^3.8.1",
     "xml2js": "^0.4.23"
   }
 }
diff --git a/src/DependencyInjection/DependencyInjection.class.js b/src/DependencyInjection/DependencyInjection.class.js
@@ -99,11 +99,7 @@ export default class DependencyInjection {
       return true;
     }
 
-    if (process.env.USE_SERVERLESS_OFFLINE) {
-      return true;
-    }
-
-    return false;
+    return !!process.env.USE_SERVERLESS_OFFLINE;
   }
 
   /**
diff --git a/src/Model/SQS/MarketingPreference.model.js b/src/Model/SQS/MarketingPreference.model.js
@@ -546,13 +546,14 @@ export default class MarketingPreference extends Model {
       const validation = validate(this.getEntityMappings(), requestConstraintsClone);
 
       if (typeof validation === 'undefined') {
-        return resolve();
+        resolve();
+        return;
       }
 
       const validationErrorResponse = ERROR_TYPES.VALIDATION_ERROR;
       validationErrorResponse.setBodyVariable('validation_errors', validation);
 
-      return reject(validationErrorResponse);
+      reject(validationErrorResponse);
     });
   }
 }
diff --git a/src/Service/Request.service.js b/src/Service/Request.service.js
@@ -78,7 +78,6 @@ export default class RequestService extends DependencyAwareClass {
    * @param {string} name The name of the header.
    * @param {string} [whenMissing] Value to return if the header is missing.
    *   (default: empty string)
-   *
    * @returns {string}
    */
   getHeader(name: string, whenMissing: string = '') {
diff --git a/src/Service/SQS.service.js b/src/Service/SQS.service.js
@@ -321,16 +321,11 @@ export default class SQSService extends DependencyAwareClass {
         await this.sqs.sendMessage(messageParameters).promise();
       }
     } catch (error) {
-      switch (failureMode) {
-      case SQS_PUBLISH_FAILURE_MODES.CATCH:
+      if (failureMode === SQS_PUBLISH_FAILURE_MODES.CATCH) {
         container.get(DEFINITIONS.LOGGER).error(error);
-
         return null;
-
-      case SQS_PUBLISH_FAILURE_MODES.THROW:
-      default:
-        throw error;
       }
+      throw error;
     }
 
     return queue;
diff --git a/src/Service/Timer.service.js b/src/Service/Timer.service.js
@@ -22,7 +22,7 @@ export default class TimerService extends DependencyAwareClass {
    * @param identifier
    */
   start(identifier: string) {
-    this.timers[identifier] = new Date().getTime();
+    this.timers[identifier] = Date.now();
   }
 
   /**
@@ -32,7 +32,7 @@ export default class TimerService extends DependencyAwareClass {
    */
   stop(identifier: string) {
     if (typeof this.timers[identifier] !== 'undefined') {
-      const duration = new Date().getTime() - this.timers[identifier];
+      const duration = Date.now() - this.timers[identifier];
 
       this.getContainer().get(DEFINITIONS.LOGGER).info(`Timing - ${identifier} took ${duration}ms to complete`);
     }
diff --git a/src/Wrapper/LambdaWrapper.js b/src/Wrapper/LambdaWrapper.js
@@ -124,7 +124,7 @@ export default (configuration, handler, throwError = false) => {
               // and not an error object directly
               // and will treat resolved errors as successful
               // as it will cast the error to JSON, i.e. `{}`
-              return Promise.reject(handled);
+              throw handled;
             }
 
             return handled;
diff --git a/src/Wrapper/PromisifiedDelay.js b/src/Wrapper/PromisifiedDelay.js
@@ -10,8 +10,8 @@ const HIGH_LATENCY_DELAYS = {
   3500: 15,
   4000: 9,
   5000: 5,
-  10000: 5,
-  20000: 1,
+  10_000: 5,
+  20_000: 1,
 };
 
 /**
diff --git a/tests/unit/DependencyInjection/DependencyAware.class.test.js b/tests/unit/DependencyInjection/DependencyAware.class.test.js
@@ -2,9 +2,8 @@ import DependencyInjection from '../../../src/DependencyInjection/DependencyInje
 // The import order is relevant here to avoid circular imports
 // eslint-disable-next-line import/order
 import DependencyAware from '../../../src/DependencyInjection/DependencyAware.class';
-
-const getContext = require('../../mocks/aws/context.json');
-const getEvent = require('../../mocks/aws/event.json');
+import getContext from '../../mocks/aws/context.json';
+import getEvent from '../../mocks/aws/event.json';
 
 describe('DependencyInjection/DependencyAwareClass', () => {
   describe('getContainer', () => {
diff --git a/tests/unit/DependencyInjection/DependencyInjection.class.test.js b/tests/unit/DependencyInjection/DependencyInjection.class.test.js
@@ -2,9 +2,8 @@ import { DEFINITIONS } from '../../../src/Config/Dependencies';
 import DependencyInjection from '../../../src/DependencyInjection/DependencyInjection.class';
 import LoggerService from '../../../src/Service/Logger.service';
 import RequestService from '../../../src/Service/Request.service';
-
-const getContext = require('../../mocks/aws/context.json');
-const getEvent = require('../../mocks/aws/event.json');
+import getContext from '../../mocks/aws/context.json';
+import getEvent from '../../mocks/aws/event.json';
 
 describe('DependencyInjection/DependencyInjectionClass', () => {
   describe('should instantiate', () => {
diff --git a/tests/unit/Service/HTTP.service.test.js b/tests/unit/Service/HTTP.service.test.js
@@ -3,8 +3,7 @@ import axios from 'axios';
 import CONFIGURATION from '../../../src/Config/Dependencies';
 import DependencyInjection from '../../../src/DependencyInjection/DependencyInjection.class';
 import HTTPService, { COMICRELIEF_TEST_METADATA_HEADER } from '../../../src/Service/HTTP.service';
-
-const getEvent = require('../../mocks/aws/event.json');
+import getEvent from '../../mocks/aws/event.json';
 
 const getContext = { invokedFunctionArn: 'my-function' };
 
diff --git a/tests/unit/Service/Logger.service.test.js b/tests/unit/Service/Logger.service.test.js
@@ -3,8 +3,7 @@ import Winston from 'winston';
 import CONFIGURATION from '../../../src/Config/Dependencies';
 import DependencyInjection from '../../../src/DependencyInjection/DependencyInjection.class';
 import LoggerService from '../../../src/Service/Logger.service';
-
-const getEvent = require('../../mocks/aws/event.json');
+import getEvent from '../../mocks/aws/event.json';
 
 const getContext = { invokedFunctionArn: 'my-function' };
 
diff --git a/tests/unit/Service/Request.service.test.js b/tests/unit/Service/Request.service.test.js
@@ -4,9 +4,8 @@ import QueryString from 'querystring';
 import CONFIGURATION from '../../../src/Config/Dependencies';
 import DependencyInjection from '../../../src/DependencyInjection/DependencyInjection.class';
 import RequestService, { HTTP_METHODS_WITHOUT_PAYLOADS, HTTP_METHODS_WITH_PAYLOADS } from '../../../src/Service/Request.service';
-
-const getContext = require('../../mocks/aws/context.json');
-const baseEvent = require('../../mocks/aws/event.json');
+import getContext from '../../mocks/aws/context.json';
+import baseEvent from '../../mocks/aws/event.json';
 
 const getEvent = (overrides = {}) => JSON.parse(JSON.stringify(({
   ...baseEvent,
diff --git a/tests/unit/Wrapper/LambdaWrapper.test.js b/tests/unit/Wrapper/LambdaWrapper.test.js
@@ -6,9 +6,8 @@ import RequestService, { REQUEST_TYPES } from '../../../src/Service/Request.serv
 import LambdaTermination from '../../../src/Wrapper/LambdaTermination';
 import LambdaWrapper, { handleError } from '../../../src/Wrapper/LambdaWrapper';
 import { getMockedDi } from '../../lib/mocks';
-
-const getContext = require('../../mocks/aws/context.json');
-const getEvent = require('../../mocks/aws/event.json');
+import getContext from '../../mocks/aws/context.json';
+import getEvent from '../../mocks/aws/event.json';
 
 const handlers = {
   SYNC_SUCCESS: () => ResponseModel.generate({ x: 'success' }, 200, 'ok'),
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,7 @@ export default class DependencyInjection {`
`99`	`99`	`return true;`
`100`	`100`	`}`
`101`	`101`
`102`		`- if (process.env.USE_SERVERLESS_OFFLINE) {`
`103`		`- return true;`
`104`		`- }`
`105`		`-`
`106`		`- return false;`
	`102`	`+ return !!process.env.USE_SERVERLESS_OFFLINE;`
`107`	`103`	`}`
`108`	`104`
`109`	`105`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -546,13 +546,14 @@ export default class MarketingPreference extends Model {`
`546`	`546`	`const validation = validate(this.getEntityMappings(), requestConstraintsClone);`
`547`	`547`
`548`	`548`	`if (typeof validation === 'undefined') {`
`549`		`- return resolve();`
	`549`	`+ resolve();`
	`550`	`+ return;`
`550`	`551`	`}`
`551`	`552`
`552`	`553`	`const validationErrorResponse = ERROR_TYPES.VALIDATION_ERROR;`
`553`	`554`	`validationErrorResponse.setBodyVariable('validation_errors', validation);`
`554`	`555`
`555`		`- return reject(validationErrorResponse);`
	`556`	`+ reject(validationErrorResponse);`
`556`	`557`	`});`
`557`	`558`	`}`
`558`	`559`	`}`
Original file line number	Diff line number	Diff line change
`@@ -321,16 +321,11 @@ export default class SQSService extends DependencyAwareClass {`
`321`	`321`	`await this.sqs.sendMessage(messageParameters).promise();`
`322`	`322`	`}`
`323`	`323`	`} catch (error) {`
`324`		`- switch (failureMode) {`
`325`		`- case SQS_PUBLISH_FAILURE_MODES.CATCH:`
	`324`	`+ if (failureMode === SQS_PUBLISH_FAILURE_MODES.CATCH) {`
`326`	`325`	`container.get(DEFINITIONS.LOGGER).error(error);`
`327`		`-`
`328`	`326`	`return null;`
`329`		`-`
`330`		`- case SQS_PUBLISH_FAILURE_MODES.THROW:`
`331`		`- default:`
`332`		`- throw error;`
`333`	`327`	`}`
	`328`	`+ throw error;`
`334`	`329`	`}`
`335`	`330`
`336`	`331`	`return queue;`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ export default (configuration, handler, throwError = false) => {`
`124`	`124`	`// and not an error object directly`
`125`	`125`	`// and will treat resolved errors as successful`
`126`	`126`	// as it will cast the error to JSON, i.e. `{}`
`127`		`- return Promise.reject(handled);`
	`127`	`+ throw handled;`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`return handled;`