@mimik/configuration 4.4.0 → 4.4.4

package/README.md

@@ -49,7 +49,8 @@ The following environment variables are being setup:
 | SERVER_LOCAL_IPV4 | IP address of the micro-service | ip.address() | serverSettings.ip.local
 | CONSOLE_LEVEL | log level for console output | debug | logInfo.consoleLevel
 | LOG_LEVEL | log level for console output | debug | logInfo.logLevel
-| AWS_LOCAL_PROPERTIES | internal ip address to access aws insrance properties | 169.254.169.254
+| AWS_LOCAL_PROPERTIES | internal ip address to access aws instance properties | 169.254.169.254
+| MST_SET | to setup configuration without mST and oauth token setup | on | on/off
 
 The following environement variables are being used for the configuration:
 

package/index.js

@@ -86,9 +86,10 @@ const {
   DEFAULT_INTERCEPT_ERROR,
 } = require('./lib/common');
 
-const correlationIdStart = getCorrelationId('config-start');
 let display = true;
 const locParams = [NO_PUBLIC_PROVIDER, ENV_VARIABLE];
+const correlationIdStart = getCorrelationId('config-start');
+const isMSTSet = process.env.MST_SET !== 'off';
 
 const setupRedis = () => {
   const domain = process.env.CACHE_IP || DEFAULT_CACHE_IP;
@@ -133,6 +134,7 @@ const setupRedis = () => {
       idTTL: parseInt(process.env.CACHE_API_ID_TTL, 10) || DEFAULT_CACHE_API_ID_TTL,
       optionTTL: parseInt(process.env.CACHE_API_OPTION_TTL, 10) || DEFAULT_CACHE_API_OPTION_TTL,
     },
+    isMSTSet,
   };
 };
 
@@ -212,9 +214,6 @@ const setupMongo = (dbOpts) => {
     table: dbOpts.table,
     url,
     options: {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-      useCreateIndex: true,
       family: parseInt(process.env.MONGO_FAMILY, 10) || DEFAULT_MONGO_FAMILY,
       keepAlive: process.env.MONGO_KEEP_ALIVE || DEFAULT_MONGO_KEEP_ALIVE,
       keepAliveInitialDelay: parseInt(process.env.MONGO_KEEP_ALIVE_INITIAL_DELAY, 10) || DEFAULT_MONGO_KEEP_ALIVE_INITIAL_DELAY,
@@ -371,7 +370,7 @@ const configuration = {
     admin: {
       externalId: process.env.ADMIN_EXTERNAL_ID || DEFAULT_ADMIN_EXTERNAL_ID,
     },
-    server: {
+    server: !isMSTSet ? {} : {
       id: process.env.OAUTH_CLIENT_ID,
       secret: process.env.OAUTH_CLIENT_SECRET,
       accessKey: process.env.OAUTH_CLIENT_ACCESS_KEY,
@@ -397,7 +396,7 @@ const configuration = {
   topic: {
     set: process.env.TOPIC_SET || DEFAULT_TOPIC_SET,
   },
-  dependencies: { // everyserver will resport to mIT
+  dependencies: !isMSTSet ? {} : { // every server will report to mIT unless mST setup is disabled
     mIT: {
       url: process.env.MIT_URL,
       audience: process.env.MIT_AUDIENCE,
@@ -439,7 +438,8 @@ configuration.locationProvider = setupLocationProvider();
  * | SERVER_LOCAL_IPV4 | IP address of the micro-service | ip.address() | serverSettings.ip.local
  * | CONSOLE_LEVEL | log level for console output | debug | logInfo.consoleLevel
  * | LOG_LEVEL | log level for console output | debug | logInfo.logLevel
- * | AWS_LOCAL_PROPERTIES | internal ip address to access aws insrance properties | 169.254.169.254
+ * | AWS_LOCAL_PROPERTIES | internal ip address to access aws instance properties | 169.254.169.254
+ * | MST_SET | to setup configuration without mST and oauth token setup | on | on/off
  *
  * The following environement variables are being used for the configuration:
  *
@@ -601,6 +601,7 @@ const setConfig = (pack, options) => {
     process.env.SWAGGER_FILE_NAME = pack.swaggerFile.name;
   }
 
+  // eslint-disable-next-line max-len
   const apiFilename = `${process.env.SWAGGER_FILE_ACCOUNT}${SWAGGER_SEP}${process.env.SWAGGER_FILE_NAME}${SWAGGER_SEP}${process.env.SWAGGER_FILE_VERSION}${SWAGGER_SEP}${SWAGGER_EXT}`;
 
   configuration.serverSettings.name = process.env.SERVER_NAME;
@@ -612,9 +613,10 @@ const setConfig = (pack, options) => {
   // default for every server for cluster management
   configuration.dependencies[configuration.serverSettings.type] = {
     url: process.env[`${configuration.serverSettings.type}_URL`.toUpperCase()] || 'self', // this url should never be needed
-    audience: process.env[`${configuration.serverSettings.type}_AUDIENCE`.toUpperCase()],
   };
 
+  if (isMSTSet) configuration.dependencies[configuration.serverSettings.type].audience = process.env[`${configuration.serverSettings.type}_AUDIENCE`.toUpperCase()];
+
   if (options.database) {
     if (options.database.type === 'mongodb') {
       configuration.mongoSettings = setupMongo(options.database);
@@ -648,7 +650,15 @@ const setConfig = (pack, options) => {
   }
   if (options.dependencies) {
     Object.keys(options.dependencies).forEach((dependency) => {
-      configuration.dependencies[dependency] = options.dependencies[dependency];
+      if (isMSTSet) {
+        configuration.dependencies[dependency] = options.dependencies[dependency];
+      }
+      else if (options.dependencies[dependency].apiKey) {
+        configuration.dependencies[dependency] = {
+          url: options.dependencies[dependency].url,
+          apiKey: options.dependencies[dependency].apiKey,
+        };
+      }
     });
   }
   if (options.custom) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimik/configuration",
-  "version": "4.4.0",
+  "version": "4.4.4",
   "description": "Common configuration for mimik services",
   "main": "index.js",
   "scripts": {
@@ -37,14 +37,14 @@
   },
   "devDependencies": {
     "@mimik/eslint-plugin-dependencies": "^2.4.1",
-    "@mimik/eslint-plugin-document-env": "^1.0.0",
-    "eslint": "8.4.1",
+    "@mimik/eslint-plugin-document-env": "^1.0.1",
+    "eslint": "8.6.0",
     "eslint-config-airbnb": "18.2.1",
-    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsx-a11y": "6.5.1",
-    "eslint-plugin-react": "7.27.1",
+    "eslint-plugin-react": "7.28.0",
     "eslint-plugin-react-hooks": "4.3.0",
-    "fancy-log": "1.3.3",
+    "fancy-log": "2.0.0",
     "gulp": "4.0.2",
     "gulp-eslint": "6.0.0",
     "gulp-git": "2.10.1",