Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: customManager mandatory fields check #28832

Merged
merged 4 commits into from
May 4, 2024
Merged

refactor: customManager mandatory fields check #28832

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5556355
refactor: customManager mandatory fields check
rarkins May 4, 2024
3a1484d
module scope
rarkins May 4, 2024
169fcd7
fix lint
rarkins May 4, 2024
b6f18a4
Merge branch 'main' into refactor/config-validation-regex-mandatory-f…
rarkins May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 14 additions & 7 deletions lib/config/validation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,19 @@ export async function validateConfig(
return { errors, warnings };
}

function hasField(
customManager: Partial<RegexManagerConfig>,
field: string,
): boolean {
const templateField = `${field}Template` as keyof RegexManagerTemplates;
return !!(
customManager[templateField] ??
customManager.matchStrings?.some((matchString) =>
matchString.includes(`(?<${field}>`),
)
);
}

function validateRegexManagerFields(
customManager: Partial<RegexManagerConfig>,
currentPath: string,
Expand Down Expand Up @@ -835,13 +848,7 @@ function validateRegexManagerFields(

const mandatoryFields = ['depName', 'currentValue', 'datasource'];
for (const field of mandatoryFields) {
const templateField = `${field}Template` as keyof RegexManagerTemplates;
if (
!customManager[templateField] &&
!customManager.matchStrings?.some((matchString) =>
matchString.includes(`(?<${field}>`),
)
) {
if (!hasField(customManager, field)) {
errors.push({
topic: 'Configuration Error',
message: `Regex Managers must contain ${field}Template configuration or regex group named ${field}`,
Expand Down