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

feat(config-validator): throw an error when the config cannot be found #23815

Merged
merged 10 commits into from
Nov 15, 2023
Merged

feat(config-validator): throw an error when the config cannot be found #23815

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1cf285d
fix(util/cache): throw an error when the config cannot be found
liby Aug 11, 2023
dae7636
feat(config-validator): enhance configuration file detection and vali…
liby Aug 11, 2023
2c5f8b7
Merge branch 'main' into feature/exit-if-config-file-not-found
rarkins Oct 15, 2023
13ccbd0
Adjust validation logic to only enforce config file presence when `RE…
liby Oct 15, 2023
7917af4
Merge branch 'main' into feature/exit-if-config-file-not-found
rarkins Oct 23, 2023
46e0bab
refactor(config-validator): integrate `validateAndSetFlag` into `vali…
liby Oct 23, 2023
0946839
style: code style issues fixed
liby Oct 23, 2023
28076c9
Merge branch 'main' into feature/exit-if-config-file-not-found
liby Oct 23, 2023
f97a643
Merge branch 'main' into feature/exit-if-config-file-not-found
rarkins Nov 15, 2023
4641ac2
prettier-fix
rarkins Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions lib/config-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@ type PackageJson = {
'renovate-config'?: Record<string, RenovateConfig>;
};

let isFoundConfigFile = false;
async function validateAndSetFlag(
liby marked this conversation as resolved.
Show resolved Hide resolved
file: string,
config: RenovateConfig,
strict: boolean,
isPreset = false
): Promise<void> {
isFoundConfigFile = true;
await validate(file, config, strict, isPreset);
}

liby marked this conversation as resolved.
Show resolved Hide resolved
(async () => {
const strictArgIndex = process.argv.indexOf('--strict');
const strict = strictArgIndex >= 0;
Expand All @@ -75,7 +86,7 @@ type PackageJson = {
const parsedContent = await getParsedContent(file);
try {
logger.info(`Validating ${file}`);
await validate(file, parsedContent, strict);
await validateAndSetFlag(file, parsedContent, strict);
} catch (err) {
logger.warn({ file, err }, 'File is not valid Renovate config');
returnVal = 1;
Expand All @@ -96,7 +107,7 @@ type PackageJson = {
const parsedContent = await getParsedContent(file);
try {
logger.info(`Validating ${file}`);
await validate(file, parsedContent, strict);
await validateAndSetFlag(file, parsedContent, strict);
} catch (err) {
logger.warn({ file, err }, 'File is not valid Renovate config');
returnVal = 1;
Expand All @@ -112,12 +123,16 @@ type PackageJson = {
) as PackageJson;
if (pkgJson.renovate) {
logger.info(`Validating package.json > renovate`);
await validate('package.json > renovate', pkgJson.renovate, strict);
await validateAndSetFlag(
'package.json > renovate',
pkgJson.renovate,
strict
);
}
if (pkgJson['renovate-config']) {
logger.info(`Validating package.json > renovate-config`);
for (const presetConfig of Object.values(pkgJson['renovate-config'])) {
await validate(
await validateAndSetFlag(
'package.json > renovate-config',
presetConfig,
strict,
Expand All @@ -134,7 +149,7 @@ type PackageJson = {
const file = process.env.RENOVATE_CONFIG_FILE ?? 'config.js';
logger.info(`Validating ${file}`);
try {
await validate(file, fileConfig, strict);
await validateAndSetFlag(file, fileConfig, strict);
liby marked this conversation as resolved.
Show resolved Hide resolved
} catch (err) {
logger.error({ file, err }, 'File is not valid Renovate config');
returnVal = 1;
Expand All @@ -144,6 +159,12 @@ type PackageJson = {
// ignore
}
}

if (!isFoundConfigFile) {
logger.error('No configuration files found.');
process.exit(1);
}

if (returnVal !== 0) {
process.exit(returnVal);
}
Expand Down