From 844757ef480a636733fba2d151727a4455a0fdc5 Mon Sep 17 00:00:00 2001 From: Tim Harris Date: Fri, 12 Aug 2022 12:18:48 -0400 Subject: [PATCH 1/6] Fixing issue #13126 Fixing evaluation grouping with ternary. Regex match was returning all archived repos as matching along with the ones that actually matched. Signed-off-by: Tim Harris Signed-off-by: Tim Harris --- .../src/providers/GitHubEntityProvider.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts index 991b380112..346d4d9097 100644 --- a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts +++ b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts @@ -185,9 +185,9 @@ export class GitHubEntityProvider implements EntityProvider { const repositoryFilter = this.config.filters?.repository; const matchingRepositories = repositories.filter(r => { - return !r.isArchived && repositoryFilter + return !r.isArchived && ( repositoryFilter ? repositoryFilter?.test(r.name) - : true && r.defaultBranchRef?.name; + : true && r.defaultBranchRef?.name) ; }); return matchingRepositories; } From 62bf7826546b4be8daae32b3651cc2971a55d9ee Mon Sep 17 00:00:00 2001 From: Tim Harris Date: Fri, 12 Aug 2022 12:20:15 -0400 Subject: [PATCH 2/6] Removing extra space Signed-off-by: Tim Harris Signed-off-by: Tim Harris --- .../src/providers/GitHubEntityProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts index 346d4d9097..35d2b66de5 100644 --- a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts +++ b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts @@ -185,7 +185,7 @@ export class GitHubEntityProvider implements EntityProvider { const repositoryFilter = this.config.filters?.repository; const matchingRepositories = repositories.filter(r => { - return !r.isArchived && ( repositoryFilter + return !r.isArchived && (repositoryFilter ? repositoryFilter?.test(r.name) : true && r.defaultBranchRef?.name) ; }); From 341d50570e4e6f7ab6bcd571d8335134fe945a99 Mon Sep 17 00:00:00 2001 From: Tim Harris Date: Fri, 12 Aug 2022 12:28:42 -0400 Subject: [PATCH 3/6] Removing extra whitespace Signed-off-by: Tim Harris Signed-off-by: Tim Harris --- .../src/providers/GitHubEntityProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts index 35d2b66de5..ec7e598327 100644 --- a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts +++ b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts @@ -187,7 +187,7 @@ export class GitHubEntityProvider implements EntityProvider { const matchingRepositories = repositories.filter(r => { return !r.isArchived && (repositoryFilter ? repositoryFilter?.test(r.name) - : true && r.defaultBranchRef?.name) ; + : true && r.defaultBranchRef?.name); }); return matchingRepositories; } From a63ffec08af50772d61681660b8439413fb8a10b Mon Sep 17 00:00:00 2001 From: Tim Harris Date: Fri, 12 Aug 2022 13:13:16 -0400 Subject: [PATCH 4/6] Apply Prettier formatting Signed-off-by: Tim Harris --- .../src/providers/GitHubEntityProvider.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts index ec7e598327..e47ed62890 100644 --- a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts +++ b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts @@ -185,9 +185,12 @@ export class GitHubEntityProvider implements EntityProvider { const repositoryFilter = this.config.filters?.repository; const matchingRepositories = repositories.filter(r => { - return !r.isArchived && (repositoryFilter - ? repositoryFilter?.test(r.name) - : true && r.defaultBranchRef?.name); + return ( + !r.isArchived && + (repositoryFilter + ? repositoryFilter?.test(r.name) + : true && r.defaultBranchRef?.name) + ); }); return matchingRepositories; } From c59d1ce48796b2ae99272fd97f3fb957a2c6cf31 Mon Sep 17 00:00:00 2001 From: Tim Harris Date: Fri, 12 Aug 2022 13:16:18 -0400 Subject: [PATCH 5/6] Adding changeset Signed-off-by: Tim Harris --- .changeset/serious-flowers-smash.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/serious-flowers-smash.md diff --git a/.changeset/serious-flowers-smash.md b/.changeset/serious-flowers-smash.md new file mode 100644 index 0000000000..274250b1dd --- /dev/null +++ b/.changeset/serious-flowers-smash.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend-module-github': patch +--- + +Fixed bug where repository filter was including all archived repositories From 19066cd1ced6a96a6da19a3b2c2822af18308d70 Mon Sep 17 00:00:00 2001 From: Tim Harris Date: Mon, 15 Aug 2022 08:58:11 -0400 Subject: [PATCH 6/6] Update GitHubEntityProvider.ts Signed-off-by: Tim Harris --- .../src/providers/GitHubEntityProvider.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts index e47ed62890..eb5b9d67e2 100644 --- a/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts +++ b/plugins/catalog-backend-module-github/src/providers/GitHubEntityProvider.ts @@ -187,9 +187,8 @@ export class GitHubEntityProvider implements EntityProvider { const matchingRepositories = repositories.filter(r => { return ( !r.isArchived && - (repositoryFilter - ? repositoryFilter?.test(r.name) - : true && r.defaultBranchRef?.name) + (!repositoryFilter || repositoryFilter.test(r.name)) && + r.defaultBranchRef?.name ); }); return matchingRepositories;