@nsshunt/stsconfig 1.12.0 → 1.16.0

package/stsconfig.js

@@ -16,7 +16,9 @@ require('dotenv').config({ path: envfile });
 const defconfig = 
 {
 	// Node runtime environment
-	isProduction: (process.env.NODE_ENV === undefined ? false : process.env.NODE_ENV === 'production')
+	isProduction: (process.env.NODE_ENV === undefined ? false : (process.env.NODE_ENV === 'production' ? true : false))
+	// Node runtime environment
+	,isTest: (process.env.NODE_ENV === undefined ? false : (process.env.NODE_ENV === 'test' ? true : false))
 	// Log error messages to the console within the microservice
 	,consoleLogErrors: (process.env.CONSOLE_LOG_ERRORS === undefined ? false : (process.env.CONSOLE_LOG_ERRORS === "true" ? true : false ))
 	// Database username.
@@ -44,7 +46,7 @@ const defconfig =
 	// Automatically re-spawn a worker thread if one dies.
 	,respawnOnFail: (process.env.RESPAWN === undefined ? false : (process.env.RESPAWN === "true" ? true : false ))
 	// Default number of entries to create for a fresh database.
-	,defaultDatabaseEntries: (process.env.DEFAULT_DB_ENTRIES === undefined ? 10000 : process.env.DEFAULT_DB_ENTRIES)
+	,defaultDatabaseEntries: (process.env.DEFAULT_DB_ENTRIES === undefined ? 10000 : parseInt(process.env.DEFAULT_DB_ENTRIES))
 	// Microservice listen port.
 	,useRedis: (process.env.USE_REDIS === undefined ? false : (process.env.USE_REDIS === "true" ? true : false ))
 	// Use redis for Microservice.
@@ -70,6 +72,10 @@ const defconfig =
 	,rest01port: (process.env.REST01_PORT === undefined ? "3003" : process.env.REST01_PORT)
 	// STSREST01 Server endpoint
 	,rest01apiroot: (process.env.REST01_APIROOT === undefined ? "/stsrest01/v1" : process.env.REST01_APIROOT)
+	// STSREST01 API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,rest01apiidentifier: process.env.REST01_API_IDENTIFIER
+	// STSREST01 API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,rest01apiidentifierfile: process.env.REST01_API_IDENTIFIER_FILE
 	// STSREST01 Prometheus metric support
 	,rest01prometheussupport: (process.env.REST01_PROM_SUPPORT === undefined ? true : (process.env.REST01_PROM_SUPPORT === "true" ? true : false))
 	// STSREST01 Cluster Server port (port used for cluster prometheus scrapes). Service will listen on this port at mount point /metrics
@@ -78,14 +84,16 @@ const defconfig =
 	,rest01servicename: (process.env.REST01_SERVICE_NAME === undefined ? "STSRest01" : process.env.REST01_SERVICE_NAME)
 	// STSREST01 Service Version
 	,rest01serviceversion: (process.env.REST01_SERVICE_VERSION === undefined ? "1.0.0" : process.env.REST01_SERVICE_VERSION)
-	// STSREST01 Service Credentials
-	// -----------------------------
-	// STSREST01 Server username email
-	,rest01email: (process.env.REST01_EMAIL === undefined ? "K6TestUser@sts" : process.env.REST01_EMAIL)
-	// STSREST01 Server username password
-	,rest01password: (process.env.REST01_PASSWORD === undefined ? "K6TestUserPassword" : process.env.REST01_PASSWORD)
-	// STSREST01 Server username password file
-	,rest01passwordfile: process.env.REST01_PASSWORD_FILE
+	// STSREST01 Server client ID. Used for oauth2 client credentials flow.
+	// Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/client-credentials-flow
+	// Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/call-your-api-using-the-client-credentials-flow
+	,rest01clientid: process.env.REST01_CLIENT_ID
+	// STSREST01 Server client ID file. Used for oauth2 client credentials flow.
+	,rest01clientidfile: process.env.REST01_CLIENT_ID_FILE
+	// STSREST01 Server client secret. Used for oauth2 client credentials flow.
+	,rest01clientsecret: process.env.REST01_CLIENT_SECRET
+	// STSREST01 Server client secret file. Used for oauth2 client credentials flow.
+	,rest01clientsecretfile: process.env.REST01_CLIENT_SECRET_FILE
 	
 	// STS Instrument Manager Service endpoint
 	,imendpoint: (process.env.IM_ENDPOINT === undefined ? "http://localhost" : process.env.IM_ENDPOINT)
@@ -95,6 +103,10 @@ const defconfig =
 	,import: (process.env.IM_PORT === undefined ? "3001" : process.env.IM_PORT)
 	// STS Instrument Manager Service endpoint
 	,imapiroot: (process.env.IM_APIROOT === undefined ? "/stsinstrumentmanager/v1" : process.env.IM_APIROOT)
+	// Instrument Manager API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,imapiidentifier: process.env.IM_API_IDENTIFIER
+	//  Instrument Manager API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,imapiidentifierfile: process.env.IM_API_IDENTIFIER_FILE
 	// STS Instrument Manager Prometheus metric support
 	,imprometheussupport: (process.env.IM_PROM_SUPPORT === undefined ? true : (process.env.IM_PROM_SUPPORT === "true" ? true : false ))
 	// STS Instrument Manager Cluster Server port (port used for cluster prometheus scrapes)
@@ -103,14 +115,14 @@ const defconfig =
 	,imservicename: (process.env.IM_SERVICE_NAME === undefined ? "STSInstrumentManager" : process.env.IM_SERVICE_NAME)
 	// STS Instrument Manager Service Version
 	,imserviceversion: (process.env.IM_SERVICE_VERSION === undefined ? "1.0.0" : process.env.IM_SERVICE_VERSION)
-	// STS Instrument Manager Service Credentials
-	// ------------------------------------------
-	// STS Instrument Manager Service username email
-	,imemail: (process.env.IM_EMAIL === undefined ? "K6TestUser@sts" : process.env.IM_EMAIL)
-	// STS Instrument Manager Service username password
-	,impassword: (process.env.IM_PASSWORD === undefined ? "K6TestUserPassword" : process.env.IM_PASSWORD)
-	// STS Instrument Manager Service username password file
-	,impasswordfile: process.env.IM_PASSWORD_FILE
+	// STS Instrument Manager Server client ID. Used for oauth2 client credentials flow.
+	,imclientid: process.env.IM_CLIENT_ID
+	// STS Instrument Manager Server client ID file. Used for oauth2 client credentials flow.
+	,imclientidfile: process.env.IM_CLIENT_ID_FILE
+	// STS Instrument Manager Server client secret. Used for oauth2 client credentials flow.
+	,imclientsecret: process.env.IM_CLIENT_SECRET
+	// STS Instrument Manager Server client secret file. Used for oauth2 client credentials flow.
+	,imclientsecretfile: process.env.IM_CLIENT_SECRET_FILE
 
 	// STS Test Orchestrator Service endpoint
 	,toendpoint: (process.env.TO_ENDPOINT === undefined ? "http://localhost" : process.env.TO_ENDPOINT)
@@ -120,6 +132,10 @@ const defconfig =
 	,toport: (process.env.TO_PORT === undefined ? "3004" : process.env.TO_PORT)
 	// STS Test Orchestrator Service endpoint
 	,toapiroot: (process.env.TO_APIROOT === undefined ? "/ststestorchestrator/v1" : process.env.TO_APIROOT)
+	// Test Orchestrator API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,toapiidentifier: process.env.TO_API_IDENTIFIER
+	// Test Orchestrator API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,toapiidentifierfile: process.env.TO_API_IDENTIFIER_FILE
 	// STS Test Orchestrator Prometheus metric support
 	,toprometheussupport: (process.env.TO_PROM_SUPPORT === undefined ? true : (process.env.TO_PROM_SUPPORT === "true" ? true : false ))
 	// STS Test Orchestrator Cluster Server port (port used for cluster prometheus scrapes)
@@ -128,15 +144,19 @@ const defconfig =
 	,toservicename: (process.env.TO_SERVICE_NAME === undefined ? "STSTestOrchestrator" : process.env.TO_SERVICE_NAME)
 	// STS Test Orchestrator Service Version
 	,toserviceversion: (process.env.TO_SERVICE_VERSION === undefined ? "1.0.0" : process.env.TO_SERVICE_VERSION)
-	// STS Test Orchestrator Service Credentials
-	// ------------------------------------------
-	// STS Test Orchestrator Service username email
-	,toemail: (process.env.TO_EMAIL === undefined ? "K6TestUser@sts" : process.env.TO_EMAIL)
-	// STS Test Orchestrator Service username password
-	,topassword: (process.env.TO_PASSWORD === undefined ? "K6TestUserPassword" : process.env.TO_PASSWORD)
-	// STS Test Orchestrator Service username password file
-	,topasswordfile: process.env.TO_PASSWORD_FILE
+	// STS Test Orchestrator Server client ID. Used for oauth2 client credentials flow.
+	,toclientid: process.env.TO_CLIENT_ID
+	// STS Test Orchestrator Server client ID file. Used for oauth2 client credentials flow.
+	,toclientidfile: process.env.TO_CLIENT_ID_FILE
+	// STS Test Orchestrator Server client secret. Used for oauth2 client credentials flow.
+	,toclientsecret: process.env.TO_CLIENT_SECRET
+	// STS Test Orchestrator Server client secret file. Used for oauth2 client credentials flow.
+	,toclientsecretfile: process.env.TO_CLIENT_SECRET_FILE
 	
+	// STS Auth Server
+	// ---------------
+	// The auth server assumes the roles as an Identify Provider ([TODO]) and Token Server (OAuth2.0).
+	//
 	// Auth Server endpoint
 	,asendpoint: (process.env.AS_ENDPOINT === undefined ? "http://localhost" : process.env.AS_ENDPOINT)
 	// Auth Server host port (listen port for the service)
@@ -145,6 +165,10 @@ const defconfig =
 	,asport: (process.env.AS_PORT === undefined ? "3002" : process.env.AS_PORT)
 	// Auth Server endpoint
 	,asapiroot: (process.env.AS_APIROOT === undefined ? "/stsauth/v1" : process.env.AS_APIROOT)
+	// Auth Server API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,asapiidentifier: process.env.AS_API_IDENTIFIER
+	// Auth Server API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
+	,asapiidentifierfile: process.env.AS_API_IDENTIFIER_FILE
 	// Auth Server Prometheus metric support
 	,asprometheussupport: (process.env.AS_PROM_SUPPORT === undefined ? true : (process.env.AS_PROM_SUPPORT === "true" ? true : false ))
 	// Auth Prometheus Cluster Server port (port used for cluster prometheus scrapes)
@@ -153,19 +177,32 @@ const defconfig =
 	,asservicename: (process.env.AS_SERVICE_NAME === undefined ? "STSAuth" : process.env.AS_SERVICE_NAME)
 	// STSAuth Service Version
 	,asserviceversion: (process.env.AS_SERVICE_VERSION === undefined ? "1.0.0" : process.env.AS_SERVICE_VERSION)
-	// STS Auth Service Credentials
-	// ----------------------------
-	// Auth Server username email
-	,asemail: (process.env.AS_EMAIL === undefined ? "K6TestUser@sts" : process.env.AS_EMAIL)
-	// Auth Server username password
-	,aspassword: (process.env.AS_PASSWORD === undefined ? "K6TestUserPassword" : process.env.AS_PASSWORD)
-	// Auth Server username password file
-	,aspasswordfile: process.env.AS_PASSWORD_FILE
-	// Auth Server - Private Key (when using JWT)
+	// STS Auth Server client ID. Used for oauth2 client credentials flow.
+	,asclientid: process.env.AS_CLIENT_ID
+	// STS Auth Server client ID file. Used for oauth2 client credentials flow.
+	,asclientidfile: process.env.AS_CLIENT_ID_FILE
+	// STS Auth Server client secret. Used for oauth2 client credentials flow.
+	,asclientsecret: process.env.AS_CLIENT_SECRET
+	// STS Auth Server client secret file. Used for oauth2 client credentials flow.
+	,asclientsecretfile: process.env.AS_CLIENT_SECRET_FILE
+	// Auth Server - JWKS Public End Point.
+	,asjwksjsonpath: (process.env.AS_JWKS_JSON_PATH === undefined ? "/.well-known/jwks.json" : process.env.AS_JWKS_JSON_PATH)
+	// Auth Server - JWKS key rotation time (seconds).
+	,asjwkskeyrotationtime: (process.env.AS_JWKS_KEY_ROTATION_TIME === undefined ? 86400 : parseInt(process.env.AS_JWKS_KEY_ROTATION_TIME)) // 24 Hour default
+	// Auth Server - JWKS key purge time offset (seconds). Old keys (current keys are considered 'old' immediately after a key rotation) will be kept
+	// for asaccesstokenexpire + asjwkskeypurgetimeoffset seconds before purging from the JWKS.
+	,asjwkskeypurgetimeoffset: (process.env.AS_JWKS_KEY_PURGE_TIME_OFFSET === undefined ? 300 : parseInt(process.env.AS_JWKS_KEY_PURGE_TIME_OFFSET)) // 5 Minutes
+	// Auth Server - JWKS key count. Defines the number of active keys within the JWKS. Note that the actual key count may be double this value as current
+	// keys are rotated to old keys prior to old key purge. Old keys will be kept for asaccesstokenexpire + asjwkskeypurgetimeoffset seconds before removal from the JWKS.
+	// This is to ensure that any tokens signed by a current key that is then expired can still be validated within the life of the issued token.
+	,asjwkskeycount: (process.env.AS_JWKS_KEY_COUNT === undefined ? 4 : parseInt(process.env.AS_JWKS_KEY_COUNT))
+	// Auth Server - JWKS Access token timeout.
+	,asaccesstokenexpire: (process.env.AS_ACCESS_TOKEN_EXPIRE === undefined ? 43200 : parseInt(process.env.AS_ACCESS_TOKEN_EXPIRE)) // 12 Hour default
+	// Auth Server - [DEPRECATED] Private Key (when using JWT)
 	,asprivatekeypath: (process.env.AS_PRIVATE_KEY_PATH === undefined ? "/var/lib/sts/stsglobalresources/keys/private.key" : process.env.AS_PRIVATE_KEY_PATH)
-	// Auth Server - Public Key (when using JWT)
+	// Auth Server - [DEPRECATED] Public Key (when using JWT)
 	,aspublickeypath: (process.env.AS_PUBLIC_KEY_PATH === undefined ? "/var/lib/sts/stsglobalresources/keys/public.key" : process.env.AS_PUBLIC_KEY_PATH)
-
+	
 	// STS Test Runner Prometheus metric support
 	,trprometheussupport: (process.env.TR_PROM_SUPPORT === undefined ? true : (process.env.TR_PROM_SUPPORT === "true" ? true : false ))
 	// STS Test Runner Cluster Server port (port used for cluster prometheus scrapes)
@@ -174,14 +211,14 @@ const defconfig =
 	,trservicename: (process.env.TR_SERVICE_NAME === undefined ? "STSRestRunner" : process.env.TR_SERVICE_NAME)
 	// STS Test Runner Service Version
 	,trserviceversion: (process.env.TR_SERVICE_VERSION === undefined ? "1.0.0" : process.env.TR_SERVICE_VERSION)
-	// STS Test Runner Credentials
-	// ----------------------------
-	// STS Test Runner username email
-	,tremail: (process.env.TR_EMAIL === undefined ? "K6TestUser@sts" : process.env.TR_EMAIL)
-	// STS Test Runner password
-	,trpassword: (process.env.TR_PASSWORD === undefined ? "K6TestUserPassword" : process.env.TR_PASSWORD)
-	// STS Test Runner password file
-	,trpasswordfile: process.env.TR_PASSWORD_FILE
+	// STS Test Runner Server client ID. Used for oauth2 client credentials flow.
+	,trclientid: process.env.TR_CLIENT_ID
+	// STS Test Runner Server client ID file. Used for oauth2 client credentials flow.
+	,trclientidfile: process.env.TR_CLIENT_ID_FILE
+	// STS Test Runner Server client secret. Used for oauth2 client credentials flow.
+	,trclientsecret: process.env.TR_CLIENT_SECRET
+	// STS Test Runner Server client secret file. Used for oauth2 client credentials flow.
+	,trclientsecretfile: process.env.TR_CLIENT_SECRET_FILE
 
 	// Duration (in ms) between each publish event.
 	,publishinterval: (process.env.PUBLISH_INTERVAL === undefined ? 1000 : parseInt(process.env.PUBLISH_INTERVAL))
@@ -194,7 +231,7 @@ const defconfig =
 	,publishdebug: (process.env.PUBLISH_DEBUG === undefined ? false : (process.env.PUBLISH_DEBUG === "true" ? true : false ))
 
 	// Transport(s) to use for sending instrumentation data to the instrumentation server
-	,transport: (process.env.TRANSPORT === undefined ? 0 : process.env.TRANSPORT)
+	,transport: (process.env.TRANSPORT === undefined ? 'RESTAPI' : process.env.TRANSPORT)
 
 	/*
 	// Instrument Defaults
@@ -215,31 +252,31 @@ const defconfig =
 	// This setting will be ignore for production mode. In production mode services will always use secure cookies.
 	,useSecureCookies: (process.env.USE_SECURE_COOKIES === undefined ? false : (process.env.USE_SECURE_COOKIES === "true" ? true : false ))
 
-	,keepAlive: (process.env.KEEP_ALIVE === undefined ? true : (process.env.KEEP_ALIVE === "true" ? true : false ))
-	// Reference: https://nodejs.org/api/http.html#class-httpagent
 	// keepAlive <boolean> Keep sockets around even when there are no outstanding requests, so they can be used for future requests without having to reestablish a 
 	// TCP connection. Not to be confused with the keep-alive value of the Connection header. The Connection: keep-alive header is always sent when using an agent
 	// except when the Connection header is explicitly specified or when the keepAlive and maxSockets options are respectively set to false and Infinity, in which
 	// case Connection: close will be used. Default: false.
-
-	,maxSockets: (process.env.MAX_SOCKETS === undefined ? 10 : parseInt(process.env.MAX_SOCKETS))
 	// Reference: https://nodejs.org/api/http.html#class-httpagent
+	,keepAlive: (process.env.KEEP_ALIVE === undefined ? true : (process.env.KEEP_ALIVE === "true" ? true : false ))
+
 	// maxSockets <number> Maximum number of sockets to allow per host. If the same host opens multiple concurrent connections, each request will use new socket until the
 	// maxSockets value is reached. If the host attempts to open more connections than maxSockets, the additional requests will enter into a pending request queue, and will
 	// enter active connection state when an existing connection terminates. This makes sure there are at most maxSockets active connections at any point in time, 
 	// from a given host. Default: Infinity.	
-
-	,maxTotalSockets: (process.env.MAX_TOTAL_SOCKETS === undefined ? 20 : parseInt(process.env.MAX_TOTAL_SOCKETS))
 	// Reference: https://nodejs.org/api/http.html#class-httpagent
-	// maxTotalSockets <number> Maximum number of sockets allowed for all hosts in total. Each request will use a new socket until the maximum is reached. Default: Infinity.
+	,maxSockets: (process.env.MAX_SOCKETS === undefined ? 10 : parseInt(process.env.MAX_SOCKETS))
 
-	,maxFreeSockets: (process.env.MAX_FREE_SOCKETS === undefined ? 256 : parseInt(process.env.MAX_FREE_SOCKETS))
+	// maxTotalSockets <number> Maximum number of sockets allowed for all hosts in total. Each request will use a new socket until the maximum is reached. Default: Infinity.
 	// Reference: https://nodejs.org/api/http.html#class-httpagent
-	// maxFreeSockets <number> Maximum number of sockets per host to leave open in a free state. Only relevant if keepAlive is set to true. Default: 256.
+	,maxTotalSockets: (process.env.MAX_TOTAL_SOCKETS === undefined ? 20 : parseInt(process.env.MAX_TOTAL_SOCKETS))
 
-	,timeout: (process.env.TIMEOUT === undefined ? 10000 : parseInt(process.env.TIMEOUT))
+	// maxFreeSockets <number> Maximum number of sockets per host to leave open in a free state. Only relevant if keepAlive is set to true. Default: 256.
 	// Reference: https://nodejs.org/api/http.html#class-httpagent
+	,maxFreeSockets: (process.env.MAX_FREE_SOCKETS === undefined ? 256 : parseInt(process.env.MAX_FREE_SOCKETS))
+
 	// timeout <number> Socket timeout in milliseconds. This will set the timeout when the socket is created.
+	// Reference: https://nodejs.org/api/http.html#class-httpagent
+	,timeout: (process.env.TIMEOUT === undefined ? 10000 : parseInt(process.env.TIMEOUT))
 
 	// Maximum payload size allowed for express server calls
 	,maxPayloadSize: (process.env.MAX_PAYLOAD_SIZE === undefined ? '50mb' : process.env.MAX_PAYLOAD_SIZE)
@@ -288,7 +325,7 @@ const defconfig =
 	*/
 }
 
