Remove duplication how to acquire binary path for helm

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/common/vars/base-bundled-binaries-dir.injectable.ts

@@ -3,16 +3,22 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import path from "path";
-import normalizedPlatformArchitecture from "./normalized-platform-architecture.injectable";
 import bundledResourcesDirectoryInjectable from "./bundled-resources-dir.injectable";
+import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
+import normalizedPlatformArchitectureInjectable from "./normalized-platform-architecture.injectable";
 
-const baseBundeledBinariesDirectoryInjectable = getInjectable({
+const baseBundledBinariesDirectoryInjectable = getInjectable({
-  id: "base-bundeled-binaries-directory",
+  id: "base-bundled-binaries-directory",
-  instantiate: (di) => path.join(
+  instantiate: (di) => {
-    di.inject(bundledResourcesDirectoryInjectable),
+    const bundledResourcesDirectory = di.inject(bundledResourcesDirectoryInjectable);
-    di.inject(normalizedPlatformArchitecture),
+    const normalizedPlatformArchitecture = di.inject(normalizedPlatformArchitectureInjectable);
-  ),
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+
+    return getAbsolutePath(
+      bundledResourcesDirectory,
+      normalizedPlatformArchitecture,
+    );
+  },
 });
 
-export default baseBundeledBinariesDirectoryInjectable;
+export default baseBundledBinariesDirectoryInjectable;

src/common/vars/bundled-resources-dir.injectable.ts

@@ -3,19 +3,22 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import path from "path";
 import isProductionInjectable from "./is-production.injectable";
 import normalizedPlatformInjectable from "./normalized-platform.injectable";
+import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
+import lensResourcesDirInjectable from "./lens-resources-dir.injectable";
 
 const bundledResourcesDirectoryInjectable = getInjectable({
   id: "bundled-resources-directory",
   instantiate: (di) => {
     const isProduction = di.inject(isProductionInjectable);
     const normalizedPlatform = di.inject(normalizedPlatformInjectable);
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const lensResourcesDir = di.inject(lensResourcesDirInjectable);
 
     return isProduction
-      ? process.resourcesPath
+      ? lensResourcesDir
-      : path.join(process.cwd(), "binaries", "client", normalizedPlatform);
+      : getAbsolutePath(lensResourcesDir, "binaries", "client", normalizedPlatform);
   },
 });
 

src/main/getDiForUnitTesting.ts

@@ -76,7 +76,7 @@ import quitAndInstallUpdateInjectable from "./electron-app/features/quit-and-ins
 import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable";
 import publishIsConfiguredInjectable from "./application-update/publish-is-configured.injectable";
 import checkForPlatformUpdatesInjectable from "./application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import baseBundeledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable";
 import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable";
 import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable";
 import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable";
@@ -172,7 +172,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     di.override(broadcastMessageInjectable, () => (channel) => {
       throw new Error(`Tried to broadcast message to channel "${channel}" over IPC without explicit override.`);
     });
-    di.override(baseBundeledBinariesDirectoryInjectable, () => "some-bin-directory");
+    di.override(baseBundledBinariesDirectoryInjectable, () => "some-bin-directory");
     di.override(spawnInjectable, () => () => {
       return {
         stderr: { on: jest.fn(), removeAllListeners: jest.fn() },

src/main/helm/helm-binary-path.injectable.ts

@@ -5,30 +5,20 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { getBinaryName } from "../../common/vars";
 import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable";
-import lensResourcesDirInjectable from "../../common/vars/lens-resources-dir.injectable";
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
-import isProductionInjectable from "../../common/vars/is-production.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
-import normalizedPlatformArchitectureInjectable from "../../common/vars/normalized-platform-architecture.injectable";
 
 const helmBinaryPathInjectable = getInjectable({
   id: "helm-binary-path",
 
   instantiate: (di) => {
     const getAbsolutePath = di.inject(getAbsolutePathInjectable);
-    const lensResourcesDir = di.inject(lensResourcesDirInjectable);
     const normalizedPlatform = di.inject(normalizedPlatformInjectable);
-    const normalizedPlatformArchitecture = di.inject(normalizedPlatformArchitectureInjectable);
+    const baseBundledBinariesDirectory = di.inject(baseBundledBinariesDirectoryInjectable);
-    const isProduction = di.inject(isProductionInjectable);
-
-    const resourcesDir = isProduction
-      ? lensResourcesDir
-      : getAbsolutePath(lensResourcesDir, "binaries", "client", normalizedPlatform);
-
-    const baseBinariesDir = getAbsolutePath(resourcesDir, normalizedPlatformArchitecture);
 
     const helmBinaryName = getBinaryName("helm", { forPlatform: normalizedPlatform });
 
-    return getAbsolutePath(baseBinariesDir, helmBinaryName);
+    return getAbsolutePath(baseBundledBinariesDirectory, helmBinaryName);
   },
 });
 

src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts

@@ -12,7 +12,7 @@ import { getBinaryName } from "../../common/vars";
 import spawnInjectable from "../child-process/spawn.injectable";
 import { getKubeAuthProxyCertificate } from "./get-kube-auth-proxy-certificate";
 import loggerInjectable from "../../common/logger.injectable";
-import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
 
 export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy;
 
@@ -25,7 +25,7 @@ const createKubeAuthProxyInjectable = getInjectable({
     return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => {
       const clusterUrl = new URL(cluster.apiUrl);
       const dependencies: KubeAuthProxyDependencies = {
-        proxyBinPath: path.join(di.inject(baseBundeledBinariesDirectoryInjectable), binaryName),
+        proxyBinPath: path.join(di.inject(baseBundledBinariesDirectoryInjectable), binaryName),
         proxyCert: getKubeAuthProxyCertificate(clusterUrl.hostname, selfsigned.generate),
         spawn: di.inject(spawnInjectable),
         logger: di.inject(loggerInjectable),

src/main/kubectl/bundled-binary-path.injectable.ts

@@ -4,13 +4,13 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import path from "path";
-import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
 import kubectlBinaryNameInjectable from "./binary-name.injectable";
 
 const bundledKubectlBinaryPathInjectable = getInjectable({
   id: "bundled-kubectl-binary-path",
   instantiate: (di) => path.join(
-    di.inject(baseBundeledBinariesDirectoryInjectable),
+    di.inject(baseBundledBinariesDirectoryInjectable),
     di.inject(kubectlBinaryNameInjectable),
   ),
 });

src/main/kubectl/create-kubectl.injectable.ts

@@ -11,7 +11,7 @@ import kubectlDownloadingNormalizedArchInjectable from "./normalized-arch.inject
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "./binary-name.injectable";
 import bundledKubectlBinaryPathInjectable from "./bundled-binary-path.injectable";
-import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
 
 const createKubectlInjectable = getInjectable({
   id: "create-kubectl",
@@ -24,7 +24,7 @@ const createKubectlInjectable = getInjectable({
       normalizedDownloadPlatform: di.inject(normalizedPlatformInjectable),
       kubectlBinaryName: di.inject(kubectlBinaryNameInjectable),
       bundledKubectlBinaryPath: di.inject(bundledKubectlBinaryPathInjectable),
-      baseBundeledBinariesDirectory: di.inject(baseBundeledBinariesDirectoryInjectable),
+      baseBundeledBinariesDirectory: di.inject(baseBundledBinariesDirectoryInjectable),
     };
 
     return (clusterVersion: string) => new Kubectl(dependencies, clusterVersion);