hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

changed port and forwardPort fields to be Numbers

Browse Source 
Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
This commit is contained in:
Jim Ehrismann 2021-10-05 11:42:37 -04:00
parent 58314945ed
commit 9a547973bc
6 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/routes/port-forward-route.ts
View File

@ -32,8 +32,8 @@ interface PortForwardArgs {
kind: string; kind: string;
namespace: string; namespace: string;
name: string; name: string;
port: string; port: number;
forwardPort: string; forwardPort: number;
} }
const internalPortRegex = /^forwarding from (?<address>.+) ->/i; const internalPortRegex = /^forwarding from (?<address>.+) ->/i;
@ -56,9 +56,9 @@ class PortForward {
public kind: string; public kind: string;
public namespace: string; public namespace: string;
public name: string; public name: string;
public port: string; public port: number;
public internalPort?: number; public internalPort?: number;
public forwardPort?: string; public forwardPort?: number;
constructor(public kubeConfig: string, args: PortForwardArgs) { constructor(public kubeConfig: string, args: PortForwardArgs) {
this.clusterId = args.clusterId; this.clusterId = args.clusterId;
@ -98,7 +98,7 @@ class PortForward {
try { try {
await tcpPortUsed.waitUntilUsed(this.internalPort, 500, 15000); await tcpPortUsed.waitUntilUsed(this.internalPort, 500, 15000);
this.forwardPort = String(this.internalPort); this.forwardPort = this.internalPort;
return true; return true;
} catch (error) { } catch (error) {
@ -117,8 +117,8 @@ export class PortForwardRoute {
static async routePortForward(request: LensApiRequest) { static async routePortForward(request: LensApiRequest) {
const { params, query, response, cluster } = request; const { params, query, response, cluster } = request;
const { namespace, resourceType, resourceName } = params; const { namespace, resourceType, resourceName } = params;
const port = query.get("port"); const port = Number(query.get("port"));
const forwardPort = query.get("forwardPort"); const forwardPort = Number(query.get("forwardPort"));
try { try {
let portForward = PortForward.getPortforward({ let portForward = PortForward.getPortforward({
@ -126,10 +126,9 @@ export class PortForwardRoute {
namespace, port, forwardPort, namespace, port, forwardPort,
}); });
let thePort: string; // undefined let thePort = 0;
const portNum = Number(forwardPort);
if (portNum > 0 && portNum < 65536) { if (forwardPort > 0 && forwardPort < 65536) {
thePort = forwardPort; thePort = forwardPort;
} }
@ -168,8 +167,8 @@ export class PortForwardRoute {
static async routeCurrentPortForward(request: LensApiRequest) { static async routeCurrentPortForward(request: LensApiRequest) {
const { params, query, response, cluster } = request; const { params, query, response, cluster } = request;
const { namespace, resourceType, resourceName } = params; const { namespace, resourceType, resourceName } = params;
const port = query.get("port"); const port = Number(query.get("port"));
const forwardPort = query.get("forwardPort"); const forwardPort = Number(query.get("forwardPort"));
const portForward = PortForward.getPortforward({ const portForward = PortForward.getPortforward({
clusterId: cluster.id, kind: resourceType, name: resourceName, clusterId: cluster.id, kind: resourceType, name: resourceName,
@ -199,8 +198,8 @@ export class PortForwardRoute {
static async routeCurrentPortForwardStop(request: LensApiRequest) { static async routeCurrentPortForwardStop(request: LensApiRequest) {
const { params, query, response, cluster } = request; const { params, query, response, cluster } = request;
const { namespace, resourceType, resourceName } = params; const { namespace, resourceType, resourceName } = params;
const port = query.get("port"); const port = Number(query.get("port"));
const forwardPort = query.get("forwardPort"); const forwardPort = Number(query.get("forwardPort"));
const portForward = PortForward.getPortforward({ const portForward = PortForward.getPortforward({
clusterId: cluster.id, kind: resourceType, name: resourceName, clusterId: cluster.id, kind: resourceType, name: resourceName,

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

@ -68,8 +68,8 @@ export class ServicePortComponent extends React.Component<Props> {
kind: "service", kind: "service",
name: service.getName(), name: service.getName(),
namespace: service.getNs(), namespace: service.getNs(),
port: port.port.toString(), port: port.port,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
const activePort = await getPortForward(portForward) ?? 0; const activePort = await getPortForward(portForward) ?? 0;
@ -83,8 +83,8 @@ export class ServicePortComponent extends React.Component<Props> {
kind: "service", kind: "service",
name: service.getName(), name: service.getName(),
namespace: service.getNs(), namespace: service.getNs(),
port: port.port.toString(), port: port.port,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
this.waiting = true; this.waiting = true;
@ -97,7 +97,7 @@ export class ServicePortComponent extends React.Component<Props> {
this.forwardPort = await addPortForward(portForward); this.forwardPort = await addPortForward(portForward);
if (this.forwardPort) { if (this.forwardPort) {
portForward.forwardPort = this.forwardPort.toString(); portForward.forwardPort = this.forwardPort;
openPortForward(portForward); openPortForward(portForward);
this.isPortForwarded = true; this.isPortForwarded = true;
} }
@ -114,8 +114,8 @@ export class ServicePortComponent extends React.Component<Props> {
kind: "service", kind: "service",
name: service.getName(), name: service.getName(),
namespace: service.getNs(), namespace: service.getNs(),
port: port.port.toString(), port: port.port,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
this.waiting = true; this.waiting = true;
@ -141,8 +141,8 @@ export class ServicePortComponent extends React.Component<Props> {
kind: "service", kind: "service",
name: service.getName(), name: service.getName(),
namespace: service.getNs(), namespace: service.getNs(),
port: port.port.toString(), port: port.port,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
PortForwardDialog.open(portForward, { openInBrowser: true }); PortForwardDialog.open(portForward, { openInBrowser: true });

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

@ -72,8 +72,8 @@ export class PodContainerPort extends React.Component<Props> {
kind: "pod", kind: "pod",
name: pod.getName(), name: pod.getName(),
namespace: pod.getNs(), namespace: pod.getNs(),
port: port.containerPort.toString(), port: port.containerPort,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
const activePort = await getPortForward(portForward) ?? 0; const activePort = await getPortForward(portForward) ?? 0;
@ -87,8 +87,8 @@ export class PodContainerPort extends React.Component<Props> {
kind: "pod", kind: "pod",
name: pod.getName(), name: pod.getName(),
namespace: pod.getNs(), namespace: pod.getNs(),
port: port.containerPort.toString(), port: port.containerPort,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
this.waiting = true; this.waiting = true;
@ -101,7 +101,7 @@ export class PodContainerPort extends React.Component<Props> {
this.forwardPort = await addPortForward(portForward); this.forwardPort = await addPortForward(portForward);
if (this.forwardPort) { if (this.forwardPort) {
portForward.forwardPort = this.forwardPort.toString(); portForward.forwardPort = this.forwardPort;
openPortForward(portForward); openPortForward(portForward);
this.isPortForwarded = true; this.isPortForwarded = true;
} }
@ -118,8 +118,8 @@ export class PodContainerPort extends React.Component<Props> {
kind: "pod", kind: "pod",
name: pod.getName(), name: pod.getName(),
namespace: pod.getNs(), namespace: pod.getNs(),
port: port.containerPort.toString(), port: port.containerPort,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
this.waiting = true; this.waiting = true;
@ -147,8 +147,8 @@ export class PodContainerPort extends React.Component<Props> {
kind: "pod", kind: "pod",
name: pod.getName(), name: pod.getName(),
namespace: pod.getNs(), namespace: pod.getNs(),
port: port.containerPort.toString(), port: port.containerPort,
forwardPort: this.forwardPort.toString() forwardPort: this.forwardPort,
}; };
PortForwardDialog.open(portForward, { openInBrowser: true }); PortForwardDialog.open(portForward, { openInBrowser: true });

4
src/renderer/port-forward/port-forward-dialog.tsx
View File

@ -102,12 +102,12 @@ export class PortForwardDialog extends Component<Props> {
if (currentPort) { if (currentPort) {
port = await modifyPortForward(portForward, desiredPort); port = await modifyPortForward(portForward, desiredPort);
} else { } else {
portForward.forwardPort = String(desiredPort); portForward.forwardPort = desiredPort;
port = await addPortForward(portForward); port = await addPortForward(portForward);
} }
if (dialogState.openInBrowser) { if (dialogState.openInBrowser) {
portForward.forwardPort = String(port); portForward.forwardPort = port;
openPortForward(portForward); openPortForward(portForward);
} }
} catch (err) { } catch (err) {

10
src/renderer/port-forward/port-forward-item.ts
View File

@ -28,8 +28,8 @@ export interface ForwardedPort {
kind: string; kind: string;
namespace: string; namespace: string;
name: string; name: string;
port: string; port: number;
forwardPort: string; forwardPort: number;
} }
export class PortForwardItem implements ItemObject { export class PortForwardItem implements ItemObject {
@ -37,8 +37,8 @@ export class PortForwardItem implements ItemObject {
kind: string; kind: string;
namespace: string; namespace: string;
name: string; name: string;
port: string; port: number;
forwardPort: string; forwardPort: number;
constructor(pf: ForwardedPort) { constructor(pf: ForwardedPort) {
this.clusterId = pf.clusterId; this.clusterId = pf.clusterId;
@ -64,7 +64,7 @@ export class PortForwardItem implements ItemObject {
} }
getId() { getId() {
return this.forwardPort; return String(this.forwardPort);
} }
getKind() { getKind() {

2
src/renderer/port-forward/port-forward.store.ts
View File

@ -127,7 +127,7 @@ export async function modifyPortForward(portForward: ForwardedPort, desiredPort:
try { try {
await removePortForward(portForward); await removePortForward(portForward);
portForward.forwardPort = desiredPort.toString(); portForward.forwardPort = desiredPort;
port = await addPortForward(portForward); port = await addPortForward(portForward);
} catch (error) { } catch (error) {
logger.warn(error); // don't care, caller must check logger.warn(error); // don't care, caller must check