fix(worker/autodiscover): retain repo order on filtering (#32402)

renovatebot · Nov 7, 2024 · 63151a4 · 63151a4
1 parent f66b8f9
commit 63151a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/workers/global/autodiscover.spec.ts b/lib/workers/global/autodiscover.spec.ts
@@ -167,9 +167,11 @@ describe('workers/global/autodiscover', () => {
     hostRules.find = jest.fn(() => ({
       token: 'abc',
     }));
+    // retains order
     const expectedRepositories = [
-      'another-project/repo',
       'department/dev/aProject',
+      'another-project/repo',
+      'department/dev/bProject',
     ];
     ghApi.getRepos = jest.fn(() =>
       Promise.resolve([

diff --git a/lib/workers/global/autodiscover.ts b/lib/workers/global/autodiscover.ts
@@ -51,6 +51,10 @@ export async function autodiscoverRepositories(
   }
 
   logger.debug(`Autodiscovered ${discovered.length} repositories`);
+  logger.trace(
+    { length: discovered.length, repositories: discovered },
+    `Autodiscovered repositories`,
+  );
 
   if (autodiscoverFilter) {
     logger.debug({ autodiscoverFilter }, 'Applying autodiscoverFilter');
@@ -116,5 +120,5 @@ export function applyFilters(repos: string[], filters: string[]): string[] {
       matched.add(repository);
     }
   }
-  return [...matched];
+  return repos.filter((repository) => matched.has(repository));
 }