4.0.5

.gitlab-ci.yml

@@ -38,23 +38,23 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install lts
+  - npmci node install stable
   - npmci npm install
   - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
-  - notpriv
+  - priv
 
 testBuild:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install lts
+  - npmci node install stable
   - npmci npm install
   - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
@@ -65,7 +65,7 @@ testBuild:
 release:
   stage: release
   script:
-  - npmci node install lts
+  - npmci node install stable
   - npmci npm publish
   only:
   - tags
@@ -100,7 +100,7 @@ trigger:
 pages:
   image: hosttoday/ht-docker-dbase:npmci
   services:
-   - docker:18-dind
+   - docker:stable-dind
   stage: metadata
   script:
     - npmci command npm install -g @gitzone/tsdoc

README.md

@@ -38,6 +38,6 @@ const myQenv = new Qenv('path/to/dir/where/qenv.yml/is/', 'path/to/dir/where/env
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

package-lock.json

@@ -1,19 +1,9 @@
 {
   "name": "@pushrocks/qenv",
-  "version": "4.0.1",
+  "version": "4.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@airbnb/node-memwatch": {
-      "version": "1.0.2",
-      "resolved": "https://verdaccio.lossless.one/@airbnb%2fnode-memwatch/-/node-memwatch-1.0.2.tgz",
-      "integrity": "sha512-2R+MEEMSTUdKwQ6NFWkyA/UNoSjL1tMldZqJbZpgXSwNMBzlNlkUWEXKu9RqTTMkDqJRfGJ2VDs8gPlPK2APDQ==",
-      "dev": true,
-      "requires": {
-        "bindings": "^1.3.0",
-        "nan": "^2.9.2"
-      }
-    },
     "@babel/code-frame": {
       "version": "7.5.5",
       "resolved": "https://verdaccio.lossless.one/@babel%2fcode-frame/-/code-frame-7.5.5.tgz",
@@ -35,9 +25,9 @@
       }
     },
     "@gitzone/tsbuild": {
-      "version": "2.1.11",
+      "version": "2.1.17",
-      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.11.tgz",
+      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.17.tgz",
-      "integrity": "sha512-Sa90/S7rkfFaTa2yeASHVAWIl3hNh9DBqVcQbOCaNhqKUGdD+NzPw1MESuMOXqKG7oM5i4Cu6qfcJB0fmAjS8g==",
+      "integrity": "sha512-Mg2cu7cW3cC6L2tzatB8t6OMVgTGatobb8UkN+y3n7KAWRld4gXcVWmaehch/wSFrbmk6Oe8rPjdWPjhTSIF1Q==",
       "dev": true,
       "requires": {
         "@pushrocks/smartcli": "^3.0.7",
@@ -45,7 +35,7 @@
         "@pushrocks/smartlog": "^2.0.19",
         "@pushrocks/smartpath": "^4.0.1",
         "@pushrocks/smartpromise": "^3.0.2",
-        "typescript": "^3.4.5"
+        "typescript": "^3.5.2"
       }
     },
     "@gitzone/tsrun": {
@@ -360,37 +350,36 @@
       }
     },
     "@pushrocks/tapbundle": {
-      "version": "3.0.11",
+      "version": "3.0.13",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.0.11.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.0.13.tgz",
-      "integrity": "sha512-s7epZfJZX+LsBVmIYvoaY4WtgPvRLnHZMVTpQAPJGMBqxJAQxhQ2wvGJjmqMAGhhznAHI6t4g+m0KTp3vFIRVg==",
+      "integrity": "sha512-23O4UMBafCuD+RnUlXNvtT9DGbL1HMD+xZE1Zcr7Ll7WvgxUgRQQfk9kq6qbLLbjaRe1J2Ijsgh1HuZbBaucLQ==",
       "dev": true,
       "requires": {
         "@pushrocks/early": "^3.0.3",
         "@pushrocks/smartdelay": "^2.0.3",
         "@pushrocks/smartpromise": "^3.0.2",
-        "leakage": "^0.4.0",
         "smartchai": "^2.0.1"
       }
     },
     "@types/chai": {
-      "version": "4.1.7",
+      "version": "4.2.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.1.7.tgz",
+      "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.0.tgz",
-      "integrity": "sha512-2Y8uPt0/jwjhQ6EiluT0XCri1Dbplr0ZxfFXUz+ye13gaqE8u5gL5ppao1JrUYr9cIip5S6MvQzBS7Kke7U9VA==",
+      "integrity": "sha512-zw8UvoBEImn392tLjxoavuonblX/4Yb9ha4KBU10FirCfwgzhKO0dvyJSF9ByxV1xK1r2AgnAi/tvQaLgxQqxA==",
       "dev": true
     },
     "@types/chai-as-promised": {
-      "version": "7.1.1",
+      "version": "7.1.2",
-      "resolved": "https://verdaccio.lossless.one/@types%2fchai-as-promised/-/chai-as-promised-7.1.1.tgz",
+      "resolved": "https://verdaccio.lossless.one/@types%2fchai-as-promised/-/chai-as-promised-7.1.2.tgz",
-      "integrity": "sha512-dberBxQW/XWv6BMj0su1lV9/C9AUx5Hqu2pisuS6S4YK/Qt6vurcj/BmcbEsobIWWCQzhesNY8k73kIxx4X7Mg==",
+      "integrity": "sha512-PO2gcfR3Oxa+u0QvECLe1xKXOqYTzCmWf0FhLhjREoW3fPAVamjihL7v1MOVLJLsnAMdLcjkfrs01yvDMwVK4Q==",
       "dev": true,
       "requires": {
         "@types/chai": "*"
       }
     },
     "@types/chai-string": {
-      "version": "1.4.1",
+      "version": "1.4.2",
-      "resolved": "https://verdaccio.lossless.one/@types%2fchai-string/-/chai-string-1.4.1.tgz",
+      "resolved": "https://verdaccio.lossless.one/@types%2fchai-string/-/chai-string-1.4.2.tgz",
-      "integrity": "sha512-aRNMs6TKgjgPlCHwDfq/YNy5VtRR2hJ4AUWByddrT0TRVVD8eX4MiHW6/iHvmQHRlVuuPZcwnTUE7b4yFt7bEA==",
+      "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==",
       "dev": true,
       "requires": {
         "@types/chai": "*"
@@ -436,9 +425,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.6.9",
+      "version": "12.7.5",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.6.9.tgz",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.7.5.tgz",
-      "integrity": "sha512-+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw=="
+      "integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="
     },
     "@types/vinyl": {
       "version": "2.0.2",
@@ -511,15 +500,6 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://verdaccio.lossless.one/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -763,12 +743,6 @@
         "once": "^1.4.0"
       }
     },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://verdaccio.lossless.one/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
