From 4912f21ef6bd4a4db182ad2a453ada8ad503419c Mon Sep 17 00:00:00 2001 From: Alexander Zerbe Date: Sat, 20 Mar 2021 13:36:34 +0100 Subject: [PATCH 1/5] fix: adds locationAnalyzer to default-app template Signed-off-by: Alexander Zerbe --- .../default-app/packages/backend/src/plugins/catalog.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts index 883b70c587..1e8f5917b8 100644 --- a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts +++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts @@ -2,7 +2,8 @@ import { useHotCleanup } from '@backstage/backend-common'; import { CatalogBuilder, createRouter, - runPeriodically + runPeriodically, + locationAnalyzer, } from '@backstage/plugin-catalog-backend'; import { Router } from 'express'; import { PluginEnvironment } from '../types'; @@ -24,6 +25,7 @@ export default async function createPlugin(env: PluginEnvironment): Promise Date: Sun, 21 Mar 2021 11:17:17 +0100 Subject: [PATCH 2/5] fix: placement of locationAnalyzer definition Signed-off-by: Alexander Zerbe --- .../default-app/packages/backend/src/plugins/catalog.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts index 1e8f5917b8..556b385af3 100644 --- a/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts +++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts @@ -2,8 +2,7 @@ import { useHotCleanup } from '@backstage/backend-common'; import { CatalogBuilder, createRouter, - runPeriodically, - locationAnalyzer, + runPeriodically } from '@backstage/plugin-catalog-backend'; import { Router } from 'express'; import { PluginEnvironment } from '../types'; @@ -14,6 +13,7 @@ export default async function createPlugin(env: PluginEnvironment): Promise Date: Sun, 21 Mar 2021 11:40:43 +0100 Subject: [PATCH 3/5] adds changeset Signed-off-by: Alexander Zerbe --- .changeset/curly-fishes-speak.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .changeset/curly-fishes-speak.md diff --git a/.changeset/curly-fishes-speak.md b/.changeset/curly-fishes-speak.md new file mode 100644 index 0000000000..42f395ca30 --- /dev/null +++ b/.changeset/curly-fishes-speak.md @@ -0,0 +1,11 @@ +--- +'@backstage/create-app': patch +--- + +(fix) Adds locationAnalyzer to default-app template + +The locationAnalyzer was missing from the default-app template. +This resulted in 404 errors for newly bootstraped backstage applications, when adding components without configuration. + +To fix this in an existing backstage application, the locationAnalyzer needs to be added to the `packages/backend/src/plugins/catalog.ts` file. +Check out `/backstage/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts` for reference. From 9562dbb4835a207645a3b70f134700e5c86a2905 Mon Sep 17 00:00:00 2001 From: Alexander Zerbe Date: Sun, 21 Mar 2021 11:45:36 +0100 Subject: [PATCH 4/5] fix: typos in changeset Signed-off-by: Alexander Zerbe --- .changeset/curly-fishes-speak.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.changeset/curly-fishes-speak.md b/.changeset/curly-fishes-speak.md index 42f395ca30..6654855a46 100644 --- a/.changeset/curly-fishes-speak.md +++ b/.changeset/curly-fishes-speak.md @@ -5,7 +5,9 @@ (fix) Adds locationAnalyzer to default-app template The locationAnalyzer was missing from the default-app template. -This resulted in 404 errors for newly bootstraped backstage applications, when adding components without configuration. +This resulted in 404 errors in newly bootstrapped backstage applications, +when adding components without configuration. -To fix this in an existing backstage application, the locationAnalyzer needs to be added to the `packages/backend/src/plugins/catalog.ts` file. +To fix this in an existing backstage application, the locationAnalyzer needs +to be added to the `packages/backend/src/plugins/catalog.ts` file. Check out `/backstage/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts` for reference. From 4599a705aeb5d7044c4107bcc992c10105b42fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 24 Mar 2021 11:55:31 +0100 Subject: [PATCH 5/5] add a diff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/curly-fishes-speak.md | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.changeset/curly-fishes-speak.md b/.changeset/curly-fishes-speak.md index 6654855a46..8cd53daeb4 100644 --- a/.changeset/curly-fishes-speak.md +++ b/.changeset/curly-fishes-speak.md @@ -9,5 +9,23 @@ This resulted in 404 errors in newly bootstrapped backstage applications, when adding components without configuration. To fix this in an existing backstage application, the locationAnalyzer needs -to be added to the `packages/backend/src/plugins/catalog.ts` file. -Check out `/backstage/packages/create-app/templates/default-app/packages/backend/src/plugins/catalog.ts` for reference. +to be carried from the builder to the router in the +`packages/backend/src/plugins/catalog.ts` file. + +```diff + const builder = new CatalogBuilder(env); + const { + entitiesCatalog, + locationsCatalog, + higherOrderOperation, ++ locationAnalyzer, + } = await builder.build(); + // ... + return await createRouter({ + entitiesCatalog, + locationsCatalog, + higherOrderOperation, ++ locationAnalyzer, + logger: env.logger, + }); +```