feat(config): delete after setting admin config (#8557)

renovatebot · Feb 5, 2021 · 90db7e2 · 90db7e2
1 parent 7705244
commit 90db7e2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/lib/config/admin.ts b/lib/config/admin.ts
@@ -2,17 +2,20 @@ import { RenovateConfig, RepoAdminConfig } from './common';
 
 let adminConfig: RepoAdminConfig = {};
 
-const derivedAdminOptions = ['localDir'];
+// TODO: once admin config work is complete, add a test to make sure this list includes all options with admin=true
+export const repoAdminOptions = [
+  'allowPostUpgradeCommandTemplating',
+  'allowedPostUpgradeCommands',
+  'dockerImagePrefix',
+  'dockerUser',
+  'trustLevel',
+];
 
-export function setAdminConfig(
-  config: RenovateConfig = {},
-  adminOptions = Object.keys(config)
-): void {
+export function setAdminConfig(config: RenovateConfig = {}): void {
   adminConfig = {};
-  const repoAdminOptions = adminOptions.concat(derivedAdminOptions);
   for (const option of repoAdminOptions) {
     adminConfig[option] = config[option];
-    // TODO: delete from config
+    delete config[option]; // eslint-disable-line no-param-reassign
   }
 }
 

diff --git a/lib/config/definitions.ts b/lib/config/definitions.ts
@@ -1920,10 +1920,6 @@ export function getOptions(): RenovateOptions[] {
   return options;
 }
 
-export function getAdminOptionNames(): string[] {
-  return options.filter((option) => option.admin).map((option) => option.name);
-}
-
 function loadManagerOptions(): void {
   for (const [name, config] of getManagers().entries()) {
     if (config.defaultConfig) {

diff --git a/lib/workers/global/index.ts b/lib/workers/global/index.ts
@@ -4,8 +4,6 @@ import fs from 'fs-extra';
 import upath from 'upath';
 import * as configParser from '../../config';
 import { GlobalConfig } from '../../config';
-import { setAdminConfig } from '../../config/admin';
-import { getAdminOptionNames } from '../../config/definitions';
 import { getProblems, logger, setMeta } from '../../logger';
 import { setUtilConfig } from '../../util';
 import * as hostRules from '../../util/host-rules';
@@ -61,7 +59,6 @@ export async function start(): Promise<number> {
         break;
       }
       const repoConfig = await getRepositoryConfig(config, repository);
-      setAdminConfig(repoConfig, getAdminOptionNames());
       await setUtilConfig(repoConfig);
       if (repoConfig.hostRules) {
         hostRules.clear();

diff --git a/lib/workers/repository/index.ts b/lib/workers/repository/index.ts
@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import { RenovateConfig } from '../../config';
+import { setAdminConfig } from '../../config/admin';
 import { logger, setMeta } from '../../logger';
 import { deleteLocalFile, privateCacheDir } from '../../util/fs';
 import * as queue from '../../util/http/queue';
@@ -28,6 +29,7 @@ export async function renovateRepository(
 ): Promise<ProcessResult> {
   splitInit();
   let config = { ...repoConfig };
+  setAdminConfig(config);
   setMeta({ repository: config.repository });
   logger.info({ renovateVersion }, 'Repository started');
   logger.trace({ config });