From ce614461ce85d935ce1778166b868174857b22bd Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 12 Aug 2022 09:46:30 -0400 Subject: [PATCH] Remove modifying input in requestActivePortForwardInjectable Signed-off-by: Sebastian Malton --- .../request-active-port-forward.injectable.ts | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts b/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts index 5e18e7b2ab..4939f4d955 100644 --- a/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts +++ b/src/renderer/port-forward/port-forward-store/request-active-port-forward.injectable.ts @@ -19,22 +19,24 @@ const requestActivePortForwardInjectable = getInjectable({ const apiBase = di.inject(apiBaseInjectionToken); const logger = di.inject(loggerInjectable); - return async (portForward) => { - const { port, forwardPort } = portForward; - let response: { port: number }; - + return async ({ port, forwardPort, namespace, kind, name, ...rest }) => { try { - response = await apiBase.get(requestActiveEndpoint.compile(portForward), { query: { port, forwardPort }}); + const response: { port: number } = await apiBase.get(requestActiveEndpoint.compile({ namespace, kind, name }), { query: { port, forwardPort }}); + + return { + status: response.port ? "Active" : "Disabled", + forwardPort: response.port, + port, + namespace, + kind, + name, + ...rest, + }; } catch (error) { - logger.warn(`[PORT-FORWARD-STORE] Error getting active port-forward: ${error}`, portForward); + logger.warn(`[PORT-FORWARD-STORE] Error getting active port-forward: ${error}`, { namespace, kind, name }); return undefined; } - - portForward.status = response?.port ? "Active" : "Disabled"; - portForward.forwardPort = response?.port; - - return portForward; }; }, });