Support Nullable resources

kyverno · May 12, 2021 · 1a27dc5 · 1a27dc5
1 parent c5e7f9e
commit 1a27dc5
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 deletions.
diff --git a/frontend/src/api.ts b/frontend/src/api.ts
@@ -32,6 +32,8 @@ export default {
   async plugins(): Promise<string[]> {
     const { data } = await instance.get('plugins');
 
+    if (!data) return [];
+
     return data;
   },
 };
diff --git a/frontend/src/components/ClusterPolicyTable.vue b/frontend/src/components/ClusterPolicyTable.vue
@@ -91,7 +91,7 @@ export default Vue.extend<Data, {}, Computed, Props>({
   data: () => ({ open: true, search: '', expanded: [] }),
   computed: {
     items(): Item[] {
-      return this.results.map((result: Result) => ({ ...result, id: result.policy + result.rule + result.resource.uid }));
+      return this.results.map((result: Result) => ({ ...result, id: result.policy + result.rule + result?.resource?.uid }));
     },
     headers(): DataTableHeader[] {
       return [

diff --git a/frontend/src/components/PolicyStatusPerNamespace.vue b/frontend/src/components/PolicyStatusPerNamespace.vue
@@ -60,6 +60,10 @@ export default Vue.extend<{ show: boolean }, {}, { renderHeight: number; height:
     },
     options() {
       const unordnered = this.results.reduce<{ [namspace: string]: number }>((acc, item) => {
+        if (!item.resource) {
+          return acc;
+        }
+
         if (!item.resource.namespace) {
           return acc;
         }

diff --git a/frontend/src/components/PolicyTable.vue b/frontend/src/components/PolicyTable.vue
@@ -94,7 +94,7 @@ export default Vue.extend<Data, Methods, Computed, Props>({
   data: () => ({ open: true, search: '', expanded: [] }),
   computed: {
     items(): Item[] {
-      return this.results.map((result: Result) => ({ ...result, id: result.policy + result.rule + result.resource.uid }));
+      return this.results.map((result: Result) => ({ ...result, id: result.policy + result.rule + result?.resource?.uid }));
     },
     headers(): DataTableHeader[] {
       return [

diff --git a/frontend/src/models.ts b/frontend/src/models.ts
@@ -46,7 +46,7 @@ export type Result = {
     severity?: string;
     category?: string;
     scored: boolean;
-    resource: Resource;
+    resource?: Resource;
 }
 
 export type PolicyReport = {

diff --git a/frontend/src/views/ClusterPolicyReport.vue b/frontend/src/views/ClusterPolicyReport.vue
@@ -165,11 +165,17 @@ export default Vue.extend<Data, Methods, Computed, {}>({
       }, {}));
     },
     availableKinds(): string[] {
-      return Object.keys(this.results.reduce<{ [kind: string]: boolean }>((c, r) => ({ ...c, [r.resource.kind]: true }), {}));
+      return Object.keys(this.results.reduce<{ [kind: string]: boolean }>((c, r) => {
+        if (!r.resource) {
+          return c;
+        }
+
+        return { ...c, [r.resource.kind]: true };
+      }, {}));
     },
     filteredResults(): Result[] {
       return this.results.filter((result) => {
-        if (this.kinds.length > 0 && !this.kinds.includes(result.resource.kind)) return false;
+        if (this.kinds.length > 0 && result.resource && !this.kinds.includes(result.resource.kind)) return false;
 
         if (this.categories.length > 0 && !this.categories.includes(result.category || '')) return false;
 

diff --git a/frontend/src/views/PolicyReport.vue b/frontend/src/views/PolicyReport.vue
@@ -193,16 +193,22 @@ export default Vue.extend<Data, Methods, Computed, {}>({
       }, {}));
     },
     availableKinds(): string[] {
-      return Object.keys(this.results.reduce<{ [kind: string]: boolean }>((c, r) => ({ ...c, [r.resource.kind]: true }), {}));
+      return Object.keys(this.results.reduce<{ [kind: string]: boolean }>((c, r) => {
+        if (!r.resource) {
+          return c;
+        }
+
+        return { ...c, [r.resource.kind]: true };
+      }, {}));
     },
     results(): Result[] {
       return flatResults(this.policies, this.globalPolicyMap);
     },
     filteredResults(): Result[] {
       return this.results.filter((result) => {
-        if (this.namespaces.length > 0 && !this.namespaces.includes(result.resource.namespace as string)) return false;
+        if (this.namespaces.length > 0 && result.resource && !this.namespaces.includes(result.resource.namespace as string)) return false;
 
-        if (this.kinds.length > 0 && !this.kinds.includes(result.resource.kind)) return false;
+        if (this.kinds.length > 0 && result.resource && !this.kinds.includes(result.resource.kind)) return false;
 
         if (this.categories.length > 0 && !this.categories.includes(result.category || '')) return false;