From 46cc3c530508e5e458e00f2ba9ef35005882142d Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 7 Oct 2020 09:49:39 +0200
Subject: [PATCH] refactor: prepare onboarding config for enhancement
---
.../repository/onboarding/branch/config.ts | 28 +++++++++++--------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/lib/workers/repository/onboarding/branch/config.ts b/lib/workers/repository/onboarding/branch/config.ts
index 2d3f870230..8718cd03a1 100644
--- a/lib/workers/repository/onboarding/branch/config.ts
+++ b/lib/workers/repository/onboarding/branch/config.ts
@@ -9,31 +9,35 @@ export async function getOnboardingConfig(
): Promise<string> {
let onboardingConfig = clone(config.onboardingConfig);
- let organizationConfigRepoExists = false;
- const organizationConfigPresetName = `local>${
- config.repository.split('/')[0]
- }/renovate-config`;
+ let orgPreset: string;
logger.debug(
'Checking if this org/owner has a default Renovate preset which can be used.'
);
+
+ const orgName = config.repository.split('/')[0];
+
+ // Check for org/renovate-config
try {
- await getPreset(organizationConfigPresetName, config);
- organizationConfigRepoExists = true;
+ const orgRenovateConfig = `local>${orgName}/renovate-config`;
+ await getPreset(orgRenovateConfig, config);
+ orgPreset = orgRenovateConfig;
} catch (err) {
if (err.message !== PRESET_DEP_NOT_FOUND) {
logger.warn({ err }, 'Unknown error fetching default owner preset');
}
- // Organization preset did not exist
- logger.debug(
- 'No default org/owner preset found, so the default onboarding config will be used instead. Note: do not be concerned with any 404 messages that preceded this.'
- );
}
- if (organizationConfigRepoExists) {
+
+ if (orgPreset) {
onboardingConfig = {
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
- extends: [organizationConfigPresetName],
+ extends: [orgPreset],
};
+ } else {
+ // Organization preset did not exist
+ logger.debug(
+ 'No default org/owner preset found, so the default onboarding config will be used instead. Note: do not be concerned with any 404 messages that preceded this.'
+ );
}
logger.debug({ config: onboardingConfig }, 'onboarding config');
--
GitLab