fix: do not override config.force with forceCli (#7274)

lib/config/config/__fixtures__/withForce.js

+// @ts-ignore
+module.exports = {
+  token: 'abcdefg',
+  logLevel: 'error',
+  force: {
+    schedule: null,
+  }
+};

lib/config/index.spec.ts

@@ -61,6 +61,26 @@ describe('config/index', () => {
       ]);
       expect(parsedConfig).not.toContainKey('configFile');
     });
+    it('supports config.force', async () => {
+      const configPath = path.join(
+        __dirname,
+        'config/__fixtures__/withForce.js'
+      );
+      const env: NodeJS.ProcessEnv = {
+        ...defaultEnv,
+        RENOVATE_CONFIG_FILE: configPath,
+      };
+      const parsedConfig = await configParser.parseConfigs(env, defaultArgv);
+      expect(parsedConfig).toContainEntries([
+        ['token', 'abcdefg'],
+        [
+          'force',
+          {
+            schedule: null,
+          },
+        ],
+      ]);
+    });
     it('reads private key from file', async () => {
       const privateKeyPath = path.join(
         __dirname,

lib/config/index.ts

@@ -65,7 +65,11 @@ export async function parseConfigs(
   }
 
   if (config.forceCli) {
-    config = mergeChildConfig(config, { force: { ...cliConfig } });
+    if (config.force) {
+      config.force = Object.assign(config.force, { ...cliConfig });
+    } else {
+      config.force = { ...cliConfig };
+    }
   }
 
   if (!config.privateKey && config.privateKeyPath) {