push.rocks/qenv
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2019-08-06 17:41:45 +02:00
parent a1aa1543a2
commit b54a5e2fef
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/assets/env.json Normal file
View File

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

2
test/assets/env.yml
View File

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

6
test/test.ts
View File

@ -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 () => { 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 () => { tap.test('keyValueObjectArray should hold all retrieved values', async () => {
expect(testQenv.keyValueObject.key1).to.equal('original'); expect(testQenv.keyValueObject.key1).to.equal('original');
expect(testQenv.keyValueObject.key2).to.equal('fromYml'); expect(testQenv.keyValueObject.key2).to.equal('fromJson');
}); });
tap.start(); tap.start();

4
ts/qenv.classes.qenv.ts
View File

@ -31,7 +31,7 @@ export class Qenv {
); );
this.envFilePathAbsolute = plugins.path.join( this.envFilePathAbsolute = plugins.path.join(
plugins.path.resolve(envFileBasePathArg), plugins.path.resolve(envFileBasePathArg),
'env.yml' 'env.json'
); );
this.getRequiredEnvVars(); this.getRequiredEnvVars();
@ -131,7 +131,7 @@ export class Qenv {
this.logger.log('ok', `found ${requiredEnvVar} as environment variable`); 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`); this.logger.log('ok', `found ${requiredEnvVar} as env.json variable`);
chosenVar = envFileVar; chosenVar = envFileVar;
} else if (dockerSecret) { } else if (dockerSecret) {
this.logger.log('ok', `found ${requiredEnvVar} as docker secret`); this.logger.log('ok', `found ${requiredEnvVar} as docker secret`);