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>
2025-05-20 05:10:56 +00:00 · 2022-06-13 11:42:53 +03:00
1 parent 5420780ae0
commit 1393cc303d
@@ -0,0 +1,25 @@
+/**
+ * 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 { execFile } from "child_process";
+import { promisify } from "util";
+
+export type ExecFile = (filePath: string, args: string[]) => Promise<string>;
+
+const execFileInjectable = getInjectable({
+  id: "exec-file",
+
+  instantiate: (): ExecFile => async (filePath, args) => {
+    const asyncExecFile = promisify(execFile);
+
+    const result = await asyncExecFile(filePath, args);
+
+    return result.stdout;
+  },
+
+  causesSideEffects: true,
+});
+
+export default execFileInjectable;
@@ -0,0 +1,25 @@
+/**
+ * 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 readFileInjectable from "./read-file.injectable";
+import yaml from "js-yaml";
+
+export type ReadYamlFile = (filePath: string) => Promise<unknown>;
+
+const readYamlFileInjectable = getInjectable({
+  id: "read-yaml-file",
+
+  instantiate: (di): ReadYamlFile => {
+    const readFile = di.inject(readFileInjectable);
+
+    return async (filePath: string) => {
+      const contents = await readFile(filePath);
+
+      return yaml.load(contents);
+    };
+  },
+});
+
+export default readYamlFileInjectable;
@@ -0,0 +1,23 @@
+/**
+ * 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 type { HelmRepo } from "./helm-repo";
+import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
+import type { AsyncResult } from "../utils/async-result";
+
+export type AddHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<string>>;
+
+const addHelmRepositoryChannelInjectable = getInjectable({
+  id: "add-helm-repository-channel",
+
+  instantiate: (): AddHelmRepositoryChannel => ({
+    id: "add-helm-repository-channel",
+  }),
+
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default addHelmRepositoryChannelInjectable;
@@ -0,0 +1,23 @@
+/**
+ * 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 type { RequestChannel } from "../utils/channel/request-channel-injection-token";
+import type { HelmRepo } from "./helm-repo";
+import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
+import type { AsyncResult } from "../utils/async-result";
+
+export type GetHelmRepositoriesChannel = RequestChannel<void, AsyncResult<HelmRepo[]>>;
+
+const getActiveHelmRepositoriesChannelInjectable = getInjectable({
+  id: "get-active-helm-repositories-channel",
+
+  instantiate: (): GetHelmRepositoriesChannel => ({
+    id: "get-helm-active-list-repositories",
+  }),
+
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default getActiveHelmRepositoriesChannelInjectable;
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type HelmRepo = {
+  name: string;
+  url: string;
+  cacheFilePath?: string;
+  caFile?: string;
+  certFile?: string;
+  insecureSkipTlsVerify?: boolean;
+  keyFile?: string;
+  username?: string;
+  password?: string;
+};
@@ -0,0 +1,22 @@
+/**
+ * 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 type { HelmRepo } from "./helm-repo";
+import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
+
+export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo>;
+
+const removeHelmRepositoryChannelInjectable = getInjectable({
+  id: "remove-helm-repository-channel",
+
+  instantiate: (): RemoveHelmRepositoryChannel => ({
+    id: "remove-helm-repository-channel",
+  }),
+
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default removeHelmRepositoryChannelInjectable;
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export type AsyncResult<Response, Error = string> =
+  | { callWasSuccessful: true; response: Response }
+  | { callWasSuccessful: false; error: Error };
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export const getErrorMessage = (error: unknown): string => {
+  if (typeof error === "string") {
+    return error;
+  }
+
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  return JSON.stringify(error);
+};
@@ -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 bundledBinariesNormalizedArchInjectable from "./bundled-binaries-normalized-arch.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({
-  id: "base-bundeled-binaries-directory",
-  instantiate: (di) => path.join(
-    di.inject(bundledResourcesDirectoryInjectable),
-    di.inject(bundledBinariesNormalizedArchInjectable),
-  ),
+const baseBundledBinariesDirectoryInjectable = getInjectable({
+  id: "base-bundled-binaries-directory",
+  instantiate: (di) => {
+    const bundledResourcesDirectory = di.inject(bundledResourcesDirectoryInjectable);
+    const normalizedPlatformArchitecture = di.inject(normalizedPlatformArchitectureInjectable);
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+
+    return getAbsolutePath(
+      bundledResourcesDirectory,
+      normalizedPlatformArchitecture,
+    );
+  },
 });

-export default baseBundeledBinariesDirectoryInjectable;
+export default baseBundledBinariesDirectoryInjectable;
@@ -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
-      : path.join(process.cwd(), "binaries", "client", normalizedPlatform);
+      ? lensResourcesDir
+      : getAbsolutePath(lensResourcesDir, "binaries", "client", normalizedPlatform);
  },
 });

@@ -4,8 +4,8 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";

-const bundledBinariesNormalizedArchInjectable = getInjectable({
-  id: "bundled-binaries-normalized-arch",
+const normalizedPlatformArchitectureInjectable = getInjectable({
+  id: "normalized-platform-architecture",
  instantiate: () => {
    switch (process.arch) {
      case "arm64":
@@ -24,4 +24,4 @@ const bundledBinariesNormalizedArchInjectable = getInjectable({
  causesSideEffects: true,
 });

-export default bundledBinariesNormalizedArchInjectable;
+export default normalizedPlatformArchitectureInjectable;
@@ -3,11 +3,15 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectable } from "@ogre-tools/injectable";
+import platformInjectable from "./platform.injectable";

 const normalizedPlatformInjectable = getInjectable({
  id: "normalized-platform",
-  instantiate: () => {
-    switch (process.platform) {
+
+  instantiate: (di) => {
+    const platform = di.inject(platformInjectable);
+
+    switch (platform) {
      case "darwin":
        return "darwin";
      case "linux":
@@ -15,10 +19,9 @@ const normalizedPlatformInjectable = getInjectable({
      case "win32":
        return "windows";
      default:
-        throw new Error(`platform=${process.platform} is unsupported`);
+        throw new Error(`platform=${platform} is unsupported`);
    }
  },
-  causesSideEffects: true,
 });

 export default normalizedPlatformInjectable;