@mojaloop/sdk-scheme-adapter 15.0.1 → 17.0.1

package/.circleci/config.yml

@@ -93,7 +93,7 @@ jobs:
           name: Delete build dependencies
           command: apk del build-dependencies
       - save_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - node_modules
 
@@ -105,7 +105,7 @@ jobs:
           command: *defaults_Dependencies
       - checkout
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Execute unit tests
           command: npm run test
@@ -125,7 +125,7 @@ jobs:
             chmod +x ~/docker-compose
             sudo mv ~/docker-compose /usr/local/bin/docker-compose
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Set up NVM
           command: |
@@ -171,7 +171,7 @@ jobs:
           command: *defaults_Dependencies
       - checkout
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Execute unit tests
           command: npm run build:openapi && npm run validate:api
@@ -184,7 +184,7 @@ jobs:
           command: *defaults_Dependencies
       - checkout
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Create dir for lint results
           command: mkdir -p /lintresults
@@ -202,7 +202,7 @@ jobs:
           command: *defaults_Dependencies
       - checkout
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Create dir for test results
           command: mkdir -p ./audit/results
@@ -222,7 +222,7 @@ jobs:
       - run:
           <<: *defaults_license_scanner
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Prune non-production packages before running license-scanner
           command: npm prune --production
@@ -324,7 +324,7 @@ jobs:
           command: *defaults_Dependencies
       - checkout
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Configure git
           command: |
@@ -413,7 +413,7 @@ jobs:
           name: Install general dependencies
           command: *defaults_Dependencies
       - restore_cache:
-          key: dependency-cache-v3-{{ checksum "package-lock.json" }}
+          key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: setup environment vars for LATEST release
           command: |

package/CHANGELOG.md

@@ -1,4 +1,39 @@
 # Changelog: [mojaloop/thirdparty-api-svc](https://github.com/mojaloop/thirdparty-api-svc)
