From d0434d5df1516fdb2ef29917df41564153f5330c Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 2 Jun 2021 11:25:10 +0200
Subject: [PATCH] chore: GlobalConfig -> AllConfig
---
lib/config/cli.ts | 4 ++--
lib/config/defaults.ts | 6 +++---
lib/config/env.ts | 6 +++---
lib/config/file.ts | 6 +++---
lib/config/index.ts | 10 +++++-----
lib/config/presets/index.ts | 8 ++++----
lib/config/secrets.ts | 4 ++--
lib/config/types.ts | 2 +-
lib/platform/index.ts | 6 ++----
lib/util/cache/package/index.ts | 6 +++---
lib/workers/global/autodiscover.ts | 6 +++---
lib/workers/global/index.ts | 6 +++---
lib/workers/global/initialize.ts | 6 +++---
13 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/lib/config/cli.ts b/lib/config/cli.ts
index ec0084a67d..0b9c513c0d 100644
--- a/lib/config/cli.ts
+++ b/lib/config/cli.ts
@@ -1,7 +1,7 @@
import { Command } from 'commander';
import { version } from '../../package.json';
import { getOptions } from './definitions';
-import type { GlobalConfig, RenovateCliConfig, RenovateOptions } from './types';
+import type { AllConfig, RenovateCliConfig, RenovateOptions } from './types';
export function getCliName(option: Partial<RenovateOptions>): string {
if (option.cli === false) {
@@ -11,7 +11,7 @@ export function getCliName(option: Partial<RenovateOptions>): string {
return `--${nameWithHyphens.toLowerCase()}`;
}
-export function getConfig(input: string[]): GlobalConfig {
+export function getConfig(input: string[]): AllConfig {
// massage migrated configuration keys
const argv = input
.map((a) =>
diff --git a/lib/config/defaults.ts b/lib/config/defaults.ts
index 03df2283a3..56bd1a6b4d 100644
--- a/lib/config/defaults.ts
+++ b/lib/config/defaults.ts
@@ -1,5 +1,5 @@
import { getOptions } from './definitions';
-import type { GlobalConfig, RenovateOptions } from './types';
+import type { AllConfig, RenovateOptions } from './types';
const defaultValues = {
boolean: true,
@@ -14,9 +14,9 @@ export function getDefault(option: RenovateOptions): any {
: option.default;
}
-export function getConfig(): GlobalConfig {
+export function getConfig(): AllConfig {
const options = getOptions();
- const config: GlobalConfig = {};
+ const config: AllConfig = {};
options.forEach((option) => {
if (!option.parent) {
config[option.name] = getDefault(option);
diff --git a/lib/config/env.ts b/lib/config/env.ts
index 9689b70353..d20c40b0ee 100644
--- a/lib/config/env.ts
+++ b/lib/config/env.ts
@@ -5,7 +5,7 @@ import { getDatasourceList } from '../datasource';
import { logger } from '../logger';
import type { HostRule } from '../types';
import { getOptions } from './definitions';
-import type { GlobalConfig, RenovateOptions } from './types';
+import type { AllConfig, RenovateOptions } from './types';
// istanbul ignore if
if (process.env.ENV_PREFIX) {
@@ -27,10 +27,10 @@ export function getEnvName(option: Partial<RenovateOptions>): string {
return `RENOVATE_${nameWithUnderscores.toUpperCase()}`;
}
-export function getConfig(env: NodeJS.ProcessEnv): GlobalConfig {
+export function getConfig(env: NodeJS.ProcessEnv): AllConfig {
const options = getOptions();
- let config: GlobalConfig = {};
+ let config: AllConfig = {};
if (env.RENOVATE_CONFIG) {
try {
diff --git a/lib/config/file.ts b/lib/config/file.ts
index f6b59fce0f..6541c89f16 100644
--- a/lib/config/file.ts
+++ b/lib/config/file.ts
@@ -1,15 +1,15 @@
import upath from 'upath';
import { logger } from '../logger';
import { migrateConfig } from './migration';
-import type { GlobalConfig } from './types';
+import type { AllConfig } from './types';
-export function getConfig(env: NodeJS.ProcessEnv): GlobalConfig {
+export function getConfig(env: NodeJS.ProcessEnv): AllConfig {
let configFile = env.RENOVATE_CONFIG_FILE || 'config';
if (!upath.isAbsolute(configFile)) {
configFile = `${process.cwd()}/${configFile}`;
logger.debug('Checking for config file in ' + configFile);
}
- let config: GlobalConfig = {};
+ let config: AllConfig = {};
try {
// eslint-disable-next-line global-require,import/no-dynamic-require
config = require(configFile);
diff --git a/lib/config/index.ts b/lib/config/index.ts
index 366813c25a..0ea95c5eba 100644
--- a/lib/config/index.ts
+++ b/lib/config/index.ts
@@ -8,7 +8,7 @@ import * as definitions from './definitions';
import * as envParser from './env';
import * as fileParser from './file';
import type {
- GlobalConfig,
+ AllConfig,
ManagerConfig,
RenovateConfig,
RenovateConfigStage,
@@ -42,7 +42,7 @@ export function getManagerConfig(
export async function parseConfigs(
env: NodeJS.ProcessEnv,
argv: string[]
-): Promise<GlobalConfig> {
+): Promise<AllConfig> {
logger.debug('Parsing configs');
// Get configs
@@ -51,7 +51,7 @@ export async function parseConfigs(
const cliConfig = cliParser.getConfig(argv);
const envConfig = envParser.getConfig(env);
- let config: GlobalConfig = mergeChildConfig(fileConfig, envConfig);
+ let config: AllConfig = mergeChildConfig(fileConfig, envConfig);
config = mergeChildConfig(config, cliConfig);
const combinedConfig = config;
@@ -119,9 +119,9 @@ export async function parseConfigs(
}
export function filterConfig(
- inputConfig: GlobalConfig,
+ inputConfig: AllConfig,
targetStage: RenovateConfigStage
-): GlobalConfig {
+): AllConfig {
logger.trace({ config: inputConfig }, `filterConfig('${targetStage}')`);
const outputConfig: RenovateConfig = { ...inputConfig };
const stages = ['global', 'repository', 'package', 'branch', 'pr'];
diff --git a/lib/config/presets/index.ts b/lib/config/presets/index.ts
index edde57d982..d3c6bde5a3 100644
--- a/lib/config/presets/index.ts
+++ b/lib/config/presets/index.ts
@@ -8,7 +8,7 @@ import { ExternalHostError } from '../../types/errors/external-host-error';
import { regEx } from '../../util/regex';
import * as massage from '../massage';
import * as migration from '../migration';
-import type { GlobalConfig, RenovateConfig } from '../types';
+import type { AllConfig, RenovateConfig } from '../types';
import { mergeChildConfig } from '../utils';
import { removedPresets } from './common';
import * as gitea from './gitea';
@@ -222,11 +222,11 @@ export async function getPreset(
}
export async function resolveConfigPresets(
- inputConfig: GlobalConfig,
+ inputConfig: AllConfig,
baseConfig?: RenovateConfig,
ignorePresets?: string[],
existingPresets: string[] = []
-): Promise<GlobalConfig> {
+): Promise<AllConfig> {
if (!ignorePresets || ignorePresets.length === 0) {
ignorePresets = inputConfig.ignorePresets || []; // eslint-disable-line
}
@@ -234,7 +234,7 @@ export async function resolveConfigPresets(
{ config: inputConfig, existingPresets },
'resolveConfigPresets'
);
- let config: GlobalConfig = {};
+ let config: AllConfig = {};
// First, merge all the preset configs from left to right
if (inputConfig.extends?.length) {
for (const preset of inputConfig.extends) {
diff --git a/lib/config/secrets.ts b/lib/config/secrets.ts
index c07a0fc912..bb1bfd2481 100644
--- a/lib/config/secrets.ts
+++ b/lib/config/secrets.ts
@@ -6,7 +6,7 @@ import {
import { logger } from '../logger';
import { regEx } from '../util/regex';
import { add } from '../util/sanitize';
-import { GlobalConfig, RenovateConfig } from './types';
+import { AllConfig, RenovateConfig } from './types';
const secretNamePattern = '[A-Za-z][A-Za-z0-9_]*';
@@ -40,7 +40,7 @@ function validateSecrets(secrets_: unknown): void {
}
}
-export function validateConfigSecrets(config: GlobalConfig): void {
+export function validateConfigSecrets(config: AllConfig): void {
validateSecrets(config.secrets);
if (config.repositories) {
for (const repository of config.repositories) {
diff --git a/lib/config/types.ts b/lib/config/types.ts
index 8109381fb2..b5692f369a 100644
--- a/lib/config/types.ts
+++ b/lib/config/types.ts
@@ -201,7 +201,7 @@ export interface RenovateConfig
secrets?: Record<string, string>;
}
-export interface GlobalConfig extends RenovateConfig, GlobalOnlyConfig {}
+export interface AllConfig extends RenovateConfig, GlobalOnlyConfig {}
export interface AssigneesAndReviewersConfig {
assigneesFromCodeOwners?: boolean;
diff --git a/lib/platform/index.ts b/lib/platform/index.ts
index 0117466a54..8268aecdc7 100644
--- a/lib/platform/index.ts
+++ b/lib/platform/index.ts
@@ -1,6 +1,6 @@
import URL from 'url';
import addrs from 'email-addresses';
-import type { GlobalConfig } from '../config/types';
+import type { AllConfig } from '../config/types';
import { PLATFORM_NOT_FOUND } from '../constants/error-messages';
import { logger } from '../logger';
import type { HostRule } from '../types';
@@ -81,9 +81,7 @@ export function parseGitAuthor(input: string): GitAuthor | null {
return null;
}
-export async function initPlatform(
- config: GlobalConfig
-): Promise<GlobalConfig> {
+export async function initPlatform(config: AllConfig): Promise<AllConfig> {
setPrivateKey(config.gitPrivateKey);
setNoVerify(config.gitNoVerify ?? []);
setPlatformApi(config.platform);
diff --git a/lib/util/cache/package/index.ts b/lib/util/cache/package/index.ts
index d1d5655b30..de579bc033 100644
--- a/lib/util/cache/package/index.ts
+++ b/lib/util/cache/package/index.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../config/types';
+import type { AllConfig } from '../../../config/types';
import * as memCache from '../memory';
import * as fileCache from './file';
import * as redisCache from './redis';
@@ -35,7 +35,7 @@ export function set(
return cacheProxy.set(namespace, key, value, minutes);
}
-export function init(config: GlobalConfig): void {
+export function init(config: AllConfig): void {
if (config.redisUrl) {
redisCache.init(config.redisUrl);
cacheProxy = {
@@ -51,7 +51,7 @@ export function init(config: GlobalConfig): void {
}
}
-export function cleanup(config: GlobalConfig): void {
+export function cleanup(config: AllConfig): void {
if (config?.redisUrl) {
redisCache.end();
}
diff --git a/lib/workers/global/autodiscover.ts b/lib/workers/global/autodiscover.ts
index bcb993d8dd..03b66b293a 100644
--- a/lib/workers/global/autodiscover.ts
+++ b/lib/workers/global/autodiscover.ts
@@ -1,6 +1,6 @@
import is from '@sindresorhus/is';
import minimatch from 'minimatch';
-import type { GlobalConfig } from '../../config/types';
+import type { AllConfig } from '../../config/types';
import { logger } from '../../logger';
import { platform } from '../../platform';
@@ -10,8 +10,8 @@ function repoName(value: string | { repository: string }): string {
}
export async function autodiscoverRepositories(
- config: GlobalConfig
-): Promise<GlobalConfig> {
+ config: AllConfig
+): Promise<AllConfig> {
if (!config.autodiscover) {
if (!config.repositories?.length) {
logger.warn(
diff --git a/lib/workers/global/index.ts b/lib/workers/global/index.ts
index 6f88991f9b..0af0632799 100644
--- a/lib/workers/global/index.ts
+++ b/lib/workers/global/index.ts
@@ -8,7 +8,7 @@ import * as configParser from '../../config';
import { resolveConfigPresets } from '../../config/presets';
import { validateConfigSecrets } from '../../config/secrets';
import type {
- GlobalConfig,
+ AllConfig,
RenovateConfig,
RenovateRepository,
} from '../../config/types';
@@ -71,7 +71,7 @@ function checkEnv(): void {
}
}
-export async function validatePresets(config: GlobalConfig): Promise<void> {
+export async function validatePresets(config: AllConfig): Promise<void> {
try {
await resolveConfigPresets(config);
} catch (err) /* istanbul ignore next */ {
@@ -80,7 +80,7 @@ export async function validatePresets(config: GlobalConfig): Promise<void> {
}
export async function start(): Promise<number> {
- let config: GlobalConfig;
+ let config: AllConfig;
try {
// read global config from file, env and cli args
config = await getGlobalConfig();
diff --git a/lib/workers/global/initialize.ts b/lib/workers/global/initialize.ts
index 4f1e3286ce..c82fc237bb 100644
--- a/lib/workers/global/initialize.ts
+++ b/lib/workers/global/initialize.ts
@@ -1,15 +1,15 @@
import os from 'os';
import fs from 'fs-extra';
import upath from 'upath';
-import type { GlobalConfig, RenovateConfig } from '../../config/types';
+import type { AllConfig, RenovateConfig } from '../../config/types';
import { logger } from '../../logger';
import { initPlatform } from '../../platform';
import * as packageCache from '../../util/cache/package';
import { setEmojiConfig } from '../../util/emoji';
import { Limit, setMaxLimit } from './limits';
-async function setDirectories(input: GlobalConfig): Promise<GlobalConfig> {
- const config: GlobalConfig = { ...input };
+async function setDirectories(input: AllConfig): Promise<AllConfig> {
+ const config: AllConfig = { ...input };
process.env.TMPDIR = process.env.RENOVATE_TMPDIR || os.tmpdir();
if (config.baseDir) {
logger.debug('Using configured baseDir: ' + config.baseDir);
--
GitLab