Skip to content
Snippets Groups Projects
Unverified Commit b0d4012c authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix(presets): set global host rules before validating presets (#14213)

parent 4c7f43d6
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,7 @@ describe('workers/global/index', () => { ...@@ -43,6 +43,7 @@ describe('workers/global/index', () => {
configParser.parseConfigs.mockResolvedValueOnce({ configParser.parseConfigs.mockResolvedValueOnce({
repositories: [], repositories: [],
globalExtends: [':pinVersions'], globalExtends: [':pinVersions'],
hostRules: [{ matchHost: 'github.com', token: 'abc123' }],
}); });
presets.resolveConfigPresets.mockResolvedValueOnce({}); presets.resolveConfigPresets.mockResolvedValueOnce({});
await expect(globalWorker.start()).resolves.toBe(0); await expect(globalWorker.start()).resolves.toBe(0);
......
...@@ -78,6 +78,7 @@ function checkEnv(): void { ...@@ -78,6 +78,7 @@ function checkEnv(): void {
} }
export async function validatePresets(config: AllConfig): Promise<void> { export async function validatePresets(config: AllConfig): Promise<void> {
logger.debug('validatePresets()');
try { try {
await resolveConfigPresets(config); await resolveConfigPresets(config);
} catch (err) /* istanbul ignore next */ { } catch (err) /* istanbul ignore next */ {
...@@ -141,6 +142,7 @@ export async function start(): Promise<number> { ...@@ -141,6 +142,7 @@ export async function start(): Promise<number> {
} }
const repoConfig = await getRepositoryConfig(config, repository); const repoConfig = await getRepositoryConfig(config, repository);
if (repoConfig.hostRules) { if (repoConfig.hostRules) {
logger.debug('Reinitializing hostRules for repo');
hostRules.clear(); hostRules.clear();
repoConfig.hostRules.forEach((rule) => hostRules.add(rule)); repoConfig.hostRules.forEach((rule) => hostRules.add(rule));
repoConfig.hostRules = []; repoConfig.hostRules = [];
......
...@@ -7,6 +7,7 @@ import { initPlatform } from '../../platform'; ...@@ -7,6 +7,7 @@ import { initPlatform } from '../../platform';
import * as packageCache from '../../util/cache/package'; import * as packageCache from '../../util/cache/package';
import { setEmojiConfig } from '../../util/emoji'; import { setEmojiConfig } from '../../util/emoji';
import { validateGitVersion } from '../../util/git'; import { validateGitVersion } from '../../util/git';
import * as hostRules from '../../util/host-rules';
import { Limit, setMaxLimit } from './limits'; import { Limit, setMaxLimit } from './limits';
async function setDirectories(input: AllConfig): Promise<AllConfig> { async function setDirectories(input: AllConfig): Promise<AllConfig> {
...@@ -42,6 +43,13 @@ async function checkVersions(): Promise<void> { ...@@ -42,6 +43,13 @@ async function checkVersions(): Promise<void> {
} }
} }
function setGlobalHostRules(config: RenovateConfig): void {
if (config.hostRules) {
logger.debug('Setting global hostRules');
config.hostRules.forEach((rule) => hostRules.add(rule));
}
}
export async function globalInitialize( export async function globalInitialize(
config_: RenovateConfig config_: RenovateConfig
): Promise<RenovateConfig> { ): Promise<RenovateConfig> {
...@@ -52,6 +60,7 @@ export async function globalInitialize( ...@@ -52,6 +60,7 @@ export async function globalInitialize(
await packageCache.init(config); await packageCache.init(config);
limitCommitsPerRun(config); limitCommitsPerRun(config);
setEmojiConfig(config); setEmojiConfig(config);
setGlobalHostRules(config);
return config; return config;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment