predict the protocol based on the port name, some cleanup

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>

src/main/routes/port-forward-route.ts

@@ -34,7 +34,7 @@ interface PortForwardArgs {
   name: string;
   port: number;
   forwardPort: number;
-  protocol: string;
+  protocol?: string;
 }
 
 const internalPortRegex = /^forwarding from (?<address>.+) ->/i;
@@ -131,14 +131,15 @@ export class PortForwardRoute {
         namespace, port, forwardPort, protocol,
       });
 
+      if (!portForward) {
+        logger.info(`Creating a new port-forward ${namespace}/${resourceType}/${resourceName}:${port}`);
+
         let thePort = 0;
 
         if (forwardPort > 0 && forwardPort < 65536) {
           thePort = forwardPort;
         }
 
-      if (!portForward) {
-        logger.info(`Creating a new port-forward ${namespace}/${resourceType}/${resourceName}:${port}`);
         portForward = new PortForward(await cluster.getProxyKubeconfigPath(), {
           clusterId: cluster.id,
           kind: resourceType,
@@ -208,11 +209,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,
     });
 
     try {

src/renderer/components/+network-port-forwards/port-forward-menu.tsx

@@ -50,7 +50,7 @@ export class PortForwardMenu extends React.Component<Props> {
           <span className="title">Open</span>
         </MenuItem>
         <MenuItem onClick={() => PortForwardDialog.open(portForward)}>
-          <Icon material="edit" tooltip="Change port" interactive={toolbar} />
+          <Icon material="edit" tooltip="Change port or protocol" interactive={toolbar} />
           <span className="title">Edit</span>
         </MenuItem>
       </>

src/renderer/components/+network-services/service-port-component.tsx

@@ -28,7 +28,7 @@ import { observable, makeObservable, reaction } from "mobx";
 import { cssNames } from "../../utils";
 import { Notifications } from "../notifications";
 import { Button } from "../button";
-import { addPortForward, getPortForward, openPortForward, PortForwardDialog, portForwardStore, removePortForward } from "../../port-forward";
+import { addPortForward, getPortForward, openPortForward, PortForwardDialog, portForwardStore, predictProtocol, removePortForward } from "../../port-forward";
 import type { ForwardedPort } from "../../port-forward";
 import logger from "../../../common/logger";
 import { Spinner } from "../spinner";
@@ -85,6 +85,7 @@ export class ServicePortComponent extends React.Component<Props> {
       namespace: service.getNs(),
       port: port.port,
       forwardPort: this.forwardPort,
+      protocol: predictProtocol(port.name),
     };
 
     this.waiting = true;
@@ -140,6 +141,7 @@ export class ServicePortComponent extends React.Component<Props> {
           namespace: service.getNs(),
           port: port.port,
           forwardPort: this.forwardPort,
+          protocol: predictProtocol(port.name),
         };
 
         PortForwardDialog.open(portForward, { openInBrowser: true });

src/renderer/components/+workloads-pods/pod-container-port.tsx

@@ -28,7 +28,7 @@ import { observable, makeObservable, reaction } from "mobx";
 import { cssNames } from "../../utils";
 import { Notifications } from "../notifications";
 import { Button } from "../button";
-import { addPortForward, getPortForward, openPortForward, PortForwardDialog, portForwardStore, removePortForward } from "../../port-forward";
+import { addPortForward, getPortForward, openPortForward, PortForwardDialog, portForwardStore, predictProtocol, removePortForward } from "../../port-forward";
 import type { ForwardedPort } from "../../port-forward";
 import logger from "../../../common/logger";
 import { Spinner } from "../spinner";
@@ -89,6 +89,7 @@ export class PodContainerPort extends React.Component<Props> {
       namespace: pod.getNs(),
       port: port.containerPort,
       forwardPort: this.forwardPort,
+      protocol: predictProtocol(port.name),
     };
 
     this.waiting = true;
@@ -146,6 +147,7 @@ export class PodContainerPort extends React.Component<Props> {
           namespace: pod.getNs(),
           port: port.containerPort,
           forwardPort: this.forwardPort,
+          protocol: predictProtocol(port.name),
         };
 
         PortForwardDialog.open(portForward, { openInBrowser: true });

src/renderer/port-forward/port-forward.store.ts

@@ -124,6 +124,7 @@ function getProtocolQuery(protocol: string) {
   if (protocol) {
     return `&protocol=${protocol}`;
   }
+
   return "";
 }
 
@@ -143,11 +144,8 @@ export async function modifyPortForward(portForward: ForwardedPort, desiredPort:
   let port = 0;
 
   try {
-    const protocol = portForward.protocol;
-    delete portForward.protocol;
     await removePortForward(portForward);
     portForward.forwardPort = desiredPort;
-    portForward.protocol = protocol;
     port = await addPortForward(portForward);
   } catch (error) {
     logger.warn(error); // don't care, caller must check 
@@ -160,7 +158,7 @@ export async function modifyPortForward(portForward: ForwardedPort, desiredPort:
 
 export async function removePortForward(portForward: ForwardedPort) {
   try {
-    await apiBase.del(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}${getProtocolQuery(portForward.protocol)}`);
+    await apiBase.del(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}`);
     await waitUntilFree(+portForward.forwardPort, 200, 1000);
   } catch (error) {
     logger.warn(error); // don't care, caller must check 
@@ -202,4 +200,8 @@ export function openPortForward(portForward: ForwardedPort) {
 
 }
 
+export function predictProtocol(name: string) {
+  return name === "https" ? "https" : "http";
+}
+
 export const portForwardStore = new PortForwardStore();