From a536ad49eaaed50362a1ce88c547f7a382228241 Mon Sep 17 00:00:00 2001 From: Joe Longendyke Date: Mon, 6 Dec 2021 12:37:28 +0900 Subject: [PATCH 1/3] Remove fatal error from docker secrets This commit fixes #242 by catching the error thrown by getSecrets(). The underlying issue exists in docker-secret and has to do with the serviceAccount secret installed automatically by kubernetes. --- package-lock.json | 2 +- utils/init/initDockerSecrets.js | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef91c52..2b444e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7754,4 +7754,4 @@ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" } } -} \ No newline at end of file +} diff --git a/utils/init/initDockerSecrets.js b/utils/init/initDockerSecrets.js index 4a66320..dda3b2a 100644 --- a/utils/init/initDockerSecrets.js +++ b/utils/init/initDockerSecrets.js @@ -3,14 +3,18 @@ const Logger = require('../Logger'); const logger = new Logger(); const initDockerSecrets = () => { - const secrets = getSecrets(); + try { + const secrets = getSecrets(); - for (const property in secrets) { - const upperProperty = property.toUpperCase(); + for (const property in secrets) { + const upperProperty = property.toUpperCase(); - process.env[upperProperty] = secrets[property]; + process.env[upperProperty] = secrets[property]; - logger.log(`${upperProperty} was overwritten with docker secret value`); + logger.log(`${upperProperty} was overwritten with docker secret value`); + } + } catch(e) { + logger.log('Failed to initialize docker secrets. Error: ' + e, 'ERROR'); } }; From edc01a341cfd40ae5cea575dc1b32a06443fd760 Mon Sep 17 00:00:00 2001 From: Joe Longendyke Date: Wed, 8 Dec 2021 06:12:37 +0900 Subject: [PATCH 2/3] Modify package.json for fixed docker-secret --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 39a25d6..312809b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@types/express": "^4.17.13", "axios": "^0.24.0", "concurrently": "^6.3.0", - "docker-secret": "^1.2.3", + "docker-secret": "idevjoe/docker-secret#master", "dotenv": "^10.0.0", "express": "^4.17.1", "jsonwebtoken": "^8.5.1", From c8436aaf0393784bd2a62eb06591bb70a2d99668 Mon Sep 17 00:00:00 2001 From: Joe Longendyke Date: Wed, 8 Dec 2021 08:19:42 +0900 Subject: [PATCH 3/3] Use tagged idevjoe/docker-secret --- package-lock.json | 11 +++++------ package.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b444e4..154be9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@types/express": "^4.17.13", "axios": "^0.24.0", "concurrently": "^6.3.0", - "docker-secret": "^1.2.3", + "docker-secret": "idevjoe/docker-secret#1.2.4", "dotenv": "^10.0.0", "express": "^4.17.1", "jsonwebtoken": "^8.5.1", @@ -1192,8 +1192,8 @@ }, "node_modules/docker-secret": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/docker-secret/-/docker-secret-1.2.3.tgz", - "integrity": "sha512-JFUGiZEiNO0Hi9YzZAdCc5MwUpgQOjz0OeZkkcEv+lH6ZBkXNK97w2gcBQCsg5WRsT+Cj9eKFhuYyDxT8j56+A==", + "resolved": "git+ssh://git@github.com/idevjoe/docker-secret.git#556bce1313193c1a599767e2651f50730b934f86", + "license": "MIT", "engines": { "node": ">= 6" } @@ -5335,9 +5335,8 @@ } }, "docker-secret": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/docker-secret/-/docker-secret-1.2.3.tgz", - "integrity": "sha512-JFUGiZEiNO0Hi9YzZAdCc5MwUpgQOjz0OeZkkcEv+lH6ZBkXNK97w2gcBQCsg5WRsT+Cj9eKFhuYyDxT8j56+A==" + "version": "git+ssh://git@github.com/idevjoe/docker-secret.git#556bce1313193c1a599767e2651f50730b934f86", + "from": "docker-secret@idevjoe/docker-secret#1.2.4" }, "dot-prop": { "version": "5.3.0", diff --git a/package.json b/package.json index 312809b..71a950b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@types/express": "^4.17.13", "axios": "^0.24.0", "concurrently": "^6.3.0", - "docker-secret": "idevjoe/docker-secret#master", + "docker-secret": "idevjoe/docker-secret#1.2.4", "dotenv": "^10.0.0", "express": "^4.17.1", "jsonwebtoken": "^8.5.1",