-    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://verdaccio.lossless.one/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -810,12 +784,6 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true
-    },
     "find-up": {
       "version": "3.0.0",
       "resolved": "https://verdaccio.lossless.one/find-up/-/find-up-3.0.0.tgz",
@@ -971,25 +939,6 @@
         "invert-kv": "^2.0.0"
       }
     },
-    "leakage": {
-      "version": "0.4.0",
-      "resolved": "https://verdaccio.lossless.one/leakage/-/leakage-0.4.0.tgz",
-      "integrity": "sha512-x7gYK5n5dPkHDZWJ2Kh8Ag1hZNzUh+HtXn8Bv1aDdN6o6ONPCJ8sOfFq+kxcULJFp3lXaCjXb3iXOLmQRbBLwA==",
-      "dev": true,
-      "requires": {
-        "@airbnb/node-memwatch": "^1.0.2",
-        "es6-error": "^4.0.2",
-        "left-pad": "^1.1.3",
-        "minimist": "^1.2.0",
-        "pretty-bytes": "^4.0.2"
-      }
-    },
-    "left-pad": {
-      "version": "1.3.0",
-      "resolved": "https://verdaccio.lossless.one/left-pad/-/left-pad-1.3.0.tgz",
-      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
-      "dev": true
-    },
     "locate-path": {
       "version": "3.0.0",
       "resolved": "https://verdaccio.lossless.one/locate-path/-/locate-path-3.0.0.tgz",
@@ -1069,9 +1018,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
+      "version": "0.0.8",
-      "resolved": "https://verdaccio.lossless.one/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
     "mkdirp": {
@@ -1081,14 +1030,6 @@
       "dev": true,
       "requires": {
         "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://verdaccio.lossless.one/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
       }
     },
     "moment": {
@@ -1106,12 +1047,6 @@
         "moment": ">= 2.9.0"
       }
     },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://verdaccio.lossless.one/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true
