diff --git a/lib/config/index.js b/lib/config/index.js index 8dca350bdd865d3b46366935dab335b92b3af0a6..186394e3bc1ae03a0e268c0f2755c74905367025 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -180,7 +180,7 @@ function mergeChildConfig(parent, child) { ); } } - return config; + return Object.assign(config, config.force); } function filterConfig(inputConfig, targetStage) { diff --git a/lib/util/package-rules.js b/lib/util/package-rules.js index 2ea5c769261296421c3d69f7cab7b6ee4d4f8802..ae27459df20bf64225c3a0ee827c21ccc73f9ff4 100644 --- a/lib/util/package-rules.js +++ b/lib/util/package-rules.js @@ -2,7 +2,6 @@ const minimatch = require('minimatch'); const versioning = require('../versioning'); const { mergeChildConfig } = require('../config'); -const { applyForceConfig } = require('../workers/repository/init/force'); module.exports = { applyPackageRules, @@ -134,5 +133,5 @@ function applyPackageRules(inputConfig) { delete config.matchCurrentVersion; } }); - return applyForceConfig(config); + return config; } diff --git a/lib/workers/repository/init/force.js b/lib/workers/repository/init/force.js deleted file mode 100644 index ce6eb13801a37cdf108b75b8200689095934f9dc..0000000000000000000000000000000000000000 --- a/lib/workers/repository/init/force.js +++ /dev/null @@ -1,19 +0,0 @@ -const { mergeChildConfig } = require('../../../config'); - -function applyForceConfig(input) { - let config = { ...input }; - if (config.force && Object.keys(config.force).length) { - logger.debug('Applying forced config'); - config = mergeChildConfig(config, config.force); - config.packageRules = config.packageRules || []; - config.packageRules.push({ - ...config.force, - packagePatterns: ['.*'], - }); - } - return config; -} - -module.exports = { - applyForceConfig, -}; diff --git a/lib/workers/repository/init/index.js b/lib/workers/repository/init/index.js index 5cc9c2b063ece4056a4c2e5567bc40e4f42683f0..d599b504a082dfa567b169b68cf56dc1dd5528a9 100644 --- a/lib/workers/repository/init/index.js +++ b/lib/workers/repository/init/index.js @@ -4,7 +4,6 @@ const { initApis } = require('../init/apis'); const { checkBaseBranch } = require('./base'); const { mergeRenovateConfig } = require('./config'); const { detectSemanticCommits } = require('./semantic'); -const { applyForceConfig } = require('./force'); async function initRepo(input) { let config = { @@ -17,7 +16,6 @@ async function initRepo(input) { config = await initApis(config); config = await checkOnboardingBranch(config); config = await mergeRenovateConfig(config); - config = await applyForceConfig(config); checkIfConfigured(config); config = await checkBaseBranch(config); config.semanticCommits = await detectSemanticCommits(config); diff --git a/test/workers/repository/init/__snapshots__/force.spec.js.snap b/test/workers/repository/init/__snapshots__/force.spec.js.snap deleted file mode 100644 index 3a27c1ca4a535e81d9ec98a730f251051b06f3a4..0000000000000000000000000000000000000000 --- a/test/workers/repository/init/__snapshots__/force.spec.js.snap +++ /dev/null @@ -1,21 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`workers/repository/init/flatten flattenPackageRules() forces 1`] = ` -Object { - "a": 2, - "b": 2, - "force": Object { - "a": 2, - "b": 2, - }, - "packageRules": Array [ - Object { - "a": 2, - "b": 2, - "packagePatterns": Array [ - ".*", - ], - }, - ], -} -`; diff --git a/test/workers/repository/init/force.spec.js b/test/workers/repository/init/force.spec.js deleted file mode 100644 index bddf2827dff7e3436eedb3b1a1201e59cd05b8c9..0000000000000000000000000000000000000000 --- a/test/workers/repository/init/force.spec.js +++ /dev/null @@ -1,17 +0,0 @@ -const { - applyForceConfig, -} = require('../../../../lib/workers/repository/init/force'); - -describe('workers/repository/init/flatten', () => { - describe('flattenPackageRules()', () => { - it('returns empty', () => { - expect(applyForceConfig({})).toEqual({}); - }); - it('forces', () => { - const res = applyForceConfig({ a: 1, force: { a: 2, b: 2 } }); - expect(res).toMatchSnapshot(); - expect(res.a).toEqual(2); - expect(res.b).toEqual(2); - }); - }); -});