Stop using HelmCli from Renderer (#4861)

* Introduce way for execute file

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

* Make typing of HelmRepo shared

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

* Introduce way to get Helm environment values

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Introduce function to read YAML file

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Introduce competition for listing active helm repositories in preferences

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Make sense in name of injectable

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

* Introduce helper for opening and selecting values of select

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Introduce competition for activating, deactivating public helm repositories in preferences

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Introduce competition for deactivating helm repository from list of active repositories

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Add missing global overrides

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Make some tests more deterministic by mocking tooltips

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Introduce competition for activating custom helm repository in preferences

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Update snapshots

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Remove old implementation made redundant with competition for preferences of helm repositories

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Add success notification for activating custom helm repository

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

* Introduce way to get single active helm repository

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

* Extract responsibilities from god-class and switch to getting helm repositories using competition instead of another god class

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

* Remove dead code

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Add TODO

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Tweak position of spinner

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

* Start handling errors when accessing helm repositories

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Handle error about no helm repositories when updating repositories

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Remove unwarranted function configuration

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Add missing global overrides

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Remove duplication how to acquire binary path for helm

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

* Remove redundant comment

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

* Consolidate naming to match Helm's internal

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

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

* Relocate file closer to it's relatives

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

src/main/routes/helm/charts/get-chart-route.injectable.ts

@@ -5,25 +5,29 @@
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
-import { helmService } from "../../../helm/helm-service";
+import getHelmChartInjectable from "../../../helm/helm-service/get-helm-chart.injectable";
 
 const getChartRouteInjectable = getRouteInjectable({
   id: "get-chart-route",
 
-  instantiate: () => route({
-    method: "get",
-    path: `${apiPrefix}/v2/charts/{repo}/{chart}`,
-  })(async ({ params, query }) => {
-    const { repo, chart } = params;
+  instantiate: (di) => {
+    const getHelmChart = di.inject(getHelmChartInjectable);
 
-    return {
-      response: await helmService.getChart(
-        repo,
-        chart,
-        query.get("version") ?? undefined,
-      ),
-    };
-  }),
+    return route({
+      method: "get",
+      path: `${apiPrefix}/v2/charts/{repo}/{chart}`,
+    })(async ({ params, query }) => {
+      const { repo, chart } = params;
+
+      return {
+        response: await getHelmChart(
+          repo,
+          chart,
+          query.get("version") ?? undefined,
+        ),
+      };
+    });
+  },
 });
 
 export default getChartRouteInjectable;

src/main/routes/helm/charts/get-chart-values-route.injectable.ts

@@ -3,23 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getRouteInjectable } from "../../../router/router.injectable";
-import { helmService } from "../../../helm/helm-service";
 import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
+import getHelmChartValuesInjectable from "../../../helm/helm-service/get-helm-chart-values.injectable";
 
 const getChartRouteValuesInjectable = getRouteInjectable({
   id: "get-chart-route-values",
 
-  instantiate: () => route({
-    method: "get",
-    path: `${apiPrefix}/v2/charts/{repo}/{chart}/values`,
-  })(async ({ params, query }) => ({
-    response: await helmService.getChartValues(
-      params.repo,
-      params.chart,
-      query.get("version") ?? undefined,
-    ),
-  })),
+  instantiate: (di) => {
+    const getHelmChartValues = di.inject(getHelmChartValuesInjectable);
+
+    return route({
+      method: "get",
+      path: `${apiPrefix}/v2/charts/{repo}/{chart}/values`,
+    })(async ({ params, query }) => ({
+      response: await getHelmChartValues(
+        params.repo,
+        params.chart,
+        query.get("version") ?? undefined,
+      ),
+    }));
+  },
 });
 
 export default getChartRouteValuesInjectable;

src/main/routes/helm/charts/list-charts-route.injectable.ts

@@ -3,19 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getRouteInjectable } from "../../../router/router.injectable";
-import { helmService } from "../../../helm/helm-service";
 import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
+import listHelmChartsInjectable from "../../../helm/helm-service/list-helm-charts.injectable";
 
 const listChartsRouteInjectable = getRouteInjectable({
   id: "list-charts-route",
 
-  instantiate: () => route({
-    method: "get",
-    path: `${apiPrefix}/v2/charts`,
-  })(async () => ({
-    response: await helmService.listCharts(),
-  })),
+  instantiate: (di) => {
+    const listHelmCharts = di.inject(listHelmChartsInjectable);
+
+    return route({
+      method: "get",
+      path: `${apiPrefix}/v2/charts`,
+    })(async () => ({
+      response: await listHelmCharts(),
+    }));
+  },
 });
 
 export default listChartsRouteInjectable;

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

@@ -3,23 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import deleteHelmReleaseInjectable from "../../../helm/helm-service/delete-helm-release.injectable";
 
 const deleteReleaseRouteInjectable = getRouteInjectable({
   id: "delete-release-route",
 
-  instantiate: () => clusterRoute({
-    method: "delete",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
-  })(async ({ cluster, params: { release, namespace }}) => ({
-    response: await helmService.deleteRelease(
-      cluster,
-      release,
-      namespace,
-    ),
-  })),
+  instantiate: (di) => {
+    const deleteHelmRelease = di.inject(deleteHelmReleaseInjectable);
+
+    return clusterRoute({
+      method: "delete",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
+    })(async ({ cluster, params: { release, namespace }}) => ({
+      response: await deleteHelmRelease(cluster, release, namespace),
+    }));
+  },
 });
 
 export default deleteReleaseRouteInjectable;

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

@@ -3,23 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import getHelmReleaseHistoryInjectable from "../../../helm/helm-service/get-helm-release-history.injectable";
 
 const getReleaseRouteHistoryInjectable = getRouteInjectable({
   id: "get-release-history-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}/history`,
-  })(async ({ cluster, params }) => ({
-    response: await helmService.getReleaseHistory(
-      cluster,
-      params.release,
-      params.namespace,
-    ),
-  })),
+  instantiate: (di) => {
+    const getHelmReleaseHistory = di.inject(getHelmReleaseHistoryInjectable);
+
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}/history`,
+    })(async ({ cluster, params }) => ({
+      response: await getHelmReleaseHistory(
+        cluster,
+        params.release,
+        params.namespace,
+      ),
+    }));
+  },
 });
 
 export default getReleaseRouteHistoryInjectable;

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

@@ -3,23 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import getHelmReleaseInjectable from "../../../helm/helm-service/get-helm-release.injectable";
 
 const getReleaseRouteInjectable = getRouteInjectable({
   id: "get-release-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
-  })(async ({ cluster, params }) => ({
-    response: await helmService.getRelease(
-      cluster,
-      params.release,
-      params.namespace,
-    ),
-  })),
+  instantiate: (di) => {
+    const getHelmRelease = di.inject(getHelmReleaseInjectable);
+
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
+    })(async ({ cluster, params }) => ({
+      response: await getHelmRelease(
+        cluster,
+        params.release,
+        params.namespace,
+      ),
+    }));
+  },
 });
 
 export default getReleaseRouteInjectable;

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

@@ -3,27 +3,31 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { getBoolean } from "../../../utils/parse-query";
 import { contentTypes } from "../../../router/router-content-types";
 import { clusterRoute } from "../../../router/route";
+import getHelmReleaseValuesInjectable from "../../../helm/helm-service/get-helm-release-values.injectable";
 
 const getReleaseRouteValuesInjectable = getRouteInjectable({
   id: "get-release-values-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}/values`,
-  })(async ({ cluster, params: { namespace, release }, query }) => ({
-    response: await helmService.getReleaseValues(release, {
-      cluster,
-      namespace,
-      all: getBoolean(query, "all"),
-    }),
+  instantiate: (di) => {
+    const getHelmReleaseValues = di.inject(getHelmReleaseValuesInjectable);
 
-    contentType: contentTypes.txt,
-  })),
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}/values`,
+    })(async ({ cluster, params: { namespace, release }, query }) => ({
+      response: await getHelmReleaseValues(release, {
+        cluster,
+        namespace,
+        all: getBoolean(query, "all"),
+      }),
+
+      contentType: contentTypes.txt,
+    }));
+  },
 });
 
 export default getReleaseRouteValuesInjectable;

src/main/routes/helm/releases/install-chart-route.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { InstallChartArgs } from "../../../helm/helm-service";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import Joi from "joi";
 import { payloadValidatedClusterRoute } from "../../../router/route";
+import type { InstallChartArgs } from "../../../helm/helm-service/install-helm-chart.injectable";
+import installHelmChartInjectable from "../../../helm/helm-service/install-helm-chart.injectable";
 
 const installChartArgsValidator = Joi.object<InstallChartArgs, true, InstallChartArgs>({
   chart: Joi
@@ -31,14 +31,18 @@ const installChartArgsValidator = Joi.object<InstallChartArgs, true, InstallChar
 const installChartRouteInjectable = getRouteInjectable({
   id: "install-chart-route",
 
-  instantiate: () => payloadValidatedClusterRoute({
-    method: "post",
-    path: `${apiPrefix}/v2/releases`,
-    payloadValidator: installChartArgsValidator,
-  })(async ({ payload, cluster }) => ({
-    response: await helmService.installChart(cluster, payload),
-    statusCode: 201,
-  })),
+  instantiate: (di) => {
+    const installHelmChart = di.inject(installHelmChartInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "post",
+      path: `${apiPrefix}/v2/releases`,
+      payloadValidator: installChartArgsValidator,
+    })(async ({ payload, cluster }) => ({
+      response: await installHelmChart(cluster, payload),
+      statusCode: 201,
+    }));
+  },
 });
 
 export default installChartRouteInjectable;

src/main/routes/helm/releases/list-releases-route.injectable.ts

@@ -3,19 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import listHelmReleasesInjectable from "../../../helm/helm-service/list-helm-releases.injectable";
 
 const listReleasesRouteInjectable = getRouteInjectable({
   id: "list-releases-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace?}`,
-  })(async ({ cluster, params }) => ({
-    response: await helmService.listReleases(cluster, params.namespace),
-  })),
+  instantiate: (di) => {
+    const listHelmReleases = di.inject(listHelmReleasesInjectable);
+
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace?}`,
+    })(async ({ cluster, params }) => ({
+      response: await listHelmReleases(cluster, params.namespace),
+    }));
+  },
 });
 
 export default listReleasesRouteInjectable;

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

@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 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";
 
 interface RollbackReleasePayload {
   revision: number;
@@ -21,13 +21,17 @@ const rollbackReleasePayloadValidator = Joi.object<RollbackReleasePayload, true,
 const rollbackReleaseRouteInjectable = getRouteInjectable({
   id: "rollback-release-route",
 
-  instantiate: () => payloadValidatedClusterRoute({
-    method: "put",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}/rollback`,
-    payloadValidator: rollbackReleasePayloadValidator,
-  })(async ({ cluster, params: { release, namespace }, payload }) => {
-    await helmService.rollback(cluster, release, namespace, payload.revision);
-  }),
+  instantiate: (di) => {
+    const rollbackRelease = di.inject(rollbackHelmReleaseInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "put",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}/rollback`,
+      payloadValidator: rollbackReleasePayloadValidator,
+    })(async ({ cluster, params: { release, namespace }, payload }) => {
+      await rollbackRelease(cluster, release, namespace, payload.revision);
+    });
+  },
 });
 
 export default rollbackReleaseRouteInjectable;

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

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { UpdateChartArgs } from "../../../helm/helm-service";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { payloadValidatedClusterRoute } from "../../../router/route";
 import Joi from "joi";
+import type { UpdateChartArgs } from "../../../helm/helm-service/update-helm-release.injectable";
+import updateHelmReleaseInjectable from "../../../helm/helm-service/update-helm-release.injectable";
 
 const updateChartArgsValidator = Joi.object<UpdateChartArgs, true, UpdateChartArgs>({
   chart: Joi
@@ -24,18 +24,22 @@ const updateChartArgsValidator = Joi.object<UpdateChartArgs, true, UpdateChartAr
 const updateReleaseRouteInjectable = getRouteInjectable({
   id: "update-release-route",
 
-  instantiate: () => payloadValidatedClusterRoute({
-    method: "put",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
-    payloadValidator: updateChartArgsValidator,
-  })(async ({ cluster, params, payload }) => ({
-    response: await helmService.updateRelease(
-      cluster,
-      params.release,
-      params.namespace,
-      payload,
-    ),
-  })),
+  instantiate: (di) => {
+    const updateRelease = di.inject(updateHelmReleaseInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "put",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
+      payloadValidator: updateChartArgsValidator,
+    })(async ({ cluster, params, payload }) => ({
+      response: await updateRelease(
+        cluster,
+        params.release,
+        params.namespace,
+        payload,
+      ),
+    }));
+  },
 });
 
 export default updateReleaseRouteInjectable;