-    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://verdaccio.lossless.one/nice-try/-/nice-try-1.0.5.tgz",
@@ -1219,9 +1154,9 @@
       "dev": true
     },
     "p-limit": {
-      "version": "2.2.0",
+      "version": "2.2.1",
-      "resolved": "https://verdaccio.lossless.one/p-limit/-/p-limit-2.2.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/p-limit/-/p-limit-2.2.1.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
       "dev": true,
       "requires": {
         "p-try": "^2.0.0"
@@ -1276,12 +1211,6 @@
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
-    "pretty-bytes": {
-      "version": "4.0.2",
-      "resolved": "https://verdaccio.lossless.one/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
-      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
-      "dev": true
-    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -1367,9 +1296,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "semver": {
-      "version": "5.7.0",
+      "version": "5.7.1",
-      "resolved": "https://verdaccio.lossless.one/semver/-/semver-5.7.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true
     },
     "set-blocking": {
@@ -1527,16 +1456,16 @@
       "dev": true
     },
     "tslint": {
-      "version": "5.18.0",
+      "version": "5.20.0",
-      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.18.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.20.0.tgz",
-      "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==",
+      "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
         "chalk": "^2.3.0",
         "commander": "^2.12.1",
-        "diff": "^3.2.0",
+        "diff": "^4.0.1",
         "glob": "^7.1.1",
         "js-yaml": "^3.13.1",
         "minimatch": "^3.0.4",
@@ -1545,14 +1474,6 @@
         "semver": "^5.3.0",
         "tslib": "^1.8.0",
         "tsutils": "^2.29.0"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "3.5.0",
-          "resolved": "https://verdaccio.lossless.one/diff/-/diff-3.5.0.tgz",
-          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-          "dev": true
-        }
       }
     },
     "tslint-config-prettier": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/qenv",
-  "version": "4.0.1",
+  "version": "4.0.5",
   "private": false,
   "description": "easy promised environments",
   "main": "dist/index.js",
@@ -25,12 +25,12 @@
   },
   "homepage": "https://gitlab.com/pushrocks/qenv#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.17",
     "@gitzone/tsrun": "^1.2.8",
     "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.11",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.6.9",
+    "@types/node": "^12.7.5",
-    "tslint": "^5.18.0",
+    "tslint": "^5.20.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {

test/assets/env.json

@@ -0,0 +1,4 @@
+{
+  "key1": "fromJson",
+  "key2" :"fromJson"
+}

test/assets/env.yml

@@ -1,2 +0,0 @@
-key1: fromYml
-key2: fromYml

test/test.ts

@@ -17,13 +17,13 @@ tap.test('key1 should be not be overwritten since it is already present', async
 });
 
 tap.test('key2 should be read from Yml', async () => {
-  expect(testQenv.getEnvVarRequired('key2')).to.equal('fromYml');
+  expect(testQenv.getEnvVarRequired('key2')).to.equal('fromJson');
-  expect(testQenv.getEnvVarOnDemand('key2')).to.equal('fromYml');
+  expect(testQenv.getEnvVarOnDemand('key2')).to.equal('fromJson');
 });
 
 tap.test('keyValueObjectArray should hold all retrieved values', async () => {
   expect(testQenv.keyValueObject.key1).to.equal('original');
-  expect(testQenv.keyValueObject.key2).to.equal('fromYml');
+  expect(testQenv.keyValueObject.key2).to.equal('fromJson');
 });
 
 tap.start();

ts/qenv.classes.qenv.ts

@@ -31,7 +31,7 @@ export class Qenv {
     );
     this.envFilePathAbsolute = plugins.path.join(
       plugins.path.resolve(envFileBasePathArg),
-      'env.yml'
+      'env.json'
     );
 
     this.getRequiredEnvVars();
@@ -46,8 +46,10 @@ export class Qenv {
       console.error('However some Env variables could not be resolved:');
       console.log(this.missingEnvVars);
       if (failOnMissing) {
-        console.error('Exiting!');
+        this.logger.log('error', 'Exiting!');
         process.exit(1);
+      } else {
+        this.logger.log('warn', 'qenv is not set to fail on missing environment variables');
       }
     }
   }
