Consolidate downloading binaries into one script (#4942)

* Consolidate downloading binaries into one script

- Upgrade lens-k8s-proxy to 0.1.5 which allows us to remove the trailing
  slash in KubeAuthProxy

- Consolidate nromalizing arch and os strings

- Remove LensBinary as HelmCli is not just a raw object since it is
  always bundled

- Introduce OnceCell and use it for the binary paths

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fully remove helmCli, move associated variable to vars

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix helm downloading on windows

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Don't download binaries for unsupported windows

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Arch specific paths

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix downloading helm on windows

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* rename once-cell file to lazy-initialized

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/main/helm/exec.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { promiseExecFile } from "../../common/utils/promise-exec";
+import type { BaseEncodingOptions } from "fs";
+import type { ExecFileOptions } from "child_process";
+import { helmBinaryPath } from "../../common/vars";
+
+/**
+ * ExecFile the bundled helm CLI
+ * @returns STDOUT
+ */
+export async function execHelm(args: string[], options?: BaseEncodingOptions & ExecFileOptions): Promise<string> {
+  try {
+    const { stdout } = await promiseExecFile(helmBinaryPath.get(), args, options);
+
+    return stdout;
+  } catch (error) {
+    throw error?.stderr || error;
+  }
+}

src/main/helm/helm-chart-manager.ts

@@ -8,10 +8,9 @@ import v8 from "v8";
 import * as yaml from "js-yaml";
 import type { HelmRepo } from "./helm-repo-manager";
 import logger from "../logger";
-import { promiseExecFile } from "../../common/utils/promise-exec";
-import { helmCli } from "./helm-cli";
 import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api";
 import { iter, sortCharts } from "../../common/utils";
+import { execHelm } from "./exec";
 
 interface ChartCacheEntry {
   data: Buffer;
@@ -49,21 +48,13 @@ export class HelmChartManager {
   }
 
   private async executeCommand(args: string[], name: string, version?: string) {
-    const helm = await helmCli.binaryPath();
-
     args.push(`${this.repo.name}/${name}`);
 
     if (version) {
       args.push("--version", version);
     }
 
-    try {
-      const { stdout } = await promiseExecFile(helm, args);
-
-      return stdout;
-    } catch (error) {
-      throw error.stderr || error;
-    }
+    return execHelm(args);
   }
 
   public async getReadme(name: string, version?: string) {

src/main/helm/helm-cli.ts

@@ -1,49 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import packageInfo from "../../../package.json";
-import path from "path";
-import { LensBinary, LensBinaryOpts } from "../lens-binary";
-import { isProduction } from "../../common/vars";
-
-export class HelmCli extends LensBinary {
-
-  public constructor(baseDir: string, version: string) {
-    const opts: LensBinaryOpts = {
-      version,
-      baseDir,
-      originalBinaryName: "helm",
-      newBinaryName: "helm3",
-    };
-
-    super(opts);
-  }
-
-  protected getTarName(): string | null {
-    return `${this.binaryName}-v${this.binaryVersion}-${this.platformName}-${this.arch}.tar.gz`;
-  }
-
-  protected getUrl() {
-    return `https://get.helm.sh/helm-v${this.binaryVersion}-${this.platformName}-${this.arch}.tar.gz`;
-  }
-
-  protected getBinaryPath() {
-    return path.join(this.dirname, this.binaryName);
-  }
-
-  protected getOriginalBinaryPath() {
-    return path.join(this.dirname, `${this.platformName}-${this.arch}`, this.originalBinaryName);
-  }
-}
-
-const helmVersion = packageInfo.config.bundledHelmVersion;
-let baseDir = process.resourcesPath;
-
-if (!isProduction) {
-  baseDir = path.join(process.cwd(), "binaries", "client", process.arch);
-}
-
-export const helmCli = new HelmCli(baseDir, helmVersion);
-

src/main/helm/helm-release-manager.ts

@@ -6,23 +6,9 @@
 import tempy from "tempy";
 import fse from "fs-extra";
 import * as yaml from "js-yaml";
-import { promiseExecFile } from "../../common/utils/promise-exec";
-import { helmCli } from "./helm-cli";
 import { toCamelCase } from "../../common/utils/camelCase";
-import type { BaseEncodingOptions } from "fs";
-import { execFile, ExecFileOptions } from "child_process";
-
-async function execHelm(args: string[], options?: BaseEncodingOptions & ExecFileOptions): Promise<string> {
-  const helmCliPath = await helmCli.binaryPath();
-
-  try {
-    const { stdout } = await promiseExecFile(helmCliPath, args, options);
-
-    return stdout;
-  } catch (error) {
-    throw error?.stderr || error;
-  }
-}
+import { execFile } from "child_process";
+import { execHelm } from "./exec";
 
 export async function listReleases(pathToKubeconfig: string, namespace?: string): Promise<Record<string, any>[]> {
   const args = [

src/main/helm/helm-repo-manager.ts

@@ -4,14 +4,12 @@
  */
 
 import yaml from "js-yaml";
-import { BaseEncodingOptions, readFile } from "fs-extra";
-import { promiseExecFile } from "../../common/utils/promise-exec";
-import { helmCli } from "./helm-cli";
+import { readFile } from "fs-extra";
 import { Singleton } from "../../common/utils/singleton";
 import { customRequestPromise } from "../../common/request";
 import orderBy from "lodash/orderBy";
 import logger from "../logger";
-import type { ExecFileOptions } from "child_process";
+import { execHelm } from "./exec";
 
 export type HelmEnv = Record<string, string> & {
   HELM_REPOSITORY_CACHE?: string;
@@ -34,18 +32,6 @@ export interface HelmRepo {
   password?: string;
 }
 
-async function execHelm(args: string[], options?: BaseEncodingOptions & ExecFileOptions): Promise<string> {
-  const helmCliPath = await helmCli.binaryPath();
-
-  try {
-    const { stdout } = await promiseExecFile(helmCliPath, args, options);
-
-    return stdout;
-  } catch (error) {
-    throw error?.stderr || error;
-  }
-}
-
 export class HelmRepoManager extends Singleton {
   protected repos: HelmRepo[];
   protected helmEnv: HelmEnv;
@@ -63,9 +49,6 @@ export class HelmRepoManager extends Singleton {
   }
 
   private async ensureInitialized() {
-    helmCli.setLogger(logger);
-    await helmCli.ensureBinary();
-
     this.helmEnv ??= await this.parseHelmEnv();
 
     const repos = await this.list();