Skip to content

Commit

Permalink
fix(validation): massage config (#28458)
Browse files Browse the repository at this point in the history
Co-authored-by: Rhys Arkins <rhys@arkins.net>
  • Loading branch information
RahulGautamSingh and rarkins committed Apr 17, 2024
1 parent 7c598d6 commit 0a43865
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
20 changes: 20 additions & 0 deletions lib/workers/global/config/parse/util.spec.ts
@@ -0,0 +1,20 @@
import { logger } from '../../../../logger';
import { migrateAndValidateConfig } from './util';

describe('workers/global/config/parse/util', () => {
it('massages config', async () => {
const config = {
packageRules: [
{
description: 'haha',
matchPackageNames: ['name'],
enabled: false,
},
],
};

const migratedConfig = await migrateAndValidateConfig(config, 'global');
expect(migratedConfig?.packageRules?.[0].description).toBeArray();
expect(logger.warn).toHaveBeenCalledTimes(0);
});
});
11 changes: 9 additions & 2 deletions lib/workers/global/config/parse/util.ts
@@ -1,3 +1,5 @@
import { dequal } from 'dequal';
import { massageConfig } from '../../../../config/massage';
import { migrateConfig } from '../../../../config/migration';
import type { RenovateConfig } from '../../../../config/types';
import { validateConfig } from '../../../../config/validation';
Expand All @@ -14,8 +16,13 @@ export async function migrateAndValidateConfig(
`${configType} needs migrating`,
);
}
const massagedConfig = massageConfig(migratedConfig);
// log only if it's changed
if (!dequal(migratedConfig, massagedConfig)) {
logger.trace({ config: massagedConfig }, 'Post-massage config');
}

const { warnings, errors } = await validateConfig('global', migratedConfig);
const { warnings, errors } = await validateConfig('global', massagedConfig);

if (warnings.length) {
logger.warn(
Expand All @@ -27,5 +34,5 @@ export async function migrateAndValidateConfig(
logger.warn({ errors }, `Config validation errors found in ${configType}`);
}

return migratedConfig;
return massagedConfig;
}

0 comments on commit 0a43865

Please sign in to comment.