4.0.7

.gitignore

@@ -1,4 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
-pages/
 public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -34,48 +34,11 @@ snyk:
   - docker
   - notpriv
 
-sast:
-  stage: security
-  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run build
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
-  artifacts:
-    reports:
-      sast: gl-sast-report.json
-  tags:
-  - docker
-  - priv
-
 # ====================
 # test stage
 # ====================
 
-testLTS:
+testStable:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
   stage: test
   script:
   - npmci npm prepare
@@ -85,6 +48,18 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
@@ -103,19 +78,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm install
-        --env SOURCE_CODE="$PWD"
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
   - docker
   - priv
@@ -131,13 +98,15 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

README.md

@@ -1,25 +1,20 @@
-# qenv
+# @pushrocks/qenv
-
 easy promised environments
 
-## Availabililty
+## Availabililty and Links
-
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/qenv)
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/qenv)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/qenv)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/qenv)
+* [github.com (source mirror)](https://github.com/pushrocks/qenv)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/qenv)
+* [docs (typedoc)](https://pushrocks.gitlab.io/qenv/)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/qenv/)
 
 ## Status for master
-
+[![build status](https://gitlab.com/pushrocks/qenv/badges/master/build.svg)](https://gitlab.com/pushrocks/qenv/commits/master)
-[![build status](https://GitLab.com/pushrocks/qenv/badges/master/build.svg)](https://GitLab.com/pushrocks/qenv/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/qenv/badges/master/coverage.svg)](https://gitlab.com/pushrocks/qenv/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/qenv/badges/master/coverage.svg)](https://GitLab.com/pushrocks/qenv/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/qenv.svg)](https://www.npmjs.com/package/@pushrocks/qenv)
-[![npm downloads per month](https://img.shields.io/npm/dm/qenv.svg)](https://www.npmjs.com/package/qenv)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/qenv/badge.svg)](https://snyk.io/test/npm/@pushrocks/qenv)
-[![Dependency Status](https://david-dm.org/pushrocks/qenv.svg)](https://david-dm.org/pushrocks/qenv)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/qenv/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/qenv/master/dependencies/npm)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/qenv/badges/code.svg)](https://www.bithound.io/github/pushrocks/qenv)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
 
@@ -40,7 +35,9 @@ import { Qenv } from 'qenv';
 const myQenv = new Qenv('path/to/dir/where/qenv.yml/is/', 'path/to/dir/where/env.yml/is(');
 ```
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+For further information read the linked docs at the top of this readme.
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

npmextra.json

@@ -2,5 +2,15 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "qenv",
+      "shortDescription": "easy promised environments",
+      "npmPackagename": "@pushrocks/qenv",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/qenv",
-  "version": "3.0.6",
+  "version": "4.0.7",
   "private": false,
   "description": "easy promised environments",
   "main": "dist/index.js",
@@ -25,16 +25,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/qenv#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.13",
+    "@gitzone/tstest": "^1.0.33",
-    "@pushrocks/tapbundle": "^3.0.5",
+    "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^10.5.8",
+    "@types/node": "^14.0.12",
-    "tslint": "^5.12.0",
+    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.17.0"
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^6.0.6",
+    "@pushrocks/smartfile": "^7.0.12",
-    "@pushrocks/smartlog": "^2.0.9"
+    "@pushrocks/smartlog": "^2.0.26"
-  }
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

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

@@ -4,28 +4,26 @@ 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);
-    path.join(__dirname, 'assets'),
+  expect(testQenv).to.be.instanceof(qenv.Qenv);
-    path.join(__dirname, 'assets'),
-    false
-  );
-  expect(qenvTestObject).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('fromJson');
+  expect(testQenv.getEnvVarOnDemand('key2')).to.equal('fromJson');
 });
 
 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('fromJson');
 });
 
 tap.start();

ts/qenv.classes.qenv.ts

@@ -1,10 +1,4 @@
 import * as plugins from './qenv.plugins';
-plugins.smartlog.defaultLogger.enableConsole();
-
-export interface IKeyValueObject {
-  key: string;
-  value: string;
-}
 
 /**
  * class Qenv
@@ -14,8 +8,8 @@ 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;
+  public logger = new plugins.smartlog.ConsoleLog();
 
   // filePaths
   public qenvFilePathAbsolute: string;
@@ -24,10 +18,8 @@ export class Qenv {
   constructor(
     qenvFileBasePathArg = process.cwd(),
     envFileBasePathArg,
-    failOnMissing = true,
+    failOnMissing = true
-    loggerArg: plugins.smartlog.Smartlog = plugins.smartlog.defaultLogger
   ) {
-    this.logger = loggerArg;
 
     // lets make sure paths are absolute
     this.qenvFilePathAbsolute = plugins.path.join(
@@ -36,7 +28,7 @@ export class Qenv {
     );
     this.envFilePathAbsolute = plugins.path.join(
       plugins.path.resolve(envFileBasePathArg),
-      'env.yml'
+      'env.json'
     );
 
     this.getRequiredEnvVars();
@@ -51,8 +43,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,86 +56,100 @@ export class Qenv {
    * @param envVarName
    */
   public getEnvVarRequired(envVarName): string {
-    return process.env[envVarName];
+    return this.keyValueObject[envVarName];
   }
 
   /**
    * 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
     if (
       plugins.smartfile.fs.isDirectory('/run') &&
-      plugins.smartfile.fs.isDirectory('/run/secrets') &&
+      plugins.smartfile.fs.isDirectory('/run/secrets')
-      plugins.smartfile.fs.fileExistsSync(`/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') && !envVarFromDockerSecret) {
+          const secretObject = plugins.smartfile.fs.toObjectSync(`/run/secrets/${secret}`);
+          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;
   }
 
   /**
@@ -153,7 +161,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): ./qenv.yml File does not contain a 'required' Array! This might be ok though.`
+      );
     } else {
       for (const keyArg of Object.keys(qenvFile.required)) {
         this.requiredEnvVars.push(qenvFile.required[keyArg]);
@@ -169,11 +180,7 @@ 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
-        });
       }
     }
   };

ts/qenv.plugins.ts

@@ -1,16 +1,10 @@
 // native
 import * as path from 'path';
 
-export {
+export { path };
-  path
-}
 
 // @pushrocks scope
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartlog from '@pushrocks/smartlog';
 
-export {
+export { smartfile, smartlog };
-  smartfile,
-  smartlog
-}
-