Fix crash when upgrading release (#6626)

* Fix crash when upgrading release

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

* Fix crash when upgrading helm releases

- Fixes not being able to upgrade helm releases as well.

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

* Fix tests

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

* Fix test failures

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

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

src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { computed } from "mobx";
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import execHelmEnvInjectable from "./exec-env.injectable";
+
+export default getGlobalOverride(execHelmEnvInjectable, () => computed(() => ({})));

src/main/helm/exec-helm/exec-env.injectable.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import userStoreInjectable from "../../../common/user-store/user-store.injectable";
+
+const execHelmEnvInjectable = getInjectable({
+  id: "exec-helm-env",
+  instantiate: (di) => {
+    const userStore = di.inject(userStoreInjectable);
+
+    return computed(() => {
+      const {
+        HTTPS_PROXY = userStore.httpsProxy,
+        ...env
+      } = process.env;
+
+      return { HTTPS_PROXY, ...env } as Partial<Record<string, string>>;
+    });
+  },
+  causesSideEffects: true,
+});
+
+export default execHelmEnvInjectable;

src/main/helm/exec-helm/exec-helm.injectable.ts

@@ -7,6 +7,7 @@ import type { ExecFileException } from "child_process";
 import execFileInjectable from "../../../common/fs/exec-file.injectable";
 import type { AsyncResult } from "../../../common/utils/async-result";
 import helmBinaryPathInjectable from "../helm-binary-path.injectable";
+import execHelmEnvInjectable from "./exec-env.injectable";
 
 export type ExecHelm = (args: string[]) => Promise<AsyncResult<string, ExecFileException & { stderr: string }>>;
 
@@ -15,10 +16,12 @@ const execHelmInjectable = getInjectable({
 
   instantiate: (di): ExecHelm => {
     const execFile = di.inject(execFileInjectable);
+    const execHelmEnv = di.inject(execHelmEnvInjectable);
     const helmBinaryPath = di.inject(helmBinaryPathInjectable);
 
     return async (args) => execFile(helmBinaryPath, args, {
       maxBuffer: 32 * 1024 * 1024 * 1024, // 32 MiB
+      env: execHelmEnv.get(),
     });
   },
 });

src/main/helm/helm-service/update-helm-release.injectable.ts

@@ -5,16 +5,15 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { Cluster } from "../../../common/cluster/cluster";
 import loggerInjectable from "../../../common/logger.injectable";
-import type { JsonObject } from "type-fest";
-import { execHelm } from "../exec";
 import tempy from "tempy";
-import fse from "fs-extra";
-import yaml from "js-yaml";
 import getHelmReleaseInjectable from "./get-helm-release.injectable";
+import writeFileInjectable from "../../../common/fs/write-file.injectable";
+import removePathInjectable from "../../../common/fs/remove-path.injectable";
+import execHelmInjectable from "../exec-helm/exec-helm.injectable";
 
 export interface UpdateChartArgs {
   chart: string;
-  values: JsonObject;
+  values: string;
   version: string;
 }
 
@@ -24,40 +23,42 @@ const updateHelmReleaseInjectable = getInjectable({
   instantiate: (di) => {
     const logger = di.inject(loggerInjectable);
     const getHelmRelease = di.inject(getHelmReleaseInjectable);
+    const writeFile = di.inject(writeFileInjectable);
+    const removePath = di.inject(removePathInjectable);
+    const execHelm = di.inject(execHelmInjectable);
 
     return async (cluster: Cluster, releaseName: string, namespace: string, data: UpdateChartArgs) => {
       const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-
-      logger.debug("Upgrade release");
-
       const valuesFilePath = tempy.file({ name: "values.yaml" });
 
-      await fse.writeFile(valuesFilePath, yaml.dump(data.values));
-
-      const args = [
-        "upgrade",
-        releaseName,
-        data.chart,
-        "--version", data.version,
-        "--values", valuesFilePath,
-        "--namespace", namespace,
-        "--kubeconfig", proxyKubeconfig,
-      ];
+      logger.debug(`[HELM]: upgrading "${releaseName}" in "${namespace}" to ${data.version}`);
 
       try {
-        const output = await execHelm(args);
+        await writeFile(valuesFilePath, data.values);
+
+        const result = await execHelm([
+          "upgrade",
+          releaseName,
+          data.chart,
+          "--version", data.version,
+          "--values", valuesFilePath,
+          "--namespace", namespace,
+          "--kubeconfig", proxyKubeconfig,
+        ]);
+
+        if (result.callWasSuccessful === false) {
+          throw result.error; // keep the same interface
+        }
 
         return {
-          log: output,
+          log: result.response,
           release: await getHelmRelease(cluster, releaseName, namespace),
         };
       } finally {
-        await fse.unlink(valuesFilePath);
+        await removePath(valuesFilePath);
       }
     };
   },
-
-  causesSideEffects: true,
 });
 
 export default updateHelmReleaseInjectable;

src/main/routes/helm/releases/update-release-route.injectable.ts

@@ -17,8 +17,8 @@ const updateChartArgsValidator = Joi.object<UpdateChartArgs, true, UpdateChartAr
     .string()
     .required(),
   values: Joi
-    .object()
-    .unknown(true),
+    .string()
+    .required(),
 });
 
 const updateReleaseRouteInjectable = getRouteInjectable({