From f3baaac411d73dd6a06fdb15fa94be416e2f908a Mon Sep 17 00:00:00 2001
From: Jan Jansen <farodin91@users.noreply.github.com>
Date: Tue, 30 Nov 2021 19:51:41 +0100
Subject: [PATCH] Prefer usage of preference over autoselection (#4436)

---
 src/main/context-handler.ts | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/main/context-handler.ts b/src/main/context-handler.ts
index 14dc9cb59d..3042c0c4f3 100644
--- a/src/main/context-handler.ts
+++ b/src/main/context-handler.ts
@@ -34,12 +34,19 @@ export interface PrometheusDetails {
   provider: PrometheusProvider;
 }
 
+interface PrometheusServicePreferences {
+  namespace: string;
+  service: string;
+  port: number;
+  prefix: string;
+}
+
 export class ContextHandler {
   public clusterUrl: UrlWithStringQuery;
   protected kubeAuthProxy?: KubeAuthProxy;
   protected apiTarget?: httpProxy.ServerOptions;
   protected prometheusProvider?: string;
-  protected prometheusPath: string | null;
+  protected prometheus?: PrometheusServicePreferences;
 
   constructor(protected cluster: Cluster) {
     this.clusterUrl = url.parse(cluster.apiUrl);
@@ -48,13 +55,7 @@ export class ContextHandler {
 
   public setupPrometheus(preferences: ClusterPrometheusPreferences = {}) {
     this.prometheusProvider = preferences.prometheusProvider?.type;
-    this.prometheusPath = null;
-
-    if (preferences.prometheus) {
-      const { namespace, service, port } = preferences.prometheus;
-
-      this.prometheusPath = `${namespace}/services/${service}:${port}`;
-    }
+    this.prometheus = preferences.prometheus || null;
   }
 
   public async getPrometheusDetails(): Promise<PrometheusDetails> {
@@ -66,7 +67,7 @@ export class ContextHandler {
   }
 
   protected ensurePrometheusPath({ service, namespace, port }: PrometheusService): string {
-    return this.prometheusPath ||= `${namespace}/services/${service}:${port}`;
+    return `${namespace}/services/${service}:${port}`;
   }
 
   protected ensurePrometheusProvider(service: PrometheusService): PrometheusProvider {
@@ -90,6 +91,15 @@ export class ContextHandler {
   }
 
   protected async getPrometheusService(): Promise<PrometheusService> {
+    if (this.prometheus !== null && this.prometheusProvider !== null) {
+      return {
+        id: this.prometheusProvider,
+        namespace: this.prometheus.namespace,
+        service: this.prometheus.service,
+        port: this.prometheus.port,
+      };
+    }
+
     const providers = this.listPotentialProviders();
     const proxyConfig = await this.cluster.getProxyKubeconfig();
     const apiClient = proxyConfig.makeApiClient(CoreV1Api);