From 5130fee6b9d3c44bd07de15babcc5ce602757bdf Mon Sep 17 00:00:00 2001 From: Juan Correa Date: Mon, 4 Nov 2019 06:32:47 -0800 Subject: [PATCH 1/2] Issue934-FixSetEnvVarRCAsBooleanInsteadOfString-UpdateDepsPackageVer --- package-lock.json | 38 ++++++++++++++++++++++---------------- package.json | 8 ++++---- src/lib/config.js | 2 +- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b9b51b4..e89b2ca3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@mojaloop/ml-api-adapter", - "version": "8.4.0", + "version": "8.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -730,9 +730,9 @@ } }, "@mojaloop/central-services-shared": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-8.3.4.tgz", - "integrity": "sha512-Ezy/lO3HzuZ1J3Vx22We6tD3BpdZB97xfta0xrZvW/LRg7CSanq9ZcsrfxSmgcQ+x8rS5hqogFZDlNVHDxb14A==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-8.4.0.tgz", + "integrity": "sha512-ZPhx3L6DeeExbg3W7+GMbuTcZXNgv1qXbdSdtOXjr+/Q1PoioI8GADU5P0m/54PRfALKViVW4B/jKg5j6yRgUA==", "requires": { "@hapi/catbox": "10.2.3", "@hapi/catbox-memory": "4.1.1", @@ -2001,9 +2001,9 @@ } }, "commander": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz", - "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.0.0.tgz", + "integrity": "sha512-SEa2abMBTZuEjLVYpNrAFoRgxPwG4rXP3+SGY6CM/HZGeDzIA7Pzp+7H3AHDukKEpyy2SoSGGPShKqqfH9T9AQ==" }, "commondir": { "version": "1.0.1", @@ -2270,9 +2270,9 @@ } }, "defer-to-connect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz", - "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.0.tgz", + "integrity": "sha512-WE2sZoctWm/v4smfCAdjYbrfS55JiMRdlY9ZubFhsYbteCK9+BvAx4YV7nPjYM6ZnX5BcoVKwfmyx9sIFTgQMQ==", "dev": true }, "define-properties": { @@ -6793,9 +6793,9 @@ "dev": true }, "npm-check-updates": { - "version": "3.1.26", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.26.tgz", - "integrity": "sha512-TQSMJgS7AdbdPsK5TsCNMa+7vdL7HLQrXKrwLMxPLiJtrnye9HEqJZK+U8VdbSq+qrjdt5lgm0g5vRmSSSOcvw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.2.0.tgz", + "integrity": "sha512-Gqxd6Fv+EoGNKg2thclx3LPs9dHa1Tp/R+/59iYAgbliJ5NsDd/D6j6kjhnLtKh+7XMX7co3gTrVzsSqTPNRAg==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -6869,6 +6869,12 @@ "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==", "dev": true }, + "commander": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz", + "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==", + "dev": true + }, "configstore": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", @@ -8182,9 +8188,9 @@ } }, "rc-config-loader": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.4.tgz", - "integrity": "sha512-k06UzRbYDWgF4Mc/YrsZsmzSpDLuHoThJxep+vq5H09hiX8rbA5Ue/Ra0dwWm5MQvWYW4YBXgA186inNxuxidQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.5.tgz", + "integrity": "sha512-T464K2MQlnNWOblUDIglpFhyN+zYJq7jSlL++/N0hUkcmIXeNFumwXFVdtf8qhUGohn4RYQ0wdi74R575I44PQ==", "dev": true, "requires": { "debug": "^4.1.1", diff --git a/package.json b/package.json index 31531055..1072493d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mojaloop/ml-api-adapter", - "version": "8.4.0", + "version": "8.4.1", "description": "Convert from ML API to/from internal Central Services messaging format", "license": "Apache-2.0", "private": true, @@ -81,14 +81,14 @@ "@mojaloop/central-services-health": "8.3.0", "@mojaloop/central-services-logger": "8.1.2", "@mojaloop/central-services-metrics": "8.3.0", - "@mojaloop/central-services-shared": "8.3.4", + "@mojaloop/central-services-shared": "8.4.0", "@mojaloop/central-services-stream": "8.3.0", "@mojaloop/event-sdk": "8.3.0", "@mojaloop/forensic-logging-client": "8.3.0", "@now-ims/hapi-now-auth": "2.0.0", "axios": "0.19.0", "blipp": "4.0.1", - "commander": "3.0.2", + "commander": "4.0.0", "docdash": "1.1.1", "glob": "7.1.5", "hapi-auth-bearer-token": "6.2.1", @@ -106,7 +106,7 @@ "license-checker": "25.0.1", "nodemon": "1.19.4", "npm-audit-resolver": "2.1.0", - "npm-check-updates": "3.1.26", + "npm-check-updates": "3.2.0", "npm-run-all": "4.1.5", "nyc": "14.1.1", "pre-commit": "1.2.2", diff --git a/src/lib/config.js b/src/lib/config.js index ab93b583..671bf575 100644 --- a/src/lib/config.js +++ b/src/lib/config.js @@ -1,4 +1,4 @@ -const RC = require('rc')('MLAPI', require('../../config/default.json')) +const RC = require('parse-strings-in-object')(require('rc')('MLAPI', require('../../config/default.json'))) // Set config object to be returned const config = { From 42c3d24e112d0a826dbac6a4c09a8a8874fb9fcd Mon Sep 17 00:00:00 2001 From: Juan Correa Date: Wed, 6 Nov 2019 08:40:07 -0800 Subject: [PATCH 2/2] Issue934-AddParseStringInObjectDependencyAndUpdateDeps --- package-lock.json | 6 +++--- package.json | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e89b2ca3..667a1a77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -730,9 +730,9 @@ } }, "@mojaloop/central-services-shared": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-8.4.0.tgz", - "integrity": "sha512-ZPhx3L6DeeExbg3W7+GMbuTcZXNgv1qXbdSdtOXjr+/Q1PoioI8GADU5P0m/54PRfALKViVW4B/jKg5j6yRgUA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-8.4.2.tgz", + "integrity": "sha512-uUIx+quvA0yrDWEu1Lr7PDJvKIP2onD+gy4u5dtmG0rMbx9grFCRWf1TZ2YaNK0OjA+f9W20M5A/GDFcWpaO2g==", "requires": { "@hapi/catbox": "10.2.3", "@hapi/catbox-memory": "4.1.1", diff --git a/package.json b/package.json index 1072493d..d882d356 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "@mojaloop/central-services-health": "8.3.0", "@mojaloop/central-services-logger": "8.1.2", "@mojaloop/central-services-metrics": "8.3.0", - "@mojaloop/central-services-shared": "8.4.0", + "@mojaloop/central-services-shared": "8.4.2", "@mojaloop/central-services-stream": "8.3.0", "@mojaloop/event-sdk": "8.3.0", "@mojaloop/forensic-logging-client": "8.3.0", @@ -95,6 +95,7 @@ "hapi-swagger": "10.2.0", "joi-currency-code": "2.0.2", "mustache": "3.1.0", + "parse-strings-in-object": "1.2.0", "rc": "1.2.8" }, "devDependencies": {