From 93c4048d5a604be81ce90365ff3f9cd42b531fef Mon Sep 17 00:00:00 2001 From: Kevin Leyow Date: Fri, 22 Apr 2022 09:33:31 -0500 Subject: [PATCH] fix: make management url config option optional (#310) * fix: make management url config option optional * chore: spelling --- .env.example | 2 +- src/config.js | 16 ++++++++-------- test/unit/config.test.js | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.env.example b/.env.example index fdda43658..b3c5b2da8 100644 --- a/.env.example +++ b/.env.example @@ -141,7 +141,7 @@ ALLOW_TRANSFER_WITHOUT_QUOTE=false # To enable request for notification on fulfiled transfer RESERVE_NOTIFICATION=true -# resources API versions should be string in format: "resouceOneName=1.0,resourceTwoName=1.1" +# resources API versions should be string in format: "resourceOneName=1.0,resourceTwoName=1.1" RESOURCE_VERSIONS="transfers=1.1,participants=1.1" # Management API websocket connection settings. diff --git a/src/config.js b/src/config.js index 21e296e41..a4c1e8322 100644 --- a/src/config.js +++ b/src/config.js @@ -22,8 +22,8 @@ function getFileContent (path) { } /** - * Gets Resources versions from enviromental variable RESOURCES_VERSIONS - * should be string in format: "resouceOneName=1.0,resourceTwoName=1.1" + * Gets Resources versions from environmental variable RESOURCES_VERSIONS + * should be string in format: "resourceOneName=1.0,resourceTwoName=1.1" */ function getVersionFromConfig (resourceString) { const resourceVersionMap = {}; @@ -44,7 +44,7 @@ function parseResourceVersions (resourceString) { const resourceFormatRegex = /(([A-Za-z])\w*)=([0-9]+).([0-9]+)([^;:|],*)/g; const noSpResources = resourceString.replace(/\s/g,''); if (!resourceFormatRegex.test(noSpResources)) { - throw new Error('Resource versions format should be in format: "resouceOneName=1.0,resourceTwoName=1.1"'); + throw new Error('Resource versions format should be in format: "resourceOneName=1.0,resourceTwoName=1.1"'); } return getVersionFromConfig(noSpResources); } @@ -58,10 +58,6 @@ const env = from(process.env, { module.exports = { __parseResourceVersion: parseResourceVersions, - control: { - mgmtAPIWsUrl: env.get('MGMT_API_WS_URL').required().asString(), - mgmtAPIWsPort: env.get('MGMT_API_WS_PORT').default('4005').asPortNumber() - }, mutualTLS: { inboundRequests: { enabled: env.get('INBOUND_MUTUAL_TLS_ENABLED').default('false').asBool(), @@ -157,7 +153,7 @@ module.exports = { proxyConfig: env.get('PROXY_CONFIG_PATH').asYamlConfig(), reserveNotification: env.get('RESERVE_NOTIFICATION').default('false').asBool(), - // resourceVersions config should be string in format: "resouceOneName=1.0,resourceTwoName=1.1" + // resourceVersions config should be string in format: "resourceOneName=1.0,resourceTwoName=1.1" resourceVersions: env.get('RESOURCE_VERSIONS').default('').asResourceVersions(), // in 3PPI DFSP's generate their own `transferId` which is associated with @@ -166,4 +162,8 @@ module.exports = { allowDifferentTransferTransactionId: env.get('ALLOW_DIFFERENT_TRANSFER_TRANSACTION_ID').default('false').asBool(), pm4mlEnabled: env.get('PM4ML_ENABLED').default('false').asBool(), + control: { + mgmtAPIWsUrl: env.get('MGMT_API_WS_URL').default('127.0.0.1').asString(), + mgmtAPIWsPort: env.get('MGMT_API_WS_PORT').default('4005').asPortNumber() + }, }; diff --git a/test/unit/config.test.js b/test/unit/config.test.js index 9f89baa03..0b968caa5 100644 --- a/test/unit/config.test.js +++ b/test/unit/config.test.js @@ -114,7 +114,7 @@ describe('config', () => { it('should throw an err if the resource string is not correctly formed', () => { const parseResourceVersion = require('~/config').__parseResourceVersion; - expect(() => parseResourceVersion('resourceOneName=1.0;resourceTwoName=1.1')).toThrowError(new Error('Resource versions format should be in format: "resouceOneName=1.0,resourceTwoName=1.1"')); + expect(() => parseResourceVersion('resourceOneName=1.0;resourceTwoName=1.1')).toThrowError(new Error('Resource versions format should be in format: "resourceOneName=1.0,resourceTwoName=1.1"')); }); });