fix: Merge additionalReviewers from multiple upgrades (#23540)

renovatebot · Jul 24, 2023 · f4dbae2 · f4dbae2
1 parent 3c29bd4
commit f4dbae2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts
@@ -1420,5 +1420,29 @@ describe('workers/repository/updates/generate', () => {
       expect(res.prTitle).toBe('🆙 Update dependency some-dep to 1.2.0');
       expect(res.commitMessage).toBe('🆙 Update dependency some-dep to 1.2.0');
     });
+
+    it('merges additionalReviewers', () => {
+      const upgrades = [
+        {
+          ...requiredDefaultOptions,
+          branchName: 'some-branch',
+          manager: 'some-manager',
+          additionalReviewers: ['foo'],
+        },
+        {
+          ...requiredDefaultOptions,
+          branchName: 'some-branch',
+          manager: 'some-manager',
+        },
+        {
+          ...requiredDefaultOptions,
+          branchName: 'some-branch',
+          manager: 'some-manager',
+          additionalReviewers: ['bar'],
+        },
+      ] satisfies BranchUpgradeConfig[];
+      const res = generateBranchConfig(upgrades);
+      expect(res.additionalReviewers).toEqual(['foo', 'bar']);
+    });
   });
 });
diff --git a/lib/workers/repository/updates/generate.ts b/lib/workers/repository/updates/generate.ts
@@ -9,6 +9,7 @@ import { newlineRegex, regEx } from '../../../util/regex';
 import { sanitize } from '../../../util/sanitize';
 import { safeStringify } from '../../../util/stringify';
 import * as template from '../../../util/template';
+import { uniq } from '../../../util/uniq';
 import type { BranchConfig, BranchUpgradeConfig } from '../../types';
 import { CommitMessage } from '../model/commit-message';
 
@@ -415,5 +416,14 @@ export function generateBranchConfig(
     }
     config.commitMessage += '\n\n' + mdTable(table) + '\n';
   }
+  const additionalReviewers = uniq(
+    config.upgrades
+      .map((upgrade) => upgrade.additionalReviewers)
+      .flat()
+      .filter(is.nonEmptyString)
+  );
+  if (additionalReviewers.length > 0) {
+    config.additionalReviewers = additionalReviewers;
+  }
   return config;
 }