From b1dc574163021693ab117f9269ec1312d4741e6c Mon Sep 17 00:00:00 2001
From: Jim Ehrismann <jehrismann@mirantis.com>
Date: Mon, 17 Jan 2022 19:09:15 -0500
Subject: [PATCH] redid changes after large refactor on  master

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
---
 src/main/routes/port-forward-route.ts                     | 3 +--
 src/main/routes/port-forward/port-forward.ts              | 6 +-----
 .../port-forward/route-port-forward/route-port-forward.ts | 3 ---
 .../port-forward/port-forward-store/port-forward-store.ts | 8 +++-----
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/main/routes/port-forward-route.ts b/src/main/routes/port-forward-route.ts
index 7cea1bd7b5..aa21af5c45 100644
--- a/src/main/routes/port-forward-route.ts
+++ b/src/main/routes/port-forward-route.ts
@@ -30,11 +30,10 @@ export class PortForwardRoute {
     const { namespace, resourceType, resourceName } = params;
     const port = Number(query.get("port"));
     const forwardPort = Number(query.get("forwardPort"));
-    const protocol = query.get("protocol");
 
     const portForward = PortForward.getPortforward({
       clusterId: cluster.id, kind: resourceType, name: resourceName,
-      namespace, port, forwardPort, protocol,
+      namespace, port, forwardPort,
     });
 
     respondJson(response, { port: portForward?.forwardPort ?? null });
diff --git a/src/main/routes/port-forward/port-forward.ts b/src/main/routes/port-forward/port-forward.ts
index 4b973d261c..7ff1edbd65 100644
--- a/src/main/routes/port-forward/port-forward.ts
+++ b/src/main/routes/port-forward/port-forward.ts
@@ -32,7 +32,6 @@ export interface PortForwardArgs {
   name: string;
   port: number;
   forwardPort: number;
-  protocol?: string;
 }
 
 interface Dependencies {
@@ -48,8 +47,7 @@ export class PortForward {
       pf.kind == forward.kind &&
       pf.name == forward.name &&
       pf.namespace == forward.namespace &&
-      pf.port == forward.port &&
-      (!forward.protocol || pf.protocol == forward.protocol)
+      pf.port == forward.port
     ));
   }
 
@@ -60,7 +58,6 @@ export class PortForward {
   public name: string;
   public port: number;
   public forwardPort: number;
-  public protocol: string;
 
   constructor(private dependencies: Dependencies, public pathToKubeConfig: string, args: PortForwardArgs) {
     this.clusterId = args.clusterId;
@@ -69,7 +66,6 @@ export class PortForward {
     this.name = args.name;
     this.port = args.port;
     this.forwardPort = args.forwardPort;
-    this.protocol = args.protocol ?? "http";
   }
 
   public async start() {
diff --git a/src/main/routes/port-forward/route-port-forward/route-port-forward.ts b/src/main/routes/port-forward/route-port-forward/route-port-forward.ts
index 738cb6679f..f76bfb20fb 100644
--- a/src/main/routes/port-forward/route-port-forward/route-port-forward.ts
+++ b/src/main/routes/port-forward/route-port-forward/route-port-forward.ts
@@ -34,7 +34,6 @@ export const routePortForward =
       const { namespace, resourceType, resourceName } = params;
       const port = Number(query.get("port"));
       const forwardPort = Number(query.get("forwardPort"));
-      const protocol = query.get("protocol");
 
       try {
         let portForward = PortForward.getPortforward({
@@ -44,7 +43,6 @@ export const routePortForward =
           namespace,
           port,
           forwardPort,
-          protocol,
         });
 
         if (!portForward) {
@@ -62,7 +60,6 @@ export const routePortForward =
             name: resourceName,
             port,
             forwardPort: thePort,
-            protocol,
           });
 
           const started = await portForward.start();
diff --git a/src/renderer/port-forward/port-forward-store/port-forward-store.ts b/src/renderer/port-forward/port-forward-store/port-forward-store.ts
index d39c65d01f..a2457ac474 100644
--- a/src/renderer/port-forward/port-forward-store/port-forward-store.ts
+++ b/src/renderer/port-forward/port-forward-store/port-forward-store.ts
@@ -289,11 +289,9 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
     let response: PortForwardResult;
 
     try {
-      const protocol = pf.protocol ?? "http";
-
       response = await apiBase.post<PortForwardResult>(
         `/pods/port-forward/${pf.namespace}/${pf.kind}/${pf.name}`,
-        { query: { port, forwardPort, protocol }},
+        { query: { port, forwardPort }},
       );
 
       // expecting the received port to be the specified port, unless the specified port is 0, which indicates any available port is suitable
@@ -371,11 +369,11 @@ function portForwardsEqual(portForward: ForwardedPort) {
 }
 
 async function getActivePortForward(portForward: ForwardedPort): Promise<ForwardedPort> {
-  const { port, forwardPort, protocol } = portForward;
+  const { port, forwardPort } = portForward;
   let response: PortForwardResult;
 
   try {
-    response = await apiBase.get<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}`, { query: { port, forwardPort, protocol }});
+    response = await apiBase.get<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}`, { query: { port, forwardPort }});
   } catch (error) {
     logger.warn(`[PORT-FORWARD-STORE] Error getting active port-forward: ${error}`, portForward);
   }