From 645c64332ab9f27d2c351762fb6d58849a7c40e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 24 Nov 2023 09:41:59 +0100
Subject: [PATCH] removed has:annotations since that makes little sense - they
 are always there
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../filter/matrchers/createHasMatcher.test.ts   | 17 +++--------------
 .../alpha/filter/matrchers/createHasMatcher.ts  |  3 ---
 .../alpha/filter/parseFilterExpression.test.ts  |  2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.test.ts b/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.test.ts
index dbce5025b6..53524d228e 100644
--- a/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.test.ts
+++ b/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.test.ts
@@ -24,7 +24,6 @@ describe('createHasMatcher', () => {
   const empty2 = {
     metadata: {
       labels: {},
-      annotations: {},
       links: [],
     },
   } as unknown as Entity;
@@ -33,11 +32,6 @@ describe('createHasMatcher', () => {
       labels: { a: 'b' },
     },
   } as unknown as Entity;
-  const annotations = {
-    metadata: {
-      annotations: { a: 'b' },
-    },
-  } as unknown as Entity;
   const links = {
     metadata: { links: [{}] },
   } as unknown as Entity;
@@ -53,10 +47,6 @@ describe('createHasMatcher', () => {
     expect(createHasMatcher(['labels'], err)(empty2)).toBe(false);
     expect(createHasMatcher(['labels'], err)(labels)).toBe(true);
 
-    expect(createHasMatcher(['annotations'], err)(empty1)).toBe(false);
-    expect(createHasMatcher(['annotations'], err)(empty2)).toBe(false);
-    expect(createHasMatcher(['annotations'], err)(annotations)).toBe(true);
-
     expect(createHasMatcher(['links'], err)(empty1)).toBe(false);
     expect(createHasMatcher(['links'], err)(empty2)).toBe(false);
     expect(createHasMatcher(['links'], err)(links)).toBe(true);
@@ -69,7 +59,6 @@ describe('createHasMatcher', () => {
     expect(createHasMatcher(['labels', 'links'], err)(empty2)).toBe(false);
     expect(createHasMatcher(['labels', 'links'], err)(labels)).toBe(true);
     expect(createHasMatcher(['labels', 'links'], err)(links)).toBe(true);
-    expect(createHasMatcher(['labels', 'links'], err)(annotations)).toBe(false);
 
     expect(err).not.toHaveBeenCalled();
   });
@@ -81,7 +70,7 @@ describe('createHasMatcher', () => {
         throw e;
       }),
     ).toThrowErrorMatchingInlineSnapshot(
-      `"'bar' is not a valid parameter for 'has' filter expressions, expected one of 'labels','annotations','links'"`,
+      `"'bar' is not a valid parameter for 'has' filter expressions, expected one of 'labels','links'"`,
     );
     expect(err).not.toHaveBeenCalled();
 
@@ -90,12 +79,12 @@ describe('createHasMatcher', () => {
     expect(err).toHaveBeenCalledTimes(2);
     expect(err).toHaveBeenCalledWith(
       expect.objectContaining({
-        message: `'foo' is not a valid parameter for 'has' filter expressions, expected one of 'labels','annotations','links'`,
+        message: `'foo' is not a valid parameter for 'has' filter expressions, expected one of 'labels','links'`,
       }),
     );
     expect(err).toHaveBeenCalledWith(
       expect.objectContaining({
-        message: `'bar' is not a valid parameter for 'has' filter expressions, expected one of 'labels','annotations','links'`,
+        message: `'bar' is not a valid parameter for 'has' filter expressions, expected one of 'labels','links'`,
       }),
     );
     expect(matcher(empty1)).toBe(false);
diff --git a/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.ts b/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.ts
index 35a3f7baf7..9fd393a561 100644
--- a/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.ts
+++ b/plugins/catalog/src/alpha/filter/matrchers/createHasMatcher.ts
@@ -21,9 +21,6 @@ const allowedMatchers: Record<string, EntityMatcherFn> = {
   labels: entity => {
     return Object.keys(entity.metadata.labels ?? {}).length > 0;
   },
-  annotations: entity => {
-    return Object.keys(entity.metadata.annotations ?? {}).length > 0;
-  },
   links: entity => {
     return (entity.metadata.links ?? []).length > 0;
   },
diff --git a/plugins/catalog/src/alpha/filter/parseFilterExpression.test.ts b/plugins/catalog/src/alpha/filter/parseFilterExpression.test.ts
index d1335524b4..616091739e 100644
--- a/plugins/catalog/src/alpha/filter/parseFilterExpression.test.ts
+++ b/plugins/catalog/src/alpha/filter/parseFilterExpression.test.ts
@@ -89,7 +89,7 @@ describe('parseFilterExpression', () => {
     expect(run('has:labels,links')(annotations)).toBe(false);
 
     expect(() => run('has:labels,bar')).toThrowErrorMatchingInlineSnapshot(
-      `"'bar' is not a valid parameter for 'has' filter expressions, expected one of 'labels','annotations','links'"`,
+      `"'bar' is not a valid parameter for 'has' filter expressions, expected one of 'labels','links'"`,
     );
   });