diff --git a/test/assets/env.json b/test/assets/env.json new file mode 100644 index 0000000..3b718b4 --- /dev/null +++ b/test/assets/env.json @@ -0,0 +1,4 @@ +{ + "key1": "fromJson", + "key2" :"fromJson" +} \ No newline at end of file diff --git a/test/assets/env.yml b/test/assets/env.yml deleted file mode 100644 index a40e730..0000000 --- a/test/assets/env.yml +++ /dev/null @@ -1,2 +0,0 @@ -key1: fromYml -key2: fromYml \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 99fd7f4..0213b6a 100644 --- a/test/test.ts +++ b/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.getEnvVarOnDemand('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(testQenv.keyValueObject.key1).to.equal('original'); - expect(testQenv.keyValueObject.key2).to.equal('fromYml'); + expect(testQenv.keyValueObject.key2).to.equal('fromJson'); }); tap.start(); diff --git a/ts/qenv.classes.qenv.ts b/ts/qenv.classes.qenv.ts index 5cd2cdf..ce9f94e 100644 --- a/ts/qenv.classes.qenv.ts +++ b/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(); @@ -131,7 +131,7 @@ export class Qenv { this.logger.log('ok', `found ${requiredEnvVar} as environment variable`); chosenVar = envVar; } 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; } else if (dockerSecret) { this.logger.log('ok', `found ${requiredEnvVar} as docker secret`);