4.0.0

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/qenv",
-  "version": "3.0.3",
+  "version": "4.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/qenv",
-  "version": "3.0.3",
+  "version": "4.0.0",
   "private": false,
   "description": "easy promised environments",
   "main": "dist/index.js",

test/test.ts

@@ -4,28 +4,30 @@ import * as qenv from '../ts/index';
 
 process.env['key1'] = 'original';
 
-let qenvTestObject: qenv.Qenv;
+let testQenv: qenv.Qenv;
 
 tap.test('should create a new class', async () => {
-  qenvTestObject = new qenv.Qenv(
+  testQenv = new qenv.Qenv(
     path.join(__dirname, 'assets'),
     path.join(__dirname, 'assets'),
     false
   );
-  expect(qenvTestObject).to.be.instanceof(qenv.Qenv);
+  expect(testQenv).to.be.instanceof(qenv.Qenv);
 });
 
 tap.test('key1 should be not be overwritten since it is already present', async () => {
-  expect(process.env.key1).to.equal('original');
+  expect(testQenv.getEnvVarRequired('key1')).to.equal('original');
+  expect(testQenv.getEnvVarOnDemand('key1')).to.equal('original');
 });
 
 tap.test('key2 should be read from Yml', async () => {
-  expect(process.env.key2).to.equal('fromYml');
+  expect(testQenv.getEnvVarRequired('key2')).to.equal('fromYml');
+  expect(testQenv.getEnvVarOnDemand('key2')).to.equal('fromYml');
 });
 
 tap.test('keyValueObjectArray should hold all retrieved values', async () => {
-  expect(qenvTestObject.keyValueObjectArray[0].value).to.equal('original');
+  expect(testQenv.keyValueObject.key1).to.equal('original');
-  expect(qenvTestObject.keyValueObjectArray[1].value).to.equal('fromYml');
+  expect(testQenv.keyValueObject.key2).to.equal('fromYml');
 });
 
 tap.start();

ts/qenv.classes.qenv.ts

@@ -1,9 +1,5 @@
 import * as plugins from './qenv.plugins';
-
+plugins.smartlog.defaultLogger.enableConsole();
-export interface IKeyValueObject {
-  key: string;
-  value: string;
-}
 
 /**
  * class Qenv
@@ -13,7 +9,7 @@ export class Qenv {
   public requiredEnvVars: string[] = [];
   public availableEnvVars: string[] = [];
   public missingEnvVars: string[] = [];
-  public keyValueObjectArray: IKeyValueObject[] = [];
+  public keyValueObject: {[key: string]: any } = {};
   public logger: plugins.smartlog.Smartlog;
 
   // filePaths
@@ -61,7 +57,7 @@ export class Qenv {
    * @param envVarName
    */
   public getEnvVarRequired(envVarName): string {
-    return process.env[envVarName];
+    return this.keyValueObject[envVarName];
   }
 
   /**
@@ -74,7 +70,6 @@ export class Qenv {
     try {
       envYml = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
     } catch (err) {
-      console.log("env file couldn't be found at " + this.envFilePathAbsolute);
       envYml = {};
     }
     let envVar: string;
@@ -98,7 +93,7 @@ export class Qenv {
     if (
       plugins.smartfile.fs.isDirectory('/run') &&
       plugins.smartfile.fs.isDirectory('/run/secrets') &&
-      plugins.smartfile.fs.fileExists(`/run/secrets/${requiredEnvVar}`)
+      plugins.smartfile.fs.fileExistsSync(`/run/secrets/${requiredEnvVar}`)
     ) {
       dockerSecret = plugins.smartfile.fs.toStringSync(`/run/secrets/${requiredEnvVar}`);
     }
@@ -106,11 +101,15 @@ export class Qenv {
     // docker secret.json
     if (
       plugins.smartfile.fs.isDirectory('/run') &&
-      plugins.smartfile.fs.isDirectory('/run/secrets') &&
+      plugins.smartfile.fs.isDirectory('/run/secrets')
-      plugins.smartfile.fs.fileExists(`/run/secrets/secret.json`)
     ) {
-      const secretObject = plugins.smartfile.fs.toObjectSync('/run/secrets/secret.json');
+      const availableSecrets = plugins.smartfile.fs.listAllItemsSync('/run/secrets');
-      dockerSecret = secretObject[requiredEnvVar];
+      for (const secret of availableSecrets) {
+        if (secret.includes('secret.json') && !dockerSecret) {
+          const secretObject = plugins.smartfile.fs.toObjectSync(`/run/secrets/${secret}`);
+          dockerSecret = secretObject[requiredEnvVar];
+        }
+      }
     }
 
     // warn if there is more than one candidate
@@ -129,12 +128,16 @@ export class Qenv {
 
     let chosenVar: string = null;
     if (envVar) {
+      this.logger.log('ok', `found ${requiredEnvVar} as environment variable`);
       chosenVar = envVar;
     } else if (envFileVar) {
+      this.logger.log('ok', `found ${requiredEnvVar} as env.yml variable`);
       chosenVar = envFileVar;
     } else if (dockerSecret) {
+      this.logger.log('ok', `found ${requiredEnvVar} as docker secret`);
       chosenVar = dockerSecret;
     } else if (dockerSecretJson) {
+      this.logger.log('ok', `found ${requiredEnvVar} as docker secret.json`);
       chosenVar = dockerSecretJson;
     }
     return chosenVar;
@@ -165,14 +168,10 @@ export class Qenv {
       const chosenVar = this.getEnvVarOnDemand(requiredEnvVar);
       if (chosenVar) {
         this.availableEnvVars.push(requiredEnvVar);
-        process.env[requiredEnvVar] = chosenVar;
+        this.keyValueObject[requiredEnvVar] = chosenVar;
-        this.keyValueObjectArray.push({
-          key: requiredEnvVar,
-          value: chosenVar
-        });
       }
     }
-  };
+  }
 
   /**
    * gets missing env vars