From 61a552fac6133af81be6ee1d59aeec29240ef53e Mon Sep 17 00:00:00 2001
From: Moustafa Baiou <moustafab.ccit@gmail.com>
Date: Tue, 20 Oct 2020 00:49:23 -0400
Subject: [PATCH] fix type checks

---
 .../src/service/KubernetesFetcher.ts          | 29 ++++---------------
 .../src/api/KubernetesBackendClient.ts        |  5 +++-
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
index a1ed21552b..11917efc52 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
@@ -113,7 +113,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   ): Promise<FetchResponseWrapper> {
     const fetchResults = Array.from(objectTypesToFetch).map(type => {
       return this.fetchByObjectType(
-        serviceId,
         clusterDetails,
         type,
         labelSelector.length !== 0
@@ -127,54 +126,45 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
 
   // TODO could probably do with a tidy up
   private fetchByObjectType(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     type: KubernetesObjectTypes,
     labelSelector: string,
   ): Promise<FetchResponse> {
     switch (type) {
       case 'pods':
-        return this.fetchPodsForService(
-          serviceId,
-          clusterDetails,
-          labelSelector,
-        ).then(r => ({
-          type: type,
-          resources: r,
-        }));
+        return this.fetchPodsForService(clusterDetails, labelSelector).then(
+          r => ({
+            type: type,
+            resources: r,
+          }),
+        );
       case 'configmaps':
         return this.fetchConfigMapsForService(
-          serviceId,
           clusterDetails,
           labelSelector,
         ).then(r => ({ type: type, resources: r }));
       case 'deployments':
         return this.fetchDeploymentsForService(
-          serviceId,
           clusterDetails,
           labelSelector,
         ).then(r => ({ type: type, resources: r }));
       case 'replicasets':
         return this.fetchReplicaSetsForService(
-          serviceId,
           clusterDetails,
           labelSelector,
         ).then(r => ({ type: type, resources: r }));
       case 'services':
         return this.fetchServicesForService(
-          serviceId,
           clusterDetails,
           labelSelector,
         ).then(r => ({ type: type, resources: r }));
       case 'horizontalpodautoscalers':
         return this.fetchHorizontalPodAutoscalersForService(
-          serviceId,
           clusterDetails,
           labelSelector,
         ).then(r => ({ type: type, resources: r }));
       case 'ingresses':
         return this.fetchIngressesForService(
-          serviceId,
           clusterDetails,
           labelSelector,
         ).then(r => ({ type: type, resources: r }));
@@ -210,7 +200,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   }
 
   private fetchServicesForService(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     labelSelector: string,
   ): Promise<Array<V1Service>> {
@@ -220,7 +209,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   }
 
   private fetchPodsForService(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     labelSelector: string,
   ): Promise<Array<V1Pod>> {
@@ -230,7 +218,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   }
 
   private fetchConfigMapsForService(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     labelSelector: string,
   ): Promise<Array<V1ConfigMap>> {
@@ -240,7 +227,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   }
 
   private fetchDeploymentsForService(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     labelSelector: string,
   ): Promise<Array<V1Deployment>> {
@@ -250,7 +236,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   }
 
   private fetchReplicaSetsForService(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     labelSelector: string,
   ): Promise<Array<V1ReplicaSet>> {
@@ -260,7 +245,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   }
 
   private fetchHorizontalPodAutoscalersForService(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     labelSelector: string,
   ): Promise<Array<V1HorizontalPodAutoscaler>> {
@@ -277,7 +261,6 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
   }
 
   private fetchIngressesForService(
-    serviceId: string,
     clusterDetails: ClusterDetails,
     labelSelector: string,
   ): Promise<Array<ExtensionsV1beta1Ingress>> {
diff --git a/plugins/kubernetes/src/api/KubernetesBackendClient.ts b/plugins/kubernetes/src/api/KubernetesBackendClient.ts
index c6d0153538..088196b0c8 100644
--- a/plugins/kubernetes/src/api/KubernetesBackendClient.ts
+++ b/plugins/kubernetes/src/api/KubernetesBackendClient.ts
@@ -55,8 +55,11 @@ export class KubernetesBackendClient implements KubernetesApi {
     // TODO: figure out how to convert the selector to the full query param from the yaml
     //  (as shown here https://github.com/kubernetes/apimachinery/blob/master/pkg/labels/selector.go)
     const { matchLabels } = params;
+    if (!matchLabels) {
+      return '';
+    }
     return Object.keys(matchLabels)
-      .map(key => `${key}=${matchLabels[key]}`)
+      .map(key => `${key}=${matchLabels[key.toString()]}`)
       .join(',');
   }