+### [17.0.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v17.0.0...v17.0.1) (2022-07-04)
+
+
+### Bug Fixes
+
+* creating inbound server ([#329](https://github.com/mojaloop/sdk-scheme-adapter/issues/329)) ([962420f](https://github.com/mojaloop/sdk-scheme-adapter/commit/962420f6fed02722c5a9aeee6c108b6fbc9f021d))
+
+## [17.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v15.0.1...v17.0.0) (2022-07-04)
+
+
+### ⚠ BREAKING CHANGES
+
+* add dummy pr to major version bump due to unsquashed title (#327)
+
+### Features
+
+* suppress health check logs ([#328](https://github.com/mojaloop/sdk-scheme-adapter/issues/328)) ([64fadde](https://github.com/mojaloop/sdk-scheme-adapter/commit/64faddea8307aa0c19d56466d0afe8f8208c4d66))
+
+
+### Chore
+
+* add dummy pr to major version bump due to unsquashed title ([#327](https://github.com/mojaloop/sdk-scheme-adapter/issues/327)) ([ff0f29b](https://github.com/mojaloop/sdk-scheme-adapter/commit/ff0f29b7ce560565ee21cf6ae84118e1b391b5b5))
+* **release:** 16.0.0 [skip ci] ([0071c65](https://github.com/mojaloop/sdk-scheme-adapter/commit/0071c65c3665239d0a482e76498f9eec5c288043))
+
+## [16.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v15.0.1...v16.0.0) (2022-07-01)
+
+
+### ⚠ BREAKING CHANGES
+
+* add dummy pr to major version bump due to unsquashed title (#327)
+
+### Chore
+
+* add dummy pr to major version bump due to unsquashed title ([#327](https://github.com/mojaloop/sdk-scheme-adapter/issues/327)) ([ff0f29b](https://github.com/mojaloop/sdk-scheme-adapter/commit/ff0f29b7ce560565ee21cf6ae84118e1b391b5b5))
+
 ### [15.0.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v15.0.0...v15.0.1) (2022-07-01)
 
 ## [15.0.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v14.0.0...v15.0.0) (2022-06-17)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "15.0.1",
+  "version": "17.0.1",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -11,8 +11,8 @@
     "~": "src"
   },
   "scripts": {
-    "audit:resolve": "SHELL=sh resolve-audit --production",
-    "audit:check": "SHELL=sh check-audit --production",
+    "audit:resolve": "resolve-audit --production",
+    "audit:check": "check-audit --production",
     "build": "npm run build:openapi; npm run build:dto:outbound",
     "build:openapi": "npm run build:openapi:inbound && npm run build:openapi:outbound",
     "build:openapi:inbound": "openapi bundle --output ./src/InboundServer/api.yaml --ext yaml ./src/InboundServer/api_template.yaml",
@@ -29,7 +29,8 @@
     "updates:update": "npm run dep:update && npm install",
     "dep:check": "npx ncu -e 2",
     "dep:update": "npx ncu -u",
-    "release": "standard-version --releaseCommitMessageFormat 'chore(release): {{currentTag}} [skip ci]'"
+    "release": "standard-version --releaseCommitMessageFormat 'chore(release): {{currentTag}} [skip ci]'",
+    "snapshot": "standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'"
   },
   "author": "Matt Kingston, James Bush, ModusBox Inc.",
   "contributors": [
@@ -56,7 +57,7 @@
   "dependencies": {
     "@koa/cors": "^3.1.0",
     "@mojaloop/central-services-shared": "17.0.2",
-    "@mojaloop/sdk-standard-components": "^17.0.4",
+    "@mojaloop/sdk-standard-components": "^17.1.0",
     "ajv": "8.11.0",
     "axios": "^0.27.2",
     "co-body": "^6.1.0",
@@ -87,7 +88,7 @@
     "@redocly/openapi-cli": "^1.0.0-beta.59",
     "@types/jest": "^28.1.4",
     "babel-jest": "^28.1.2",
-    "eslint": "^8.18.0",
+    "eslint": "^8.19.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jest": "^26.5.3",
@@ -95,12 +96,12 @@
     "jest-junit": "^14.0.0",
     "nock": "^13.2.8",
     "npm-audit-resolver": "^3.0.0-0",
-    "npm-check-updates": "^15.0.1",
+    "npm-check-updates": "^15.0.2",
     "openapi-response-validator": "^12.0.0",
     "openapi-typescript": "^5.4.0",
     "redis-mock": "^0.56.3",
     "standard-version": "^9.3.1",
-    "supertest": "^6.1.6",
+    "supertest": "^6.2.4",
     "swagger-cli": "^4.0.4"
   }
 }

package/src/InboundServer/index.js

@@ -23,6 +23,8 @@ const router = require('../lib/router');
 const handlers = require('./handlers');
 const middlewares = require('./middlewares');
 
+const logExcludePaths = ['/'];
+
 class InboundApi extends EventEmitter {
     constructor(conf, logger, cache, validator, wso2) {
         super({ captureExceptions: true });
@@ -99,7 +101,7 @@ class InboundApi extends EventEmitter {
             api.use(middlewares.createJwsValidator(logger, jwsVerificationKeys, jwsExclusions));
         }
 
-        api.use(middlewares.applyState({ cache, wso2, conf }));
+        api.use(middlewares.applyState({ cache, wso2, conf, logExcludePaths }));
         api.use(middlewares.createLogger(logger));
         api.use(middlewares.createRequestValidator(validator));
         api.use(middlewares.assignFspiopIdentifier());
@@ -133,7 +135,7 @@ class InboundServer extends EventEmitter {
     constructor(conf, logger, cache, wso2) {
         super({ captureExceptions: true });
         this._conf = conf;
-        this._validator = new Validate();
+        this._validator = new Validate({ logExcludePaths });
         this._logger = logger;
         this._api = new InboundApi(
             conf,

package/src/InboundServer/middlewares.js

@@ -353,13 +353,17 @@ const createLogger = (logger) => async (ctx, next) => {
         path: ctx.path,
         method: ctx.method
     }});
-    ctx.state.logger.push({ body: ctx.request.body }).log('Request received');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        ctx.state.logger.push({body: ctx.request.body}).log('Request received');
+    }
     try {
         await next();
     } catch (err) {
         ctx.state.logger.push(err).log('Error');
     }
-    await ctx.state.logger.log('Request processed');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        await ctx.state.logger.log('Request processed');
+    }
 };
 
 
@@ -369,10 +373,14 @@ const createLogger = (logger) => async (ctx, next) => {
  * @return {Function}
  */
 const createRequestValidator = (validator) => async (ctx, next) => {
-    ctx.state.logger.log('Validating request');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        ctx.state.logger.log('Validating request');
+    }
     try {
         ctx.state.path = validator.validateRequest(ctx, ctx.state.logger);
-        ctx.state.logger.log('Request passed validation');
+        if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+            ctx.state.logger.log('Request passed validation');
+        }
         await next();
     } catch (err) {
         ctx.state.logger.push({ err }).log('Request failed validation.');

package/src/OutboundServer/index.js

@@ -23,6 +23,7 @@ const handlers = require('./handlers');
 const middlewares = require('./middlewares');
 
 const endpointRegex = /\/.*/g;
+const logExcludePaths = ['/'];
 
 class OutboundApi extends EventEmitter {
     constructor(conf, logger, cache, validator, metricsClient, wso2) {
@@ -36,7 +37,7 @@ class OutboundApi extends EventEmitter {
         this._api.use(middlewares.createErrorHandler(this._logger));
         this._api.use(middlewares.createRequestIdGenerator());
         this._api.use(koaBody()); // outbound always expects application/json
-        this._api.use(middlewares.applyState({ cache, wso2, conf, metricsClient }));
+        this._api.use(middlewares.applyState({ cache, wso2, conf, metricsClient, logExcludePaths }));
         this._api.use(middlewares.createLogger(this._logger));
 
         //Note that we strip off any path on peerEndpoint config after the origin.
@@ -69,7 +70,7 @@ class OutboundApi extends EventEmitter {
 class OutboundServer extends EventEmitter {
     constructor(conf, logger, cache, metricsClient, wso2) {
         super({ captureExceptions: true });
-        this._validator = new Validate();
+        this._validator = new Validate({ logExcludePaths });
         this._conf = conf;
         this._logger = logger;
         this._server = null;

package/src/OutboundServer/middlewares.js

@@ -20,10 +20,14 @@ const { applyState, createErrorHandler, createLogger, createRequestIdGenerator }
  * @return {Function}
  */
 const createRequestValidator = (validator) => async (ctx, next) => {
-    ctx.state.logger.log('Validating request');
+    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+        ctx.state.logger.log('Validating request');
+    }
     try {
         ctx.state.path = validator.validateRequest(ctx, ctx.state.logger);
-        ctx.state.logger.log('Request passed validation');
+        if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+            ctx.state.logger.log('Request passed validation');
+        }
         await next();
     } catch (err) {
         ctx.state.logger.push({ err }).log('Request failed validation.');

package/src/TestServer/index.js

@@ -21,6 +21,8 @@ const router = require('../lib/router');
 const handlers = require('./handlers');
 const middlewares = require('../InboundServer/middlewares');
 
+const logExcludePaths = ['/'];
+
 const getWsIp = (req) => [
     req.socket.remoteAddress,
     ...(
@@ -36,7 +38,7 @@ class TestApi {
 
         this._api.use(middlewares.createErrorHandler(logger));
         this._api.use(middlewares.createRequestIdGenerator());
-        this._api.use(middlewares.applyState({ cache }));
+        this._api.use(middlewares.applyState({ cache, logExcludePaths }));
         this._api.use(middlewares.createLogger(logger));
 
         this._api.use(middlewares.createRequestValidator(validator));
@@ -174,7 +176,7 @@ class TestServer {
     constructor({ port, logger, cache }) {
         this._port = port;
         this._logger = logger;
-        this._validator = new Validate();
+        this._validator = new Validate({ logExcludePaths });
         this._api = new TestApi(this._logger.push({ component: 'api' }), this._validator, cache);
         this._server = http.createServer(this._api.callback());
         // TODO: why does this appear to need to be called after creating this._server (try reorder

package/src/index.js

@@ -78,7 +78,6 @@ class Server extends EventEmitter {
             this.conf,
             this.logger.push(LOG_ID.INBOUND),
             this.cache,
-            this.metricsClient,
             this.wso2,
         );
         this.inboundServer.on('error', (...args) => {
@@ -195,7 +194,6 @@ class Server extends EventEmitter {
                 newConf,
                 this.logger.push(LOG_ID.INBOUND),
                 this.cache,
-                this.metricsClient,
                 this.wso2,
             );
             this.inboundServer.on('error', (...args) => {

package/src/lib/metrics.js

@@ -131,8 +131,6 @@ class MetricsServer {
 
         result.use(koaBody());
         result.use(async ctx => {
-            this._logger.log('Metrics request received');
-
             ctx.response.set('Content-Type', this._prometheusRegister.contentType);
             ctx.response.body = await this._prometheusRegister.metrics();
         });

package/src/lib/router.js

@@ -21,7 +21,9 @@ module.exports = (handlerMap) => async (ctx, next) => {
         ctx.response.body = { statusCode: 404, message: 'Not found' };
     }
     else {
-        ctx.state.logger.push({ handler }).log('Found handler');
+        if (!ctx.state.logExcludePaths.includes(ctx.path)) {
+            ctx.state.logger.push({handler}).log('Found handler');
+        }
         await handler(ctx);
     }
     await next();

package/src/lib/validate.js

@@ -125,6 +125,13 @@ const transformApiDoc = apiDoc => ({
 });
 
 class Validator {
+    /**
+   * @param {{logExcludePaths: string[]}} [opts]
+   */
+
+    constructor(opts) {
+        this.logExcludePaths = opts?.logExcludePaths || [];
+    }
     // apiDoc
     //   POJO representing apiDoc API spec. Example:
     //   const v = new Validator(require('./apiDoc.json'));
@@ -163,7 +170,9 @@ class Validator {
         }
         result.params = Object.assign({}, ...path.match(result.matcher.regex).slice(1).map((m, i) => ({ [result.matcher.params[i]]: m})));
 
-        logger.push({ path, result }).log('Matched path');
+        if (!this.logExcludePaths.includes(path)) {
+            logger.push({path, result}).log('Matched path');
+        }
         return result;
     }