refactor: more GlobalConfig

renovatebot · Feb 5, 2021 · d00d1e8 · d00d1e8
1 parent 4e1271b
commit d00d1e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/config/common.ts b/lib/config/common.ts
@@ -67,9 +67,12 @@ export interface RenovateSharedConfig {
 export interface GlobalAdminConfig {
   autodiscover?: boolean;
   autodiscoverFilter?: string;
+  forceCli?: boolean;
+  gitPrivateKey?: string;
   logFile?: string;
   logFileLevel?: LogLevel;
   logLevel?: LogLevel;
+  prCommitsPerRunLimit?: number;
   redisUrl?: string;
   repositories?: RenovateRepository[];
 }
@@ -110,7 +113,6 @@ export interface RenovateAdminConfig {
   privateKey?: string | Buffer;
   privateKeyPath?: string;
   requireConfig?: boolean;
-  gitPrivateKey?: string;
 }
 
 export type PostUpgradeTasks = {

diff --git a/lib/config/definitions.ts b/lib/config/definitions.ts
@@ -291,7 +291,7 @@ const options: RenovateOptions[] = [
     name: 'redisUrl',
     description:
       'If defined, this Redis URL will be used for caching instead of the file system.',
-    admin: true,
+    stage: 'global',
     type: 'string',
   },
   {
@@ -371,7 +371,7 @@ const options: RenovateOptions[] = [
   {
     name: 'logContext',
     description: 'Add a global or per-repo log context to each log entry.',
-    stage: 'global',
+    admin: true,
     type: 'string',
     default: null,
   },

diff --git a/lib/platform/index.ts b/lib/platform/index.ts
@@ -1,6 +1,6 @@
 import URL from 'url';
 import addrs from 'email-addresses';
-import { RenovateConfig } from '../config/common';
+import { GlobalConfig } from '../config/common';
 import { PLATFORM_NOT_FOUND } from '../constants/error-messages';
 import { logger } from '../logger';
 import { setPrivateKey } from '../util/git';
@@ -81,8 +81,8 @@ export function parseGitAuthor(input: string): GitAuthor | null {
 }
 
 export async function initPlatform(
-  config: RenovateConfig
-): Promise<RenovateConfig> {
+  config: GlobalConfig
+): Promise<GlobalConfig> {
   setPrivateKey(config.gitPrivateKey);
   setPlatformApi(config.platform);
   // TODO: types