Skip to content
Snippets Groups Projects
Commit cb92a9e0 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

fix: validator needs to use async validate command

Closes #1734
parent 70ae7369
No related branches found
No related tags found
No related merge requests found
...@@ -7,8 +7,8 @@ const { validateConfig } = require('../lib/config/validation'); ...@@ -7,8 +7,8 @@ const { validateConfig } = require('../lib/config/validation');
let returnVal = 0; let returnVal = 0;
function validate(desc, config) { async function validate(desc, config) {
const res = validateConfig(config); const res = await validateConfig(config);
if (res.errors.length) { if (res.errors.length) {
console.log( console.log(
`${desc} contains errors:\n\n${JSON.stringify(res.errors, null, 2)}` `${desc} contains errors:\n\n${JSON.stringify(res.errors, null, 2)}`
...@@ -23,6 +23,7 @@ function validate(desc, config) { ...@@ -23,6 +23,7 @@ function validate(desc, config) {
} }
} }
(async () => {
const renovateConfigFiles = [ const renovateConfigFiles = [
'renovate.json', 'renovate.json',
'.renovaterc', '.renovaterc',
...@@ -34,7 +35,7 @@ for (const file of renovateConfigFiles) { ...@@ -34,7 +35,7 @@ for (const file of renovateConfigFiles) {
console.log(`Validating ${file}`); console.log(`Validating ${file}`);
try { try {
const jsonContent = JSON.parse(rawContent); const jsonContent = JSON.parse(rawContent);
validate(file, jsonContent); await validate(file, jsonContent);
} catch (err) { } catch (err) {
console.log(`${file} is not valid JSON`); console.log(`${file} is not valid JSON`);
returnVal = 1; returnVal = 1;
...@@ -47,13 +48,13 @@ try { ...@@ -47,13 +48,13 @@ try {
const pkgJson = JSON.parse(fs.readFileSync('package.json', 'utf8')); const pkgJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
if (pkgJson.renovate) { if (pkgJson.renovate) {
console.log(`Validating package.json > renovate`); console.log(`Validating package.json > renovate`);
validate('package.json > renovate', pkgJson.renovate); await validate('package.json > renovate', pkgJson.renovate);
} }
if (pkgJson['renovate-config']) { if (pkgJson['renovate-config']) {
console.log(`Validating package.json > renovate-config`); console.log(`Validating package.json > renovate-config`);
Object.values(pkgJson['renovate-config']).forEach(presetConfig => { for (const presetConfig of Object.values(pkgJson['renovate-config'])) {
validate('package.json > renovate-config', presetConfig); await validate('package.json > renovate-config', presetConfig);
}); }
} }
} catch (err) { } catch (err) {
// ignore // ignore
...@@ -62,3 +63,4 @@ if (returnVal !== 0) { ...@@ -62,3 +63,4 @@ if (returnVal !== 0) {
process.exit(returnVal); process.exit(returnVal);
} }
console.log('OK'); console.log('OK');
})();
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment