Make rollbackHelmRelease injectable

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

src/main/getDiForUnitTesting.ts

@@ -57,7 +57,6 @@ import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-
 import getHelmChartVersionsInjectable from "./helm/helm-service/get-helm-chart-versions.injectable";
 import getHelmChartValuesInjectable from "./helm/helm-service/get-helm-chart-values.injectable";
 import listHelmChartsInjectable from "./helm/helm-service/list-helm-charts.injectable";
-import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-release.injectable";
 import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import electronInjectable from "./utils/resolve-system-proxy/electron.injectable";
@@ -134,7 +133,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
       getHelmChartVersionsInjectable,
       getHelmChartValuesInjectable,
       listHelmChartsInjectable,
-      rollbackHelmReleaseInjectable,
       writeJsonFileInjectable,
       readJsonFileInjectable,
       readFileInjectable,

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

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { asLegacyGlobalFunctionForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api";
-import execHelmInjectable from "./exec-helm/exec-helm.injectable";
-
-const execHelm = asLegacyGlobalFunctionForExtensionApi(execHelmInjectable);
-
-export async function rollback(name: string, namespace: string, revision: number, kubeconfigPath: string): Promise<void> {
-  const result = await execHelm([
-    "rollback",
-    name,
-    `${revision}`,
-    "--namespace", namespace,
-    "--kubeconfig", kubeconfigPath,
-  ]);
-
-  if (!result.callWasSuccessful) {
-    throw result.error;
-  }
-}

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

@@ -5,28 +5,24 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { Cluster } from "../../../common/cluster/cluster";
 import loggerInjectable from "../../../common/logger.injectable";
-import { rollback } from "../helm-release-manager";
+import type { RollbackHelmReleaseData } from "../rollback-helm-release.injectable";
+import rollbackHelmReleaseInjectable from "../rollback-helm-release.injectable";
 
-const rollbackHelmReleaseInjectable = getInjectable({
+const rollbackClusterHelmReleaseInjectable = getInjectable({
-  id: "rollback-helm-release",
+  id: "rollback-cluster-helm-release",
 
   instantiate: (di) => {
     const logger = di.inject(loggerInjectable);
+    const rollbackHelmRelease = di.inject(rollbackHelmReleaseInjectable);
 
-    return async (
+    return async (cluster: Cluster, data: RollbackHelmReleaseData) => {
-      cluster: Cluster,
-      releaseName: string,
-      namespace: string,
-      revision: number,
-    ) => {
       const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
 
-      logger.debug("Rollback release");
+      logger.debug(`[CLUSTER]: rolling back helm release for clusterId=${cluster.id}`, data);
-      await rollback(releaseName, namespace, revision, proxyKubeconfig);
+
+      await rollbackHelmRelease(proxyKubeconfig, data);
     };
   },
-
-  causesSideEffects: true,
 });
 
-export default rollbackHelmReleaseInjectable;
+export default rollbackClusterHelmReleaseInjectable;

src/main/helm/rollback-helm-release.injectable.ts

@@ -0,0 +1,37 @@
+/**
+ * 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 execHelmInjectable from "./exec-helm/exec-helm.injectable";
+
+export interface RollbackHelmReleaseData {
+  name: string;
+  namespace: string;
+  revision: number;
+}
+
+export type RollbackHelmRelease = (kubeconfigPath: string, data: RollbackHelmReleaseData) => Promise<void>;
+
+const rollbackHelmReleaseInjectable = getInjectable({
+  id: "rollback-helm-release",
+  instantiate: (di): RollbackHelmRelease => {
+    const execHelm = di.inject(execHelmInjectable);
+
+    return async (kubeconfigPath, { name, namespace, revision }) => {
+      const result = await execHelm([
+        "rollback",
+        name,
+        `${revision}`,
+        "--namespace", namespace,
+        "--kubeconfig", kubeconfigPath,
+      ]);
+
+      if (!result.callWasSuccessful) {
+        throw result.error;
+      }
+    };
+  },
+});
+
+export default rollbackHelmReleaseInjectable;

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

@@ -6,7 +6,7 @@ import { apiPrefix } from "../../../../common/vars";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import Joi from "joi";
 import { payloadValidatedClusterRoute } from "../../../router/route";
-import rollbackHelmReleaseInjectable from "../../../helm/helm-service/rollback-helm-release.injectable";
+import rollbackClusterHelmReleaseInjectable from "../../../helm/helm-service/rollback-helm-release.injectable";
 
 interface RollbackReleasePayload {
   revision: number;
@@ -22,14 +22,14 @@ const rollbackReleaseRouteInjectable = getRouteInjectable({
   id: "rollback-release-route",
 
   instantiate: (di) => {
-    const rollbackRelease = di.inject(rollbackHelmReleaseInjectable);
+    const rollbackRelease = di.inject(rollbackClusterHelmReleaseInjectable);
 
     return payloadValidatedClusterRoute({
       method: "put",
-      path: `${apiPrefix}/v2/releases/{namespace}/{release}/rollback`,
+      path: `${apiPrefix}/v2/releases/{namespace}/{name}/rollback`,
       payloadValidator: rollbackReleasePayloadValidator,
-    })(async ({ cluster, params: { release, namespace }, payload }) => {
+    })(async ({ cluster, params, payload }) => {
-      await rollbackRelease(cluster, release, namespace, payload.revision);
+      await rollbackRelease(cluster, { ...params, ...payload });
     });
   },
 });