From c2ffdc27b99b4223a1fc00e5704a6c111d047c1d Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 5 May 2022 10:33:37 +0300 Subject: [PATCH] Rename injectable for brevity Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- src/main/k8s-request.injectable.ts | 6 +++--- .../create-kubeconfig-manager.injectable.ts | 4 ++-- src/main/kubeconfig-manager/kubeconfig-manager.ts | 4 ++-- ...-state.injectable.ts => lens-proxy-port.injectable.ts} | 7 ++++--- src/main/lens-proxy.injectable.ts | 6 +++--- src/main/lens-proxy.ts | 4 ++-- .../application-window/application-window.injectable.ts | 8 ++++---- .../runnables/setup-lens-proxy.injectable.ts | 6 +++--- 8 files changed, 23 insertions(+), 22 deletions(-) rename src/main/{lens-proxy-port-number-state.injectable.ts => lens-proxy-port.injectable.ts} (83%) diff --git a/src/main/k8s-request.injectable.ts b/src/main/k8s-request.injectable.ts index daedcb2142..96a61a721b 100644 --- a/src/main/k8s-request.injectable.ts +++ b/src/main/k8s-request.injectable.ts @@ -7,7 +7,7 @@ import request from "request-promise-native"; import { apiKubePrefix } from "../common/vars"; import type { Cluster } from "../common/cluster/cluster"; import { getInjectable } from "@ogre-tools/injectable"; -import lensProxyPortNumberStateInjectable from "./lens-proxy-port-number-state.injectable"; +import lensProxyPortInjectable from "./lens-proxy-port.injectable"; export type K8sRequest = (cluster: Cluster, path: string, options?: RequestPromiseOptions) => Promise; @@ -15,14 +15,14 @@ const k8SRequestInjectable = getInjectable({ id: "k8s-request", instantiate: (di) => { - const lensProxyPortNumberState = di.inject(lensProxyPortNumberStateInjectable); + const lensProxyPort = di.inject(lensProxyPortInjectable); return async ( cluster: Cluster, path: string, options: RequestPromiseOptions = {}, ) => { - const kubeProxyUrl = `http://localhost:${lensProxyPortNumberState.get()}${apiKubePrefix}`; + const kubeProxyUrl = `http://localhost:${lensProxyPort.get()}${apiKubePrefix}`; options.headers ??= {}; options.json ??= true; diff --git a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts b/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts index f1d5fc73ba..3933917769 100644 --- a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts +++ b/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../../common/cluster/cluster"; import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; import { KubeconfigManager } from "./kubeconfig-manager"; -import lensProxyPortNumberStateInjectable from "../lens-proxy-port-number-state.injectable"; +import lensProxyPortInjectable from "../lens-proxy-port.injectable"; export interface KubeConfigManagerInstantiationParameter { cluster: Cluster; @@ -18,7 +18,7 @@ const createKubeconfigManagerInjectable = getInjectable({ instantiate: (di) => { const dependencies = { directoryForTemp: di.inject(directoryForTempInjectable), - lensProxyPortNumberState: di.inject(lensProxyPortNumberStateInjectable), + lensProxyPort: di.inject(lensProxyPortInjectable), }; return (cluster: Cluster) => new KubeconfigManager(dependencies, cluster); diff --git a/src/main/kubeconfig-manager/kubeconfig-manager.ts b/src/main/kubeconfig-manager/kubeconfig-manager.ts index b945a2bf72..aa6e88a840 100644 --- a/src/main/kubeconfig-manager/kubeconfig-manager.ts +++ b/src/main/kubeconfig-manager/kubeconfig-manager.ts @@ -13,7 +13,7 @@ import logger from "../logger"; interface Dependencies { directoryForTemp: string; - lensProxyPortNumberState: { get: () => number }; + lensProxyPort: { get: () => number }; } export class KubeconfigManager { @@ -79,7 +79,7 @@ export class KubeconfigManager { } get resolveProxyUrl() { - return `http://127.0.0.1:${this.dependencies.lensProxyPortNumberState.get()}/${this.cluster.id}`; + return `http://127.0.0.1:${this.dependencies.lensProxyPort.get()}/${this.cluster.id}`; } /** diff --git a/src/main/lens-proxy-port-number-state.injectable.ts b/src/main/lens-proxy-port.injectable.ts similarity index 83% rename from src/main/lens-proxy-port-number-state.injectable.ts rename to src/main/lens-proxy-port.injectable.ts index e09c4509e4..e6826f6df0 100644 --- a/src/main/lens-proxy-port-number-state.injectable.ts +++ b/src/main/lens-proxy-port.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; -const lensProxyPortNumberStateInjectable = getInjectable({ - id: "lens-proxy-port-number-state", +const lensProxyPortInjectable = getInjectable({ + id: "lens-proxy-port", instantiate: () => { let _portNumber: number; @@ -20,6 +20,7 @@ const lensProxyPortNumberStateInjectable = getInjectable({ return _portNumber; }, + set: (portNumber: number) => { if (_portNumber) { throw new Error( @@ -33,4 +34,4 @@ const lensProxyPortNumberStateInjectable = getInjectable({ }, }); -export default lensProxyPortNumberStateInjectable; +export default lensProxyPortInjectable; diff --git a/src/main/lens-proxy.injectable.ts b/src/main/lens-proxy.injectable.ts index dd5749a3da..f16ae39508 100644 --- a/src/main/lens-proxy.injectable.ts +++ b/src/main/lens-proxy.injectable.ts @@ -9,7 +9,7 @@ import routerInjectable from "./router/router.injectable"; import httpProxy from "http-proxy"; import clusterManagerInjectable from "./cluster-manager.injectable"; import shellApiRequestInjectable from "./proxy-functions/shell-api-request/shell-api-request.injectable"; -import lensProxyPortNumberStateInjectable from "./lens-proxy-port-number-state.injectable"; +import lensProxyPortInjectable from "./lens-proxy-port.injectable"; const lensProxyInjectable = getInjectable({ id: "lens-proxy", @@ -19,7 +19,7 @@ const lensProxyInjectable = getInjectable({ const router = di.inject(routerInjectable); const shellApiRequest = di.inject(shellApiRequestInjectable); const proxy = httpProxy.createProxy(); - const lensProxyPortNumberState = di.inject(lensProxyPortNumberStateInjectable); + const lensProxyPort = di.inject(lensProxyPortInjectable); return new LensProxy({ router, @@ -27,7 +27,7 @@ const lensProxyInjectable = getInjectable({ kubeApiUpgradeRequest, shellApiRequest, getClusterForRequest: clusterManager.getClusterForRequest, - lensProxyPortNumberState, + lensProxyPort, }); }, }); diff --git a/src/main/lens-proxy.ts b/src/main/lens-proxy.ts index b2efc1f9f2..82da830ac4 100644 --- a/src/main/lens-proxy.ts +++ b/src/main/lens-proxy.ts @@ -24,7 +24,7 @@ interface Dependencies { kubeApiUpgradeRequest: (args: ProxyApiRequestArgs) => void | Promise; router: Router; proxy: httpProxy; - lensProxyPortNumberState: { set: (portNumber: number) => void }; + lensProxyPort: { set: (portNumber: number) => void }; } const watchParam = "watch"; @@ -105,7 +105,7 @@ export class LensProxy { const { address, port } = this.proxyServer.address() as net.AddressInfo; - this.dependencies.lensProxyPortNumberState.set(port); + this.dependencies.lensProxyPort.set(port); logger.info(`[LENS-PROXY]: Proxy server has started at ${address}:${port}`); diff --git a/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts index fa2f9a5d99..fbf428ffb4 100644 --- a/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts +++ b/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { lensWindowInjectionToken } from "./lens-window-injection-token"; import createLensWindowInjectable from "./create-lens-window.injectable"; -import lensProxyPortNumberStateInjectable from "../../../lens-proxy-port-number-state.injectable"; +import lensProxyPortInjectable from "../../../lens-proxy-port.injectable"; import isMacInjectable from "../../../../common/vars/is-mac.injectable"; import appNameInjectable from "../../../app-paths/app-name/app-name.injectable"; import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable"; @@ -23,11 +23,11 @@ const applicationWindowInjectable = getInjectable({ const appEventBus = di.inject(appEventBusInjectable); const ipcMain = di.inject(ipcMainInjectable); - const lensProxyPortNumberState = di.inject( - lensProxyPortNumberStateInjectable, + const lensProxyPort = di.inject( + lensProxyPortInjectable, ); - const getContentUrl = () => `http://localhost:${lensProxyPortNumberState.get()}`; + const getContentUrl = () => `http://localhost:${lensProxyPort.get()}`; return createLensWindow({ id: "only-application-window", diff --git a/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts b/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts index 409165e820..64d4e62604 100644 --- a/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts +++ b/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts @@ -7,7 +7,7 @@ import { getAppVersion, getAppVersionFromProxyServer } from "../../../common/uti import exitAppInjectable from "../../electron-app/features/exit-app.injectable"; import lensProxyInjectable from "../../lens-proxy.injectable"; import loggerInjectable from "../../../common/logger.injectable"; -import lensProxyPortNumberStateInjectable from "../../lens-proxy-port-number-state.injectable"; +import lensProxyPortInjectable from "../../lens-proxy-port.injectable"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; import showErrorPopupInjectable from "../../electron-app/features/show-error-popup.injectable"; import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token"; @@ -19,7 +19,7 @@ const setupLensProxyInjectable = getInjectable({ const lensProxy = di.inject(lensProxyInjectable); const exitApp = di.inject(exitAppInjectable); const logger = di.inject(loggerInjectable); - const lensProxyPortNumberState = di.inject(lensProxyPortNumberStateInjectable); + const lensProxyPort = di.inject(lensProxyPortInjectable); const isWindows = di.inject(isWindowsInjectable); const showErrorPopup = di.inject(showErrorPopupInjectable); @@ -38,7 +38,7 @@ const setupLensProxyInjectable = getInjectable({ try { logger.info("🔎 Testing LensProxy connection ..."); const versionFromProxy = await getAppVersionFromProxyServer( - lensProxyPortNumberState.get(), + lensProxyPort.get(), ); if (getAppVersion() !== versionFromProxy) {