From 24e47ef1e3b1d84ea7ef0cf8f24fd9477374c22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 1 Feb 2021 10:17:42 +0100
Subject: [PATCH] catalog-backend: throw correct error for not allowed entities

---
 .changeset/poor-ligers-flow.md                           | 5 +++++
 plugins/catalog-backend/src/ingestion/LocationReaders.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/poor-ligers-flow.md

diff --git a/.changeset/poor-ligers-flow.md b/.changeset/poor-ligers-flow.md
new file mode 100644
index 0000000000..1c3a8a742b
--- /dev/null
+++ b/.changeset/poor-ligers-flow.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Throw `NotAllowedError` when registering locations with entities of disallowed kinds
diff --git a/plugins/catalog-backend/src/ingestion/LocationReaders.ts b/plugins/catalog-backend/src/ingestion/LocationReaders.ts
index 046b6bdf76..a789e669d0 100644
--- a/plugins/catalog-backend/src/ingestion/LocationReaders.ts
+++ b/plugins/catalog-backend/src/ingestion/LocationReaders.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { UrlReader } from '@backstage/backend-common';
+import { NotAllowedError, UrlReader } from '@backstage/backend-common';
 import {
   Entity,
   EntityPolicy,
@@ -102,7 +102,7 @@ export class LocationReaders implements LocationReader {
           } else {
             output.errors.push({
               location: item.location,
-              error: new Error(
+              error: new NotAllowedError(
                 `Entity of kind ${item.entity.kind} is not allowed from location ${item.location.type} ${item.location.target}`,
               ),
             });