Compare commits

..

8 Commits

Author SHA1 Message Date
31bf1b27a4 3.0.7 2019-01-13 22:33:19 +01:00
a77def5844 fix(core): update 2019-01-13 22:33:18 +01:00
2357699f3e 3.0.6 2019-01-13 22:04:20 +01:00
01f5784488 fix(core): update 2019-01-13 22:04:20 +01:00
80f35c39aa 3.0.5 2019-01-13 21:35:57 +01:00
87f55773bd fix(core): update 2019-01-13 21:35:57 +01:00
1a25341232 3.0.4 2019-01-13 18:25:09 +01:00
ccd41d86bf fix(core): update 2019-01-13 18:25:09 +01:00
4 changed files with 12 additions and 6 deletions

2
package-lock.json generated
View File

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

View File

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

View File

@ -17,10 +17,12 @@ tap.test('should create a new class', async () => {
tap.test('key1 should be not be overwritten since it is already present', async () => { tap.test('key1 should be not be overwritten since it is already present', async () => {
expect(process.env.key1).to.equal('original'); expect(process.env.key1).to.equal('original');
expect(qenvTestObject.getEnvVarOnDemand('key1')).to.equal('original');
}); });
tap.test('key2 should be read from Yml', async () => { tap.test('key2 should be read from Yml', async () => {
expect(process.env.key2).to.equal('fromYml'); expect(process.env.key2).to.equal('fromYml');
expect(qenvTestObject.getEnvVarOnDemand('key2')).to.equal('fromYml');
}); });
tap.test('keyValueObjectArray should hold all retrieved values', async () => { tap.test('keyValueObjectArray should hold all retrieved values', async () => {

View File

@ -1,4 +1,5 @@
import * as plugins from './qenv.plugins'; import * as plugins from './qenv.plugins';
plugins.smartlog.defaultLogger.enableConsole();
export interface IKeyValueObject { export interface IKeyValueObject {
key: string; key: string;
@ -74,7 +75,6 @@ export class Qenv {
try { try {
envYml = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute); envYml = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
} catch (err) { } catch (err) {
console.log("env file couldn't be found at " + this.envFilePathAbsolute);
envYml = {}; envYml = {};
} }
let envVar: string; let envVar: string;
@ -98,7 +98,7 @@ export class Qenv {
if ( if (
plugins.smartfile.fs.isDirectory('/run') && plugins.smartfile.fs.isDirectory('/run') &&
plugins.smartfile.fs.isDirectory('/run/secrets') && 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}`); dockerSecret = plugins.smartfile.fs.toStringSync(`/run/secrets/${requiredEnvVar}`);
} }
@ -107,7 +107,7 @@ export class Qenv {
if ( if (
plugins.smartfile.fs.isDirectory('/run') && 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`) plugins.smartfile.fs.fileExistsSync(`/run/secrets/secret.json`)
) { ) {
const secretObject = plugins.smartfile.fs.toObjectSync('/run/secrets/secret.json'); const secretObject = plugins.smartfile.fs.toObjectSync('/run/secrets/secret.json');
dockerSecret = secretObject[requiredEnvVar]; dockerSecret = secretObject[requiredEnvVar];
@ -129,12 +129,16 @@ export class Qenv {
let chosenVar: string = null; let chosenVar: string = null;
if (envVar) { if (envVar) {
this.logger.log('ok', `found ${requiredEnvVar} as environment variable`);
chosenVar = envVar; chosenVar = envVar;
} else if (envFileVar) { } else if (envFileVar) {
this.logger.log('ok', `found ${requiredEnvVar} as env.yml variable`);
chosenVar = envFileVar; chosenVar = envFileVar;
} else if (dockerSecret) { } else if (dockerSecret) {
this.logger.log('ok', `found ${requiredEnvVar} as docker secret`);
chosenVar = dockerSecret; chosenVar = dockerSecret;
} else if (dockerSecretJson) { } else if (dockerSecretJson) {
this.logger.log('ok', `found ${requiredEnvVar} as docker secret.json`);
chosenVar = dockerSecretJson; chosenVar = dockerSecretJson;
} }
return chosenVar; return chosenVar;
@ -185,5 +189,5 @@ export class Qenv {
} }
} }
return missingEnvVars; return missingEnvVars;
}; }
} }