refactor: better manager types

lib/config/index.ts

@@ -1,32 +1,36 @@
 import { logger } from '../logger';
 import { get, getLanguageList, getManagerList } from '../modules/manager';
 import * as options from './options';
-import type { AllConfig, RenovateConfig, RenovateConfigStage } from './types';
+import type {
+  AllConfig,
+  ManagerConfig,
+  RenovateConfig,
+  RenovateConfigStage,
+} from './types';
 import { mergeChildConfig } from './utils';
 
 export { mergeChildConfig };
 
 export function getManagerConfig(
   config: RenovateConfig,
   manager: string
-): RenovateConfig {
-  let managerConfig: RenovateConfig = {
+): ManagerConfig {
+  let managerConfig: ManagerConfig = {
     ...config,
     language: null,
-    manager: null,
+    manager,
   };
   const language = get(manager, 'language');
   if (language) {
     // TODO: fix types #7154
     managerConfig = mergeChildConfig(managerConfig, config[language] as any);
+    managerConfig.language = language;
   }
   // TODO: fix types #7154
   managerConfig = mergeChildConfig(managerConfig, config[manager] as any);
   for (const i of getLanguageList().concat(getManagerList())) {
     delete managerConfig[i];
   }
-  managerConfig.language = language;
-  managerConfig.manager = manager;
   return managerConfig;
 }
 

lib/config/types.ts

@@ -1,5 +1,6 @@
 import type { LogLevel } from 'bunyan';
 import type { Range } from 'semver';
+import type { ExtractConfig } from '../modules/manager/types';
 import type { HostRule } from '../types';
 import type { GitNoVerifyOption } from '../util/git/types';
 
@@ -429,6 +430,17 @@ export interface MigratedRenovateConfig extends RenovateConfig {
   gradle?: RenovateConfig;
 }
 
+export interface ManagerConfig extends RenovateConfig {
+  manager: string;
+  language: string | null;
+}
+
+export interface WorkerExtractConfig extends ExtractConfig {
+  manager: string;
+  enabled?: boolean;
+  fileList: string[];
+}
+
 export interface ValidationResult {
   errors: ValidationMessage[];
   warnings: ValidationMessage[];

lib/modules/manager/index.spec.ts

@@ -109,8 +109,12 @@ describe('modules/manager/index', () => {
         defaultConfig: {},
         supportedDatasources: [],
       });
-      expect(manager.extractPackageFile('unknown', null)).toBeNull();
-      expect(manager.extractPackageFile('dummy', null)).toBeNull();
+      expect(
+        manager.extractPackageFile('unknown', null, 'filename', {})
+      ).toBeNull();
+      expect(
+        manager.extractPackageFile('dummy', null, 'filename', {})
+      ).toBeNull();
     });
 
     it('returns non-null', () => {
@@ -120,7 +124,9 @@ describe('modules/manager/index', () => {
         extractPackageFile: () => Promise.resolve({ deps: [] }),
       });
 
-      expect(manager.extractPackageFile('dummy', null)).not.toBeNull();
+      expect(
+        manager.extractPackageFile('dummy', null, 'filename', {})
+      ).not.toBeNull();
     });
 
     afterEach(() => {

lib/modules/manager/index.ts

@@ -59,8 +59,8 @@ export async function extractAllPackageFiles(
 export function extractPackageFile(
   manager: string,
   content: string,
-  fileName?: string,
-  config?: ExtractConfig
+  fileName: string,
+  config: ExtractConfig
 ): Result<PackageFile | null> {
   if (!managers.has(manager)) {
     return null;

lib/modules/manager/types.ts

@@ -15,10 +15,8 @@ export interface ManagerData<T> {
 }
 
 export interface ExtractConfig {
-  constraints?: Record<string, string>;
   registryUrls?: string[];
   endpoint?: string;
-  gradle?: { timeout?: number };
   aliases?: Record<string, string>;
   npmrc?: string;
   npmrcMerge?: boolean;

lib/workers/repository/extract/index.ts

@@ -1,6 +1,10 @@
 import is from '@sindresorhus/is';
 import { getManagerConfig, mergeChildConfig } from '../../../config';
-import type { RenovateConfig } from '../../../config/types';
+import type {
+  ManagerConfig,
+  RenovateConfig,
+  WorkerExtractConfig,
+} from '../../../config/types';
 import { logger } from '../../../logger';
 import { getManagerList } from '../../../modules/manager';
 import type { PackageFile } from '../../../modules/manager/types';
@@ -18,13 +22,13 @@ export async function extractAllDependencies(
       config.enabledManagers.includes(manager)
     );
   }
-  const extractList: RenovateConfig[] = [];
+  const extractList: WorkerExtractConfig[] = [];
   const fileList = await getFileList();
 
-  const tryConfig = (extractConfig: RenovateConfig): void => {
-    const matchingFileList = getMatchingFiles(extractConfig, fileList);
+  const tryConfig = (managerConfig: ManagerConfig): void => {
+    const matchingFileList = getMatchingFiles(managerConfig, fileList);
     if (matchingFileList.length) {
-      extractList.push({ ...extractConfig, fileList: matchingFileList });
+      extractList.push({ ...managerConfig, fileList: matchingFileList });
     }
   };
 

lib/workers/repository/extract/manager-files.spec.ts

@@ -21,20 +21,24 @@ describe('workers/repository/extract/manager-files', () => {
     });
 
     it('returns empty of manager is disabled', async () => {
-      const managerConfig = { manager: 'travis', enabled: false };
+      const managerConfig = { manager: 'travis', enabled: false, fileList: [] };
       const res = await getManagerPackageFiles(managerConfig);
       expect(res).toHaveLength(0);
     });
 
     it('returns empty of manager is not enabled', async () => {
       config.enabledManagers = ['npm'];
-      const managerConfig = { manager: 'docker', enabled: true };
+      const managerConfig = { manager: 'docker', enabled: true, fileList: [] };
       const res = await getManagerPackageFiles(managerConfig);
       expect(res).toHaveLength(0);
     });
 
     it('skips files if null content returned', async () => {
-      const managerConfig = { manager: 'npm', enabled: true };
+      const managerConfig = {
+        manager: 'npm',
+        fileList: [],
+        enabled: true,
+      };
       fileMatch.getMatchingFiles.mockReturnValue(['package.json']);
       const res = await getManagerPackageFiles(managerConfig);
       expect(res).toHaveLength(0);

lib/workers/repository/extract/manager-files.ts

@@ -1,5 +1,5 @@
 import is from '@sindresorhus/is';
-import type { RenovateConfig } from '../../../config/types';
+import type { WorkerExtractConfig } from '../../../config/types';
 import { logger } from '../../../logger';
 import {
   extractAllPackageFiles,
@@ -10,7 +10,7 @@ import type { PackageFile } from '../../../modules/manager/types';
 import { readLocalFile } from '../../../util/fs';
 
 export async function getManagerPackageFiles(
-  config: RenovateConfig
+  config: WorkerExtractConfig
 ): Promise<PackageFile[]> {
   const { enabled, manager, fileList } = config;
   logger.trace(`getPackageFiles(${manager})`);

lib/workers/repository/onboarding/pr/pr-list.spec.ts

@@ -29,8 +29,10 @@ describe('workers/repository/onboarding/pr/pr-list', () => {
           prTitle: 'Lock file maintenance',
           schedule: ['before 5am'],
           branchName: 'renovate/lock-file-maintenance',
+          manager: 'some-manager',
           upgrades: [
             {
+              manager: 'some-manager',
               updateType: 'lockFileMaintenance',
             } as never,
           ],
@@ -62,15 +64,18 @@ describe('workers/repository/onboarding/pr/pr-list', () => {
           prTitle: 'Pin dependencies',
           baseBranch: 'some-other',
           branchName: 'renovate/pin-dependencies',
+          manager: 'some-manager',
           upgrades: [
             {
+              manager: 'some-manager',
               updateType: 'pin',
               sourceUrl: 'https://a',
               depName: 'a',
               depType: 'devDependencies',
               newValue: '1.1.0',
             },
             {
+              manager: 'some-manager',
               updateType: 'pin',
               depName: 'b',
               newValue: '1.5.3',
@@ -80,8 +85,10 @@ describe('workers/repository/onboarding/pr/pr-list', () => {
         {
           prTitle: 'Update a to v2',
           branchName: 'renovate/a-2.x',
+          manager: 'some-manager',
           upgrades: [
             {
+              manager: 'some-manager',
               sourceUrl: 'https://a',
               depName: 'a',
               currentValue: '^1.0.0',

lib/workers/repository/process/extract-update.spec.ts

@@ -17,7 +17,9 @@ const branchify = mocked(_branchify);
 const repositoryCache = mocked(_repositoryCache);
 
 branchify.branchifyUpgrades.mockResolvedValueOnce({
-  branches: [{ branchName: 'some-branch', upgrades: [] }],
+  branches: [
+    { manager: 'some-manager', branchName: 'some-branch', upgrades: [] },
+  ],
   branchList: ['branchName'],
 });
 
@@ -37,6 +39,7 @@ describe('workers/repository/process/extract-update', () => {
         branches: [
           {
             branchName: 'some-branch',
+            manager: 'some-manager',
             upgrades: [],
           },
         ],

lib/workers/repository/update/branch/artifacts.spec.ts

@@ -12,6 +12,7 @@ describe('workers/repository/update/branch/artifacts', () => {
     jest.resetAllMocks();
     config = {
       ...getConfig(),
+      manager: 'some-manager',
       branchName: 'renovate/pin',
       upgrades: [],
       artifactErrors: [{ lockFile: 'some' }],

lib/workers/repository/update/branch/execute-post-upgrade-commands.spec.ts

@@ -12,6 +12,7 @@ describe('workers/repository/update/branch/execute-post-upgrade-commands', () =>
     it('handles an artifact which is a directory', async () => {
       const commands: BranchUpgradeConfig[] = [
         {
+          manager: 'some-manager',
           branchName: 'main',
           postUpgradeTasks: {
             executionMode: 'update',
@@ -20,6 +21,7 @@ describe('workers/repository/update/branch/execute-post-upgrade-commands', () =>
         },
       ];
       const config: BranchConfig = {
+        manager: 'some-manager',
         updatedPackageFiles: [],
         updatedArtifacts: [
           { type: 'addition', path: 'some-existing-dir', contents: '' },

lib/workers/repository/update/branch/execute-post-upgrade-commands.ts

@@ -169,6 +169,7 @@ export default async function executePostUpgradeCommands(
 
   const branchUpgradeCommands: BranchUpgradeConfig[] = [
     {
+      manager: config.manager,
       depName: config.upgrades.map(({ depName }) => depName).join(' '),
       branchName: config.branchName,
       postUpgradeTasks:

lib/workers/repository/update/branch/reuse.spec.ts

@@ -18,6 +18,7 @@ describe('workers/repository/update/branch/reuse', () => {
 
     beforeEach(() => {
       config = {
+        manager: 'some-manager',
         branchName: 'renovate/some-branch',
         rebaseLabel: 'rebase',
         rebaseWhen: 'behind-base-branch',
@@ -50,16 +51,19 @@ describe('workers/repository/update/branch/reuse', () => {
     it('returns false if does not need rebasing but has upgrades that need lockfile maintenance along with upgrades that do not', async () => {
       config.upgrades = [
         {
+          manager: 'some-manager',
           packageFile: 'package.json',
           rangeStrategy: 'replace',
           branchName: 'current',
         },
         {
+          manager: 'some-manager',
           packageFile: 'package.json',
           rangeStrategy: 'update-lockfile',
           branchName: 'current',
         },
         {
+          manager: 'some-manager',
           packageFile: 'package.json',
           rangeStrategy: 'in-range-only',
           branchName: 'current',
@@ -75,11 +79,13 @@ describe('workers/repository/update/branch/reuse', () => {
     it('returns true if does not need rebasing and lockfile update is on different packages', async () => {
       config.upgrades = [
         {
+          manager: 'some-manager',
           packageFile: 'package.json',
           rangeStrategy: 'replace',
           branchName: 'current',
         },
         {
+          manager: 'some-manager',
           packageFile: 'subpackage/package.json',
           rangeStrategy: 'update-lockfile',
           branchName: 'current',

lib/workers/repository/update/pr/body/changelogs.spec.ts

@@ -12,6 +12,7 @@ describe('workers/repository/update/pr/body/changelogs', () => {
 
   it('returns empty string when there is no release notes', () => {
     const res = getChangelogs({
+      manager: 'some-manager',
       branchName: 'some-branch',
       upgrades: [],
       hasReleaseNotes: false,
@@ -33,26 +34,31 @@ describe('workers/repository/update/pr/body/changelogs', () => {
 
     const res = getChangelogs({
       branchName: 'some-branch',
+      manager: 'some-manager',
       upgrades: [
         {
+          manager: 'some-manager',
           depName: 'dep-1',
           repoName: 'some/repo',
           branchName: 'some-branch',
           hasReleaseNotes: true,
         },
         {
+          manager: 'some-manager',
           depName: 'dep-2',
           repoName: 'some/repo',
           branchName: 'some-branch',
           hasReleaseNotes: true,
         },
         {
+          manager: 'some-manager',
           depName: 'dep-3',
           repoName: 'some/repo',
           branchName: 'some-branch',
           hasReleaseNotes: true,
         },
         {
+          manager: 'some-manager',
           depName: 'dep-4',
           repoName: 'other/repo',
           branchName: 'some-branch',

lib/workers/repository/update/pr/body/config-description.spec.ts

@@ -10,6 +10,7 @@ const checks = mocked(_checks);
 describe('workers/repository/update/pr/body/config-description', () => {
   describe('getPrConfigDescription', () => {
     const config: BranchConfig = {
+      manager: 'some-manager',
       branchName: 'some-branch',
       upgrades: [],
     };

lib/workers/repository/update/pr/body/footer.spec.ts

@@ -11,13 +11,24 @@ describe('workers/repository/update/pr/body/footer', () => {
   });
 
   it('renders empty footer', () => {
-    expect(getPrFooter({ branchName: 'branch', upgrades: [] })).toBe('');
+    expect(
+      getPrFooter({
+        manager: 'some-manager',
+        branchName: 'branch',
+        upgrades: [],
+      })
+    ).toBe('');
   });
 
   it('renders prFooter', () => {
     template.compile.mockImplementation((x) => x);
     expect(
-      getPrFooter({ branchName: 'branch', upgrades: [], prFooter: 'FOOTER' })
+      getPrFooter({
+        manager: 'some-manager',
+        branchName: 'branch',
+        upgrades: [],
+        prFooter: 'FOOTER',
+      })
     ).toMatchInlineSnapshot(`
       "
       ---