@@ -62,40 +64,39 @@ export class Qenv {
 
   /**
    * tries to get any env var even if it is not required
-   * @param requiredEnvVar
+   * @param wantedEnvVar
    */
-  public getEnvVarOnDemand(requiredEnvVar: string): string {
+  public getEnvVarOnDemand(wantedEnvVar: string): string {
-    // lets determine the actual env yml
+    let envVarFromEnvironmentVariable: string;
-    let envYml;
+    let envVarFromEnvJsonFile: string;
-    try {
+    let envVarFromDockerSecret: string;
-      envYml = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
-    } catch (err) {
-      envYml = {};
-    }
-    let envVar: string;
-    let envFileVar: string;
-    let dockerSecret: string;
     let dockerSecretJson: string;
 
     // env var check
-    if (process.env[requiredEnvVar]) {
+    if (process.env[wantedEnvVar]) {
-      this.availableEnvVars.push(requiredEnvVar);
+      this.availableEnvVars.push(wantedEnvVar);
-      envVar = process.env[requiredEnvVar];
+      envVarFromEnvironmentVariable = process.env[wantedEnvVar];
     }
 
     // env file check
-    if (envYml.hasOwnProperty(requiredEnvVar)) {
+    // lets determine the actual env yml
-      envFileVar = envYml[requiredEnvVar];
+    let envJsonFileAsObject;
-      this.availableEnvVars.push(requiredEnvVar);
+    try {
+      envJsonFileAsObject = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
+    } catch (err) {
+      envJsonFileAsObject = {};
+    }
+    if (envJsonFileAsObject.hasOwnProperty(wantedEnvVar)) {
+      envVarFromEnvJsonFile = envJsonFileAsObject[wantedEnvVar];
     }
 
     // docker secret check
     if (
       plugins.smartfile.fs.isDirectory('/run') &&
       plugins.smartfile.fs.isDirectory('/run/secrets') &&
-      plugins.smartfile.fs.fileExistsSync(`/run/secrets/${requiredEnvVar}`)
+      plugins.smartfile.fs.fileExistsSync(`/run/secrets/${wantedEnvVar}`)
     ) {
-      dockerSecret = plugins.smartfile.fs.toStringSync(`/run/secrets/${requiredEnvVar}`);
+      envVarFromDockerSecret = plugins.smartfile.fs.toStringSync(`/run/secrets/${wantedEnvVar}`);
     }
 
     // docker secret.json
@@ -105,42 +106,53 @@ export class Qenv {
     ) {
       const availableSecrets = plugins.smartfile.fs.listAllItemsSync('/run/secrets');
       for (const secret of availableSecrets) {
-        if (secret.includes('secret.json') && !dockerSecret) {
+        if (secret.includes('secret.json') && !envVarFromDockerSecret) {
           const secretObject = plugins.smartfile.fs.toObjectSync(`/run/secrets/${secret}`);
-          dockerSecret = secretObject[requiredEnvVar];
+          envVarFromDockerSecret = secretObject[wantedEnvVar];
         }
       }
     }
 
     // warn if there is more than one candidate
-    let candidatesCounter = 0;
+    const availableCcandidates: any[] = [];
-    [envVar, envFileVar, dockerSecret, dockerSecretJson].forEach(candidate => {
+    [
+      envVarFromEnvironmentVariable,
+      envVarFromEnvJsonFile,
+      envVarFromDockerSecret,
+      dockerSecretJson
+    ].forEach(candidate => {
       if (candidate) {
-        candidatesCounter++;
+        availableCcandidates.push(candidate);
       }
     });
-    if (candidatesCounter > 1) {
+    if (availableCcandidates.length > 1) {
       this.logger.log(
         'warn',
-        `found multiple candidates for ${requiredEnvVar} Choosing in the order of envVar, envFileVar, dockerSecret, dockerSecretJson`
+        `found multiple candidates for ${wantedEnvVar} Choosing in the order of envVar, envFileVar, dockerSecret, dockerSecretJson`
       );
+      console.log(availableCcandidates);
     }
 
-    let chosenVar: string = null;
+    switch (true) {
-    if (envVar) {
+      case !!envVarFromEnvironmentVariable:
-      this.logger.log('ok', `found ${requiredEnvVar} as environment variable`);
+        this.logger.log('ok', `found ${wantedEnvVar} as environment variable`);
-      chosenVar = envVar;
+        return envVarFromEnvironmentVariable;
-    } else if (envFileVar) {
+      case !!envVarFromEnvJsonFile:
-      this.logger.log('ok', `found ${requiredEnvVar} as env.yml variable`);
+        this.logger.log('ok', `found ${wantedEnvVar} as env.json variable`);
-      chosenVar = envFileVar;
+        return envVarFromEnvJsonFile;
-    } else if (dockerSecret) {
+      case !!envVarFromDockerSecret:
-      this.logger.log('ok', `found ${requiredEnvVar} as docker secret`);
+        this.logger.log('ok', `found ${wantedEnvVar} as docker secret`);
-      chosenVar = dockerSecret;
+        return envVarFromDockerSecret;
-    } else if (dockerSecretJson) {
+      case !!dockerSecretJson:
-      this.logger.log('ok', `found ${requiredEnvVar} as docker secret.json`);
+        this.logger.log('ok', `found ${wantedEnvVar} as docker secret.json`);
-      chosenVar = dockerSecretJson;
+        return dockerSecretJson;
+      default:
+        this.logger.log(
+          'warn',
+          `could not find the wanted environment variable ${wantedEnvVar} anywhere`
+        );
+        return;
     }
-    return chosenVar;
   }
 
   /**
@@ -152,7 +164,10 @@ export class Qenv {
       qenvFile = plugins.smartfile.fs.toObjectSync(this.qenvFilePathAbsolute);
     }
     if (!qenvFile || !qenvFile.required || !Array.isArray(qenvFile.required)) {
-      this.logger.log('warn', `env File does not contain a 'required' Array!`);
+      this.logger.log(
+        'warn',
+        `qenv (promised environment): ./env.yml File does not contain a 'required' Array!`
+      );
     } else {
       for (const keyArg of Object.keys(qenvFile.required)) {
         this.requiredEnvVars.push(qenvFile.required[keyArg]);