-const ReadPasswordFile = (passwordFile) => {
+const ReadFile = (passwordFile) => {
 	try {
 		accessSync(passwordFile, constants.R_OK);
 		const data = readFileSync(passwordFile, 'utf8');
@@ -300,35 +337,33 @@ const ReadPasswordFile = (passwordFile) => {
 	}
 }
 
-// Database password file
-if (defconfig.dbpasswordfile !== undefined) {
-	defconfig.dbpassword = ReadPasswordFile(defconfig.dbpasswordfile);
-}
-
-// Auth Server username password file
-if (defconfig.aspasswordfile !== undefined) {
-	defconfig.aspassword = ReadPasswordFile(defconfig.aspasswordfile);
-}
-
-// STSREST01 Server username password file
-if (defconfig.rest01passwordfile !== undefined) {
-	defconfig.rest01password = ReadPasswordFile(defconfig.rest01passwordfile);
-}
-
-// STS Test Runner password file
-if (defconfig.trpasswordfile !== undefined) {
-	defconfig.trpassword = ReadPasswordFile(defconfig.trpasswordfile);
-}
-
-// STS Test Orchestrator Service username password file
-if (defconfig.topasswordfile !== undefined) {
-	defconfig.topassword = ReadPasswordFile(defconfig.topasswordfile);
-}
-
-// STS Instrument Manager Service username password file
-if (defconfig.impasswordfile !== undefined) {
-	defconfig.impassword = ReadPasswordFile(defconfig.impasswordfile);
-}
+// File based configuration settings. If a file is specified for a setting, this will be used. The non file version (if specified) will be ignored.
+const fileconfig = [
+	{ fileprop: 'dbpasswordfile', prop: 'dbpassword' },
+	// API identifier file processing
+	{ fileprop: 'asapiidentifierfile', prop: 'asapiidentifier' },
+	{ fileprop: 'rest01apiidentifierfile', prop: 'rest01apiidentifier' },
+	{ fileprop: 'toapiidentifierfile', prop: 'toapiidentifier' },
+	{ fileprop: 'imapiidentifierfile', prop: 'imapiidentifier' },
+	// Client ID file processing
+	{ fileprop: 'asclientidfile', prop: 'asclientid' },
+	{ fileprop: 'rest01clientidfile', prop: 'rest01clientid' },
+	{ fileprop: 'toclientidfile', prop: 'toclientid' },
+	{ fileprop: 'imclientidfile', prop: 'imclientid' },
+	{ fileprop: 'trclientidfile', prop: 'trclientid' },
+	// Client secret file processing
+	{ fileprop: 'asclientsecretfile', prop: 'asclientsecret' },
+	{ fileprop: 'rest01clientsecretfile', prop: 'rest01clientsecret' },
+	{ fileprop: 'toclientsecretfile', prop: 'toclientsecret' },
+	{ fileprop: 'imclientsecretfile', prop: 'imclientsecret' },
+	{ fileprop: 'trclientsecretfile', prop: 'trclientsecret' },
+]
+
+fileconfig.forEach((v) => {
+	if (defconfig[v.fileprop] !== undefined) {
+		defconfig[v.prop] = ReadFile(defconfig[v.fileprop]);
+	}
+});
 
 // Preference order is YAML file then .env file
 const $options = {

package/testapiidentifierFile

@@ -0,0 +1 @@
+testapiidentifierfilecontents

package/testclientidfile

@@ -0,0 +1 @@
+testclientidfilecontents

package/testclientsecretfile

@@ -0,0 +1 @@
+testclientsecretfilecontents

package/testpasswordfile

@@ -0,0 +1 @@
+testfilepassword

package/stsconfig.test.js

@@ -1,85 +0,0 @@
-
-describe("Test", () =>
-{
-	beforeAll(async () => 
-	{
-
-	});
-    
-	afterAll(async () =>
-	{
-
-	});
-
-	test('Checking default config items', async () => 
-	{
-		expect.assertions(21);
-
-		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
-		let goptions = require('./stsconfig.js').$options;
-
-		expect(goptions.isProduction).toEqual(false);
-		expect(goptions.consoleLogErrors).toEqual(false);
-		expect(goptions.dbuser).toEqual('postgres');
-		expect(goptions.dbpassword).toEqual('password');
-		expect(goptions.dbpasswordfile).toEqual(undefined);
-		expect(goptions.dbhost).toEqual('localhost');
-		expect(goptions.dbport).toEqual('5432');
-		expect(goptions.database).toEqual('stsrestmsdb01');
-		expect(goptions.databaseUrl).toEqual(undefined);
-		expect(goptions.databasescriptfolder).toEqual('/var/lib/sts/stsglobalresources/db-scripts');
-
-		expect(goptions.poolSize).toEqual(500);
-		expect(goptions.useCPUs).toEqual(-1);
-		expect(goptions.respawnOnFail).toEqual(false);
-		expect(goptions.defaultDatabaseEntries).toEqual(10000);
-		expect(goptions.useRedis).toEqual(false);
-		expect(goptions.endFlush).toEqual(false);
-		expect(goptions.redisPort).toEqual('6379');
-		expect(goptions.redisServer).toEqual('localhost');
-		expect(goptions.k6ScriptPath).toEqual('.');
-		expect(goptions.defaultDatabaseMinExtraDataSize).toEqual(0);
-		expect(goptions.defaultDatabaseMaxExtraDataSize).toEqual(2000);
-	});
-
-	test('Checking default rest01 service config', async () => 
-	{
-		expect.assertions(11);
-
-		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
-		let goptions = require('./stsconfig.js').$options;
-
-		expect(goptions.rest01endpoint).toEqual('http://localhost');
-		expect(goptions.rest01hostport).toEqual('3003');
-		expect(goptions.rest01port).toEqual('3003');
-		expect(goptions.rest01apiroot).toEqual('/stsrest01/v1');
-		expect(goptions.rest01prometheussupport).toEqual(true);
-		expect(goptions.rest01prometheusclusterport).toEqual('3013');
-		expect(goptions.rest01servicename).toEqual('STSRest01');
-		expect(goptions.rest01serviceversion).toEqual('1.0.0');
-		expect(goptions.rest01email).toEqual('K6TestUser@sts');
-		expect(goptions.rest01password).toEqual('K6TestUserPassword');
-		expect(goptions.rest01passwordfile).toEqual(undefined);
-	});
-
-	test('Checking default instrument manager service config', async () => 
-	{
-		expect.assertions(11);
-
-		process.env.STSENVFILE = './.env-test-file-1'; // Empty environment file
-		let goptions = require('./stsconfig.js').$options;
-
-		expect(goptions.imendpoint).toEqual('http://localhost');
-		expect(goptions.imhostport).toEqual('3001');
-		expect(goptions.import).toEqual('3001');
-		expect(goptions.imapiroot).toEqual('/stsinstrumentmanager/v1');
-		expect(goptions.imprometheussupport).toEqual(true);
-		expect(goptions.imprometheusclusterport).toEqual('3011');
-		expect(goptions.imservicename).toEqual('STSInstrumentManager');
-		expect(goptions.imserviceversion).toEqual('1.0.0');
-		expect(goptions.imemail).toEqual('K6TestUser@sts');
-		expect(goptions.impassword).toEqual('K6TestUserPassword');
-		expect(goptions.impasswordfile).toEqual(undefined);
-	});
-});
-