From 325be576eadd1be19de3bbf10c22bbe0407eb68e Mon Sep 17 00:00:00 2001
From: Iain Billett <iain@roadie.io>
Date: Wed, 17 Nov 2021 17:37:18 +0000
Subject: [PATCH] Actually use the entity filters

Signed-off-by: Iain Billett <iain@roadie.io>
---
 .../fact/factRetrievers/entityMetadataFactRetriever.ts   | 4 ++--
 .../fact/factRetrievers/entityOwnershipFactRetriever.ts  | 9 +++------
 .../service/fact/factRetrievers/techdocsFactRetriever.ts | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts
index d6d4752adb..535aede115 100644
--- a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts
+++ b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityMetadataFactRetriever.ts
@@ -44,11 +44,11 @@ export const entityMetadataFactRetriever: FactRetriever = {
       description: 'The entity has tags in metadata',
     },
   },
-  handler: async ({ discovery }: FactRetrieverContext) => {
+  handler: async ({ discovery, entityFilter }: FactRetrieverContext) => {
     const catalogClient = new CatalogClient({
       discoveryApi: discovery,
     });
-    const entities = await catalogClient.getEntities();
+    const entities = await catalogClient.getEntities({ filter: entityFilter });
 
     return entities.items.map((entity: Entity) => {
       return {
diff --git a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts
index 5dd3abfaa0..8f61f182ad 100644
--- a/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts
+++ b/plugins/tech-insights-backend/src/service/fact/factRetrievers/entityOwnershipFactRetriever.ts
@@ -30,10 +30,7 @@ export const entityOwnershipFactRetriever: FactRetriever = {
   id: 'entityOwnershipFactRetriever',
   version: '0.0.1',
   entityFilter: [
-    {
-      field: 'kind',
-      values: ['component', 'domain', 'system', 'api', 'resource', 'template'],
-    },
+    { kind: ['component', 'domain', 'system', 'api', 'resource', 'template'] },
   ],
   schema: {
     hasOwner: {
@@ -45,11 +42,11 @@ export const entityOwnershipFactRetriever: FactRetriever = {
       description: 'The spec.owner field is set and refers to a group',
     },
   },
-  handler: async ({ discovery }: FactRetrieverContext) => {
+  handler: async ({ discovery, entityFilter }: FactRetrieverContext) => {
     const catalogClient = new CatalogClient({
       discoveryApi: discovery,
     });
-    const entities = await catalogClient.getEntities();
+    const entities = await catalogClient.getEntities({ filter: entityFilter });
 
     return entities.items.map((entity: Entity) => {
       return {
diff --git a/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts b/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts
index e5a872c703..c1c3ba5d20 100644
--- a/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts
+++ b/plugins/tech-insights-backend/src/service/fact/factRetrievers/techdocsFactRetriever.ts
@@ -40,11 +40,11 @@ export const techdocsFactRetriever: FactRetriever = {
       description: 'The entity has a title in metadata',
     },
   },
-  handler: async ({ discovery }: FactRetrieverContext) => {
+  handler: async ({ discovery, entityFilter }: FactRetrieverContext) => {
     const catalogClient = new CatalogClient({
       discoveryApi: discovery,
     });
-    const entities = await catalogClient.getEntities();
+    const entities = await catalogClient.getEntities({ filter: entityFilter });
 
     return entities.items.map((entity: Entity) => {
       return {