Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
3577fa22e1 | |||
f5275adfbd | |||
31bf1b27a4 | |||
a77def5844 |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/qenv",
|
"name": "@pushrocks/qenv",
|
||||||
"version": "3.0.6",
|
"version": "3.1.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/qenv",
|
"name": "@pushrocks/qenv",
|
||||||
"version": "3.0.6",
|
"version": "3.1.0",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "easy promised environments",
|
"description": "easy promised environments",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
|
@ -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 () => {
|
||||||
|
@ -106,11 +106,15 @@ export class Qenv {
|
|||||||
// docker secret.json
|
// docker secret.json
|
||||||
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.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') && !dockerSecret) {
|
||||||
|
const secretObject = plugins.smartfile.fs.toObjectSync('/run/secrets/secret.json');
|
||||||
|
dockerSecret = secretObject[requiredEnvVar];
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// warn if there is more than one candidate
|
// warn if there is more than one candidate
|
||||||
|
Reference in New Issue
Block a user