From 22736b6156e491542b74c5c3ccb0235a5c80a7f0 Mon Sep 17 00:00:00 2001 From: Raghunandan Balachandran Date: Wed, 24 Jul 2024 09:36:32 +0200 Subject: [PATCH 1/7] Update project areas and codeowners Signed-off-by: Raghunandan Balachandran --- .github/CODEOWNERS | 16 +++++++--------- OWNERS.md | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9cd3bc0690..a0c83a42bd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -9,10 +9,10 @@ yarn.lock @backstage/maintainers @backst */yarn.lock @backstage/maintainers @backstage-service /.changeset/*.md /beps/0001-notifications-system @backstage/maintainers @backstage/notifications-maintainers -/docs/assets/search @backstage/discoverability-maintainers -/docs/features/search @backstage/discoverability-maintainers +/docs/assets/search @backstage/search-maintainers +/docs/features/search @backstage/search-maintainers /docs/features/techdocs @backstage/techdocs-maintainers -/docs/plugins/integrating-search-into-plugins.md @backstage/discoverability-maintainers +/docs/plugins/integrating-search-into-plugins.md @backstage/search-maintainers /packages/cli/src/commands/onboard @backstage/sharks /packages/backend-openapi-utils @backstage/maintainers @backstage/reviewers @backstage/openapi-tooling-maintainers /packages/techdocs-cli @backstage/techdocs-maintainers @@ -50,8 +50,8 @@ yarn.lock @backstage/maintainers @backst /plugins/explore-react @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers /plugins/fossa @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers /plugins/git-release-manager @backstage/maintainers @backstage/reviewers @erikengervall -/plugins/home @backstage/discoverability-maintainers -/plugins/home-* @backstage/discoverability-maintainers +/plugins/home @backstage/home-maintainers +/plugins/home-* @backstage/home-maintainers /plugins/kafka @backstage/maintainers @backstage/reviewers @andrewthauer /plugins/kafka-backend @backstage/maintainers @backstage/reviewers @andrewthauer /plugins/kubernetes @backstage/kubernetes-maintainers @@ -70,13 +70,11 @@ yarn.lock @backstage/maintainers @backst /plugins/rollbar-backend @backstage/maintainers @backstage/reviewers @andrewthauer /plugins/scaffolder @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers /plugins/scaffolder-* @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers -/plugins/search @backstage/discoverability-maintainers -/plugins/search-* @backstage/discoverability-maintainers +/plugins/search @backstage/search-maintainers +/plugins/search-* @backstage/search-maintainers /plugins/signals @backstage/maintainers @backstage/notifications-maintainers /plugins/signals-* @backstage/maintainers @backstage/notifications-maintainers /plugins/sonarqube @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers -/plugins/stack-overflow @backstage/discoverability-maintainers -/plugins/stack-overflow-backend @backstage/discoverability-maintainers /plugins/techdocs @backstage/techdocs-maintainers /plugins/techdocs-* @backstage/techdocs-maintainers /plugins/user-settings-backend @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers diff --git a/OWNERS.md b/OWNERS.md index 5012181d21..53113ac84d 100644 --- a/OWNERS.md +++ b/OWNERS.md @@ -32,11 +32,11 @@ Scope: The catalog plugin and catalog model | Patrik Oldsberg | Spotify | Cubic Belugas | [Rugvip](https://github.com/Rugvip) | `Rugvip#0019` | | Vincenzo Scamporlino | Spotify | Cubic Belugas | [vinzscam](http://github.com/vinzscam) | `vinzscam#6944` | -### Discoverability +### Home -Team: @backstage/discoverability-maintainers +Team: @backstage/home-maintainers -Scope: Discoverability within Backstage, including the home page, information architecture, and search +Scope: The Backstage home page and information architecture | Name | Organization | Team | GitHub | Discord | | ------------------------ | ------------ | -------------- | ---------------------------------------- | ----------------- | @@ -46,6 +46,18 @@ Scope: Discoverability within Backstage, including the home page, information ar | Raghunandan Balachandran | Spotify | Infinite Buck$ | [soapraj](http://github.com/soapraj) | raghunandanb#1114 | | Bailey Brooks | Spotify | Infinite Buck$ | [bailey](http://github.com/bailey) | \_bailey4 | +### Search + +Team: @backstage/search-maintainers + +Scope: The Backstage Search plugin + +| Name | Organization | Team | GitHub | Discord | +| ------------------------ | ------------ | -------------- | ----------------------------------------------| ----------------- | +| Emma Indal | Spotify | Infinite Buck$ | [emmaindal](http://github.com/emmaindal) | emmaindal#7503 | +| Raghunandan Balachandran | Spotify | Infinite Buck$ | [soapraj](http://github.com/soapraj) | raghunandanb#1114 | +| Alex Lorenzi | Spotify | ProTean | [AlexLorenzi](https://github.com/AlexLorenzi) | alexlorenzi | + ### Helm Charts Team: @backstage/helm-chart-maintainers From 518d03fa77197bf15981e99603b892e4046fca68 Mon Sep 17 00:00:00 2001 From: Raghunandan Balachandran Date: Wed, 24 Jul 2024 09:36:57 +0200 Subject: [PATCH 2/7] Update github workflows Signed-off-by: Raghunandan Balachandran --- .github/issue-labeler.yml | 2 +- .github/labeler.yml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml index 6d74ce8902..c6c6ef115f 100644 --- a/.github/issue-labeler.yml +++ b/.github/issue-labeler.yml @@ -1,6 +1,6 @@ area:techdocs: - '/(techdocs|tech-docs|tech docs)/i' -area:discoverability: +area:search: - '/search/i' area:events: - '/events/i' diff --git a/.github/labeler.yml b/.github/labeler.yml index a58da1d2f7..e6568091b8 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -4,7 +4,11 @@ area:catalog: - plugins/catalog/**/* - plugins/catalog-*/**/* - packages/catalog-*/**/* -area:discoverability: # search + home +area:home: + - changed-files: + - any-glob-to-any-file: + - plugins/home/**/* +area:search: - changed-files: - any-glob-to-any-file: - plugins/search/**/* From c085f90135657dd9b7d4cba58cb9d19c3af0d1d0 Mon Sep 17 00:00:00 2001 From: Raghunandan Balachandran Date: Wed, 24 Jul 2024 09:37:23 +0200 Subject: [PATCH 3/7] Update home plugin ownership Signed-off-by: Raghunandan Balachandran --- plugins/home-react/catalog-info.yaml | 2 +- plugins/home/catalog-info.yaml | 2 +- plugins/home/src/plugin.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/home-react/catalog-info.yaml b/plugins/home-react/catalog-info.yaml index 28109b9ddc..7022206fb9 100644 --- a/plugins/home-react/catalog-info.yaml +++ b/plugins/home-react/catalog-info.yaml @@ -9,4 +9,4 @@ metadata: spec: lifecycle: experimental type: backstage-web-library - owner: discoverability-maintainers + owner: home-maintainers diff --git a/plugins/home/catalog-info.yaml b/plugins/home/catalog-info.yaml index 1b23d4b83b..eefc114313 100644 --- a/plugins/home/catalog-info.yaml +++ b/plugins/home/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: experimental type: backstage-frontend-plugin - owner: discoverability-maintainers + owner: home-maintainers diff --git a/plugins/home/src/plugin.test.ts b/plugins/home/src/plugin.test.ts index 1526bd0c61..904481c98e 100644 --- a/plugins/home/src/plugin.test.ts +++ b/plugins/home/src/plugin.test.ts @@ -24,7 +24,7 @@ describe('home', () => { // Temporarily ensure we are installing a working version of the react-grid-layout library // For more details, see: https://github.com/react-grid-layout/react-grid-layout/issues/1959 - // TODO(@backstage/discoverability-maintainers): Delete this once the sub-dependency issue has been resolved. + // TODO(@backstage/home-maintainers): Delete this once the sub-dependency issue has been resolved. it('should pin react-grid-layout version to 1.3.4', async () => { expect(packageJson.dependencies['react-grid-layout']).toBe('1.3.4'); }); From 8ecb7a5e84128f257b26b5cf9941906f0ad2f734 Mon Sep 17 00:00:00 2001 From: Raghunandan Balachandran Date: Wed, 24 Jul 2024 09:37:39 +0200 Subject: [PATCH 4/7] Update search plugin ownership Signed-off-by: Raghunandan Balachandran --- plugins/search-backend-module-catalog/catalog-info.yaml | 2 +- plugins/search-backend-module-elasticsearch/catalog-info.yaml | 2 +- .../src/engines/ElasticSearchSearchEngine.ts | 2 +- plugins/search-backend-module-explore/catalog-info.yaml | 2 +- plugins/search-backend-module-pg/catalog-info.yaml | 2 +- .../src/PgSearchEngine/PgSearchEngineIndexer.ts | 2 +- .../catalog-info.yaml | 2 +- plugins/search-backend-module-techdocs/catalog-info.yaml | 2 +- plugins/search-backend-node/catalog-info.yaml | 2 +- plugins/search-backend/catalog-info.yaml | 2 +- plugins/search-common/catalog-info.yaml | 2 +- plugins/search-react/catalog-info.yaml | 2 +- plugins/search/catalog-info.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/search-backend-module-catalog/catalog-info.yaml b/plugins/search-backend-module-catalog/catalog-info.yaml index d36627848e..c826ea3edf 100644 --- a/plugins/search-backend-module-catalog/catalog-info.yaml +++ b/plugins/search-backend-module-catalog/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: experimental type: backstage-backend-plugin-module - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-backend-module-elasticsearch/catalog-info.yaml b/plugins/search-backend-module-elasticsearch/catalog-info.yaml index 300d1034c9..f2ee291f2b 100644 --- a/plugins/search-backend-module-elasticsearch/catalog-info.yaml +++ b/plugins/search-backend-module-elasticsearch/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: production type: backstage-backend-plugin-module - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts index 93312c9fba..0832aaea85 100644 --- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts +++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts @@ -313,7 +313,7 @@ export class ElasticSearchSearchEngine implements SearchEngine { }); // Attempt cleanup upon failure. - // todo(@backstage/discoverability-maintainers): Consider introducing a more + // todo(@backstage/search-maintainers): Consider introducing a more // formal mechanism for handling such errors in BatchSearchEngineIndexer and // replacing this handler with it. See: #17291 indexer.on('error', async e => { diff --git a/plugins/search-backend-module-explore/catalog-info.yaml b/plugins/search-backend-module-explore/catalog-info.yaml index 237e7a0f98..51ebb70df9 100644 --- a/plugins/search-backend-module-explore/catalog-info.yaml +++ b/plugins/search-backend-module-explore/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: experimental type: backstage-backend-plugin-module - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-backend-module-pg/catalog-info.yaml b/plugins/search-backend-module-pg/catalog-info.yaml index 47b9717882..eae771518e 100644 --- a/plugins/search-backend-module-pg/catalog-info.yaml +++ b/plugins/search-backend-module-pg/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: experimental type: backstage-backend-plugin-module - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts index ab5ae8be54..c460889bd4 100644 --- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts +++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts @@ -104,7 +104,7 @@ export class PgSearchEngineIndexer extends BatchSearchEngineIndexer { * therefore an open connection to PG. This handler ensures we close the * transaction and associated connection. * - * todo(@backstage/discoverability-maintainers): Consider introducing a more + * todo(@backstage/search-maintainers): Consider introducing a more * formal mechanism for handling such errors in BatchSearchEngineIndexer and * replacing this method with it. See: #17291 * diff --git a/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml b/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml index ed73bd0eca..9d77a5a00d 100644 --- a/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml +++ b/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: experimental type: backstage-backend-plugin-module - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-backend-module-techdocs/catalog-info.yaml b/plugins/search-backend-module-techdocs/catalog-info.yaml index a0bbfc5bb7..11a14c8dc3 100644 --- a/plugins/search-backend-module-techdocs/catalog-info.yaml +++ b/plugins/search-backend-module-techdocs/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: experimental type: backstage-backend-plugin-module - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-backend-node/catalog-info.yaml b/plugins/search-backend-node/catalog-info.yaml index 5f6b36256f..7d3629bd20 100644 --- a/plugins/search-backend-node/catalog-info.yaml +++ b/plugins/search-backend-node/catalog-info.yaml @@ -9,4 +9,4 @@ metadata: spec: lifecycle: production type: backstage-node-library - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-backend/catalog-info.yaml b/plugins/search-backend/catalog-info.yaml index 2b8c7ee346..977ad12539 100644 --- a/plugins/search-backend/catalog-info.yaml +++ b/plugins/search-backend/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: production type: backstage-backend-plugin - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-common/catalog-info.yaml b/plugins/search-common/catalog-info.yaml index d7e77a8d10..d1d9c4909c 100644 --- a/plugins/search-common/catalog-info.yaml +++ b/plugins/search-common/catalog-info.yaml @@ -9,4 +9,4 @@ metadata: spec: lifecycle: production type: backstage-common-library - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search-react/catalog-info.yaml b/plugins/search-react/catalog-info.yaml index 799b3d19c3..c6c39dcb0d 100644 --- a/plugins/search-react/catalog-info.yaml +++ b/plugins/search-react/catalog-info.yaml @@ -6,4 +6,4 @@ metadata: spec: lifecycle: production type: backstage-web-library - owner: discoverability-maintainers + owner: search-maintainers diff --git a/plugins/search/catalog-info.yaml b/plugins/search/catalog-info.yaml index e1e4ae21da..cb2d5f3641 100644 --- a/plugins/search/catalog-info.yaml +++ b/plugins/search/catalog-info.yaml @@ -7,4 +7,4 @@ metadata: spec: lifecycle: production type: backstage-frontend-plugin - owner: discoverability-maintainers + owner: search-maintainers From 4dfd3c18f5572ec8f657186db0088b829fbcdfa2 Mon Sep 17 00:00:00 2001 From: Raghunandan Balachandran Date: Wed, 24 Jul 2024 10:53:58 +0200 Subject: [PATCH 5/7] Add changeset Signed-off-by: Raghunandan Balachandran --- .changeset/yellow-clocks-fail.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .changeset/yellow-clocks-fail.md diff --git a/.changeset/yellow-clocks-fail.md b/.changeset/yellow-clocks-fail.md new file mode 100644 index 0000000000..36e2d4b804 --- /dev/null +++ b/.changeset/yellow-clocks-fail.md @@ -0,0 +1,17 @@ +--- +'@backstage/plugin-search-backend-module-stack-overflow-collator': patch +'@backstage/plugin-search-backend-module-elasticsearch': patch +'@backstage/plugin-search-backend-module-techdocs': patch +'@backstage/plugin-search-backend-module-catalog': patch +'@backstage/plugin-search-backend-module-explore': patch +'@backstage/plugin-search-backend-module-pg': patch +'@backstage/plugin-search-backend-node': patch +'@backstage/plugin-search-backend': patch +'@backstage/plugin-search-common': patch +'@backstage/plugin-search-react': patch +'@backstage/plugin-home-react': patch +'@backstage/plugin-search': patch +'@backstage/plugin-home': patch +--- + +Update ownership for home and search plugins From c64c46769a3782b6442db8497eca812dfd92c47f Mon Sep 17 00:00:00 2001 From: Raghunandan Balachandran Date: Wed, 24 Jul 2024 14:40:03 +0200 Subject: [PATCH 6/7] Prettier fix Signed-off-by: Raghunandan Balachandran --- OWNERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS.md b/OWNERS.md index 53113ac84d..b145205539 100644 --- a/OWNERS.md +++ b/OWNERS.md @@ -53,7 +53,7 @@ Team: @backstage/search-maintainers Scope: The Backstage Search plugin | Name | Organization | Team | GitHub | Discord | -| ------------------------ | ------------ | -------------- | ----------------------------------------------| ----------------- | +| ------------------------ | ------------ | -------------- | --------------------------------------------- | ----------------- | | Emma Indal | Spotify | Infinite Buck$ | [emmaindal](http://github.com/emmaindal) | emmaindal#7503 | | Raghunandan Balachandran | Spotify | Infinite Buck$ | [soapraj](http://github.com/soapraj) | raghunandanb#1114 | | Alex Lorenzi | Spotify | ProTean | [AlexLorenzi](https://github.com/AlexLorenzi) | alexlorenzi | From edc977dd9647122f5d7203860ae1f68f9cfa0c04 Mon Sep 17 00:00:00 2001 From: Ben Lambert Date: Mon, 29 Jul 2024 13:36:06 +0200 Subject: [PATCH 7/7] Delete .changeset/yellow-clocks-fail.md Signed-off-by: Ben Lambert --- .changeset/yellow-clocks-fail.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .changeset/yellow-clocks-fail.md diff --git a/.changeset/yellow-clocks-fail.md b/.changeset/yellow-clocks-fail.md deleted file mode 100644 index 36e2d4b804..0000000000 --- a/.changeset/yellow-clocks-fail.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -'@backstage/plugin-search-backend-module-stack-overflow-collator': patch -'@backstage/plugin-search-backend-module-elasticsearch': patch -'@backstage/plugin-search-backend-module-techdocs': patch -'@backstage/plugin-search-backend-module-catalog': patch -'@backstage/plugin-search-backend-module-explore': patch -'@backstage/plugin-search-backend-module-pg': patch -'@backstage/plugin-search-backend-node': patch -'@backstage/plugin-search-backend': patch -'@backstage/plugin-search-common': patch -'@backstage/plugin-search-react': patch -'@backstage/plugin-home-react': patch -'@backstage/plugin-search': patch -'@backstage/plugin-home': patch ---- - -Update ownership for home and search plugins