refactor: move customEnvVariables to admin config

renovatebot · Feb 7, 2021 · 80fd1fe · 80fd1fe
1 parent 3ebfb5f
commit 80fd1fe
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/lib/config/admin.ts b/lib/config/admin.ts
@@ -6,6 +6,7 @@ let adminConfig: RepoAdminConfig = {};
 export const repoAdminOptions = [
   'allowPostUpgradeCommandTemplating',
   'allowedPostUpgradeCommands',
+  'customEnvVariables',
   'dockerImagePrefix',
   'dockerUser',
   'dryRun',

diff --git a/lib/config/common.ts b/lib/config/common.ts
@@ -85,6 +85,7 @@ export interface GlobalAdminConfig {
 export interface RepoAdminConfig {
   allowPostUpgradeCommandTemplating?: boolean;
   allowedPostUpgradeCommands?: string[];
+  customEnvVariables?: Record<string, string>;
   dockerImagePrefix?: string;
   dockerUser?: string;
   dryRun?: boolean;
@@ -95,8 +96,6 @@ export interface RepoAdminConfig {
 export interface RenovateAdminConfig {
   cacheDir?: string;
 
-  customEnvVariables?: Record<string, string>;
-
   endpoint?: string;
 
   localDir?: string;

diff --git a/lib/util/exec/common.ts b/lib/util/exec/common.ts
@@ -13,7 +13,6 @@ export enum BinarySource {
 
 export interface ExecConfig {
   binarySource: Opt<BinarySource>;
-  customEnvVariables: Opt<Record<string, string>>;
   localDir: Opt<string>;
   cacheDir: Opt<string>;
 }

diff --git a/lib/util/exec/exec.spec.ts b/lib/util/exec/exec.spec.ts
@@ -542,9 +542,6 @@ describe(`Child process execution wrapper`, () => {
       {
         execConfig: {
           ...execConfig,
-          customEnvVariables: {
-            CUSTOM_KEY: 'CUSTOM_VALUE',
-          },
         },
         processEnv: envMock.basic,
         inCmd,
@@ -559,6 +556,11 @@ describe(`Child process execution wrapper`, () => {
             maxBuffer: 10485760,
           },
         ],
+        adminConfig: {
+          customEnvVariables: {
+            CUSTOM_KEY: 'CUSTOM_VALUE',
+          },
+        },
       },
     ],
 
@@ -567,9 +569,6 @@ describe(`Child process execution wrapper`, () => {
       {
         execConfig: {
           ...execConfig,
-          customEnvVariables: {
-            CUSTOM_KEY: 'CUSTOM_OVERRIDEN_VALUE',
-          },
         },
         processEnv: { ...envMock.basic, CUSTOM_KEY: 'CUSTOM_VALUE' },
         inCmd,
@@ -584,6 +583,11 @@ describe(`Child process execution wrapper`, () => {
             maxBuffer: 10485760,
           },
         ],
+        adminConfig: {
+          customEnvVariables: {
+            CUSTOM_KEY: 'CUSTOM_OVERRIDEN_VALUE',
+          },
+        },
       },
     ],
 
@@ -593,9 +597,6 @@ describe(`Child process execution wrapper`, () => {
         execConfig: {
           ...execConfig,
           binarySource: BinarySource.Docker,
-          customEnvVariables: {
-            CUSTOM_KEY: 'CUSTOM_VALUE',
-          },
         },
         processEnv,
         inCmd,
@@ -616,6 +617,11 @@ describe(`Child process execution wrapper`, () => {
             maxBuffer: 10485760,
           },
         ],
+        adminConfig: {
+          customEnvVariables: {
+            CUSTOM_KEY: 'CUSTOM_VALUE',
+          },
+        },
       },
     ],
 
@@ -625,9 +631,6 @@ describe(`Child process execution wrapper`, () => {
         execConfig: {
           ...execConfig,
           binarySource: BinarySource.Docker,
-          customEnvVariables: {
-            CUSTOM_KEY: 'CUSTOM_OVERRIDEN_VALUE',
-          },
         },
         processEnv: { ...envMock.basic, CUSTOM_KEY: 'CUSTOM_VALUE' },
         inCmd,
@@ -648,6 +651,11 @@ describe(`Child process execution wrapper`, () => {
             maxBuffer: 10485760,
           },
         ],
+        adminConfig: {
+          customEnvVariables: {
+            CUSTOM_KEY: 'CUSTOM_OVERRIDEN_VALUE',
+          },
+        },
       },
     ],
   ];

diff --git a/lib/util/exec/index.ts b/lib/util/exec/index.ts
@@ -1,5 +1,6 @@
 import { ExecOptions as ChildProcessExecOptions } from 'child_process';
 import { dirname, join } from 'upath';
+import { getAdminConfig } from '../../config/admin';
 import { RenovateConfig } from '../../config/common';
 import { logger } from '../../logger';
 import {
@@ -20,7 +21,6 @@ import { getChildProcessEnv } from './env';
 
 const execConfig: ExecConfig = {
   binarySource: null,
-  customEnvVariables: null,
   localDir: null,
   cacheDir: null,
 };
@@ -94,7 +94,7 @@ export async function exec(
   opts: ExecOptions = {}
 ): Promise<ExecResult> {
   const { env, docker, cwdFile } = opts;
-  const extraEnv = { ...opts.extraEnv, ...execConfig.customEnvVariables };
+  const extraEnv = { ...opts.extraEnv, ...getAdminConfig().customEnvVariables };
   let cwd;
   // istanbul ignore if
   if (cwdFile) {