From ca72f49c3ecdd5f735ff8db3fd23f71cd322edc1 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Wed, 12 Sep 2018 06:25:38 +0200 Subject: [PATCH] refactor: move env deletion into env parsing --- lib/config/env.js | 8 ++++++++ lib/workers/global/index.js | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/config/env.js b/lib/config/env.js index 052e65b450..fed3afce8c 100644 --- a/lib/config/env.js +++ b/lib/config/env.js @@ -103,5 +103,13 @@ function getConfig(env) { config.endpoint = env.GITHUB_ENDPOINT; } + delete process.env.GITHUB_TOKEN; + delete process.env.GITHUB_ENDPOINT; + delete process.env.GITHUB_COM_TOKEN; + delete process.env.GITLAB_TOKEN; + delete process.env.GITLAB_ENDPOINT; + delete process.env.VSTS_TOKEN; + delete process.env.VSTS_ENDPOINT; + return config; } diff --git a/lib/workers/global/index.js b/lib/workers/global/index.js index c59aeb62a8..b2e1327ddf 100644 --- a/lib/workers/global/index.js +++ b/lib/workers/global/index.js @@ -14,13 +14,6 @@ async function start() { cache.init(); try { const config = await configParser.parseConfigs(process.env, process.argv); - delete process.env.GITHUB_TOKEN; - delete process.env.GITHUB_ENDPOINT; - delete process.env.GITHUB_COM_TOKEN; - delete process.env.GITLAB_TOKEN; - delete process.env.GITLAB_ENDPOINT; - delete process.env.VSTS_TOKEN; - delete process.env.VSTS_ENDPOINT; if (config.repositories.length === 0) { logger.warn( 'No repositories found - did you want to run with flag --autodiscover?' -- GitLab