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

fix(secrets): fix host-rules in repo config (#10459)

parent 4a998830
No related branches found
No related tags found
No related merge requests found
...@@ -113,12 +113,15 @@ function replaceSecretsinObject( ...@@ -113,12 +113,15 @@ function replaceSecretsinObject(
return config; return config;
} }
export function applySecretsToConfig(config: RenovateConfig): RenovateConfig { export function applySecretsToConfig(
config: RenovateConfig,
secrets = config.secrets
): RenovateConfig {
// Add all secrets to be sanitized // Add all secrets to be sanitized
if (is.plainObject(config.secrets)) { if (is.plainObject(secrets)) {
for (const secret of Object.values(config.secrets)) { for (const secret of Object.values(secrets)) {
add(String(secret)); add(String(secret));
} }
} }
return replaceSecretsinObject(config, config.secrets); return replaceSecretsinObject(config, secrets);
} }
...@@ -8,6 +8,7 @@ import { decryptConfig } from '../../../config/decrypt'; ...@@ -8,6 +8,7 @@ import { decryptConfig } from '../../../config/decrypt';
import { migrateAndValidate } from '../../../config/migrate-validate'; import { migrateAndValidate } from '../../../config/migrate-validate';
import { migrateConfig } from '../../../config/migration'; import { migrateConfig } from '../../../config/migration';
import * as presets from '../../../config/presets'; import * as presets from '../../../config/presets';
import { applySecretsToConfig } from '../../../config/secrets';
import { RenovateConfig } from '../../../config/types'; import { RenovateConfig } from '../../../config/types';
import { import {
CONFIG_VALIDATION, CONFIG_VALIDATION,
...@@ -218,6 +219,10 @@ export async function mergeRenovateConfig( ...@@ -218,6 +219,10 @@ export async function mergeRenovateConfig(
); );
npmApi.setNpmrc(resolvedConfig.npmrc); npmApi.setNpmrc(resolvedConfig.npmrc);
} }
resolvedConfig = applySecretsToConfig(
resolvedConfig,
mergeChildConfig(config.secrets || {}, resolvedConfig.secrets || {})
);
// istanbul ignore if // istanbul ignore if
if (resolvedConfig.hostRules) { if (resolvedConfig.hostRules) {
logger.debug('Setting hostRules from config'); logger.debug('Setting hostRules from config');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment