From 240dfad1672b2ea80ada87bebf5b17247ac87ee0 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Thu, 9 Jun 2022 13:39:37 +0300 Subject: [PATCH 01/64] Enable csp on lens proxy (#5581) * enable csp on lens proxy Signed-off-by: Jari Kolehmainen * move csp default value to package.json Signed-off-by: Jari Kolehmainen --- package.json | 3 ++- src/common/vars.ts | 1 + src/main/lens-proxy/lens-proxy.ts | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2f652eb980..c34198e158 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,8 @@ "k8sProxyVersion": "0.2.1", "bundledKubectlVersion": "1.23.3", "bundledHelmVersion": "3.7.2", - "sentryDsn": "" + "sentryDsn": "", + "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src *" }, "engines": { "node": ">=16 <17" diff --git a/src/common/vars.ts b/src/common/vars.ts index e11e49a7a2..32eda45db6 100644 --- a/src/common/vars.ts +++ b/src/common/vars.ts @@ -143,3 +143,4 @@ export const appSemVer = new SemVer(packageInfo.version); export const docsUrl = "https://docs.k8slens.dev/main/" as string; export const sentryDsn = packageInfo.config?.sentryDsn ?? ""; +export const contentSecurityPolicy = packageInfo.config?.contentSecurityPolicy ?? ""; diff --git a/src/main/lens-proxy/lens-proxy.ts b/src/main/lens-proxy/lens-proxy.ts index 571cbea7b4..5e58104d60 100644 --- a/src/main/lens-proxy/lens-proxy.ts +++ b/src/main/lens-proxy/lens-proxy.ts @@ -7,7 +7,7 @@ import net from "net"; import type http from "http"; import spdy from "spdy"; import type httpProxy from "http-proxy"; -import { apiPrefix, apiKubePrefix } from "../../common/vars"; +import { apiPrefix, apiKubePrefix, contentSecurityPolicy } from "../../common/vars"; import type { Router } from "../router/router"; import type { ClusterContextHandler } from "../context-handler/context-handler"; import logger from "../logger"; @@ -239,6 +239,10 @@ export class LensProxy { } } + if (contentSecurityPolicy) { + res.setHeader("Content-Security-Policy", contentSecurityPolicy); + } + this.dependencies.router.route(cluster, req, res); } } From ef6f4a5bfa916bab6ec086d5222a9f7f2e119e2d Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 9 Jun 2022 15:12:57 +0300 Subject: [PATCH 02/64] Bump injectable for faster unit tests (#5587) Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- package.json | 8 ++++---- yarn.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index c34198e158..1b1414d2a5 100644 --- a/package.json +++ b/package.json @@ -208,10 +208,10 @@ "@hapi/subtext": "^7.0.3", "@kubernetes/client-node": "^0.16.3", "@material-ui/styles": "^4.11.5", - "@ogre-tools/injectable": "7.0.0", - "@ogre-tools/injectable-react": "7.0.0", - "@ogre-tools/fp": "7.0.0", - "@ogre-tools/injectable-extension-for-auto-registration": "7.0.0", + "@ogre-tools/injectable": "7.1.0", + "@ogre-tools/injectable-react": "7.1.0", + "@ogre-tools/fp": "7.1.0", + "@ogre-tools/injectable-extension-for-auto-registration": "7.1.0", "@sentry/electron": "^3.0.7", "@sentry/integrations": "^6.19.3", "@types/circular-dependency-plugin": "5.0.5", diff --git a/yarn.lock b/yarn.lock index 120613934c..8c519e766f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1102,37 +1102,37 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@ogre-tools/fp@7.0.0", "@ogre-tools/fp@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-7.0.0.tgz#55cd32cc2fcf0505fa0d3ebfd45eb0a9bbb9554c" - integrity sha512-vmd+Ctr9pTSulWWiYaJT4Ca2vkq1MVQvwZ42hJq+LK/tgC4vVMf6G13EMHwhRlhPyrro1/5NeN2kf6SlhgrVOg== +"@ogre-tools/fp@7.1.0", "@ogre-tools/fp@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-7.1.0.tgz#63bdd23e82d4d0f3cfffbf575017e4dac893f590" + integrity sha512-lhXreCXr1mlyvNf+YXvqBcIvL2ZKswYJXK1hx2ieeQLmgyvDs6xGio6h+6bHf1kJhvM55PfBATAJ3DyyiUfwiA== dependencies: lodash "^4.17.21" -"@ogre-tools/injectable-extension-for-auto-registration@7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-7.0.0.tgz#2144417dd3b3c10afe232661e11d7d0e292a3e6b" - integrity sha512-11RVfzMIBIS/29EUnrhRl/WhwWTYi2cJCAEyh2NnPBV7m51wS40kE/ZjDNn9s37Mfsxc8wNX0aUKwMphXFosVw== +"@ogre-tools/injectable-extension-for-auto-registration@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-7.1.0.tgz#eb4aabee04fff1c4e353e4b5e805639e5e8923d5" + integrity sha512-xEnXF2iAxYOCj46HymDIjO85zsunONmMD8CThks46pyUD7kTOaf7c9tClEUFdXQTmCAfU3UFxcAxDjyJynoSTg== dependencies: - "@ogre-tools/fp" "^7.0.0" - "@ogre-tools/injectable" "^7.0.0" + "@ogre-tools/fp" "^7.1.0" + "@ogre-tools/injectable" "^7.1.0" lodash "^4.17.21" -"@ogre-tools/injectable-react@7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-7.0.0.tgz#09c45fbf9a904673a6a0b450cb9a6a7c1110ab14" - integrity sha512-L/NlM4nzIg0FOfH/5T3wYBsPUxALkpt+HaZSOcgzCM9fJnaSgYv/FwdAqshg+nA3KngPDYIMkAUdS+j3uq1yEA== +"@ogre-tools/injectable-react@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-7.1.0.tgz#afb60951e7e22b59921eb5ce5d04e3be93fe119e" + integrity sha512-JDTZR+1IhFUAPjlzP7IwMRysFBVjpQke4Y/7Ddy7MhOF+WtfFx8pOnuWFWKQRlU2FS4PsMpCG09Jgy09j+Qa8Q== dependencies: - "@ogre-tools/fp" "^7.0.0" - "@ogre-tools/injectable" "^7.0.0" + "@ogre-tools/fp" "^7.1.0" + "@ogre-tools/injectable" "^7.1.0" lodash "^4.17.21" -"@ogre-tools/injectable@7.0.0", "@ogre-tools/injectable@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-7.0.0.tgz#25e6168ba3781f6b562bfbb06d1d54c976e9c94d" - integrity sha512-yfdNUU/q7Oy+bXnQN1lRD2wzt81xqGpf37C4iWfarZ+5GF4sjGi9w4Wuxe1s24rl2rpHZtcQ0j9bEEX51ifQHA== +"@ogre-tools/injectable@7.1.0", "@ogre-tools/injectable@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-7.1.0.tgz#4137d630720245e9bc8635a0f62888878f711da5" + integrity sha512-EN82trTh80TuSE0Gr1Gk4oC/Mj3Od//kWH2r+0Z3Np554e4zOgW6lyEOQlxaGIm77taGSvHq9B9cO7lI9hJonQ== dependencies: - "@ogre-tools/fp" "^7.0.0" + "@ogre-tools/fp" "^7.1.0" lodash "^4.17.21" "@panva/asn1.js@^1.0.0": From c54d59f2058f2097abee415a0f8a85dfee5001f9 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 9 Jun 2022 16:55:01 -0400 Subject: [PATCH 03/64] Fix cluster.k8s.io/v1alpha1/clusters CRD not being marked as Namespaced (#5593) --- src/common/k8s-api/endpoints/cluster.api.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/common/k8s-api/endpoints/cluster.api.ts b/src/common/k8s-api/endpoints/cluster.api.ts index 53e12800b0..082f0adb09 100644 --- a/src/common/k8s-api/endpoints/cluster.api.ts +++ b/src/common/k8s-api/endpoints/cluster.api.ts @@ -10,7 +10,14 @@ import type { DerivedKubeApiOptions, IgnoredKubeApiOptions } from "../kube-api"; import { KubeApi } from "../kube-api"; export class ClusterApi extends KubeApi { + /** + * @deprecated This field is legacy and never used. + */ static kind = "Cluster"; + + /** + * @deprecated This field is legacy and never used. + */ static namespaced = true; constructor(opts: DerivedKubeApiOptions & IgnoredKubeApiOptions = {}) { @@ -104,6 +111,7 @@ export interface Cluster { export class Cluster extends KubeObject { static kind = "Cluster"; static apiBase = "/apis/cluster.k8s.io/v1alpha1/clusters"; + static namespaced = true; getStatus() { if (this.metadata.deletionTimestamp) return ClusterStatus.REMOVING; From 3d64425df20df13e12fddb3c5a1a6f2581801e27 Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 10 Jun 2022 13:23:25 +0300 Subject: [PATCH 04/64] allow to load images with data:base64 urls (#5599) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b1414d2a5..b30076ec10 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "bundledKubectlVersion": "1.23.3", "bundledHelmVersion": "3.7.2", "sentryDsn": "", - "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src *" + "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:" }, "engines": { "node": ">=16 <17" From 5420780ae0af5da14c0dbcd5bba073e7d38e26e5 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 10 Jun 2022 06:41:29 -0400 Subject: [PATCH 05/64] Fix changes to InputValidator to resolve accidental breaking changes (#5403) * Fix changes to InputValidator to resolve accidental breaking changes Signed-off-by: Sebastian Malton * Show changes working by removing no longer required empty props objects Signed-off-by: Sebastian Malton * fix type errors Signed-off-by: Sebastian Malton * Fix async validation errors not being displayed - And fix validation errors sometimes being displayed multiple times Signed-off-by: Sebastian Malton * Simplify builders for validators - Replace the boolean type params on `function inputValidator` with a new builder `function inputValidatorWithRequiredProps` to make the code easier to read Signed-off-by: Sebastian Malton * Introduce unionizing functions for input validators Signed-off-by: Sebastian Malton * fix tests Signed-off-by: Sebastian Malton * Remove RequiredProps type param Signed-off-by: Sebastian Malton --- src/common/utils/type-narrowing.ts | 8 ++ .../install-from-input/install-from-input.tsx | 17 +-- .../components/+extensions/install.tsx | 21 ++- .../input/__tests__/input_validators.test.ts | 83 ++++++++++- src/renderer/components/input/input.tsx | 83 +++++------ .../components/input/input_validators.ts | 130 +++++++++++++----- 6 files changed, 244 insertions(+), 98 deletions(-) diff --git a/src/common/utils/type-narrowing.ts b/src/common/utils/type-narrowing.ts index a138b2a0ec..eb5b6996cf 100644 --- a/src/common/utils/type-narrowing.ts +++ b/src/common/utils/type-narrowing.ts @@ -137,6 +137,14 @@ export function hasDefiniteField(field: Field): (val: return (val): val is T & { [f in Field]-?: NonNullable } => val[field] != null; } +export function isPromiseSettledRejected(result: PromiseSettledResult): result is PromiseRejectedResult { + return result.status === "rejected"; +} + +export function isPromiseSettledFulfilled(result: PromiseSettledResult): result is PromiseFulfilledResult { + return result.status === "fulfilled"; +} + export function isErrnoException(error: unknown): error is NodeJS.ErrnoException { return isObject(error) && hasOptionalTypedProperty(error, "code", isString) diff --git a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx b/src/renderer/components/+extensions/install-from-input/install-from-input.tsx index ab85221421..eb5d6febe4 100644 --- a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx +++ b/src/renderer/components/+extensions/install-from-input/install-from-input.tsx @@ -14,7 +14,6 @@ import { readFileNotify } from "../read-file-notify/read-file-notify"; import type { InstallRequest } from "../attempt-install/install-request"; import type { ExtensionInfo } from "../attempt-install-by-info.injectable"; import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store"; -import { AsyncInputValidationError } from "../../input/input_validators"; export type InstallFromInput = (input: string) => Promise; @@ -34,7 +33,7 @@ export const installFromInput = ({ try { // fixme: improve error messages for non-tar-file URLs - if (InputValidators.isUrl.validate(input, {})) { + if (InputValidators.isUrl.validate(input)) { // install via url disposer = extensionInstallationStateStore.startPreInstall(); const { promise } = downloadFile({ url: input, timeout: 10 * 60 * 1000 }); @@ -44,23 +43,19 @@ export const installFromInput = ({ } try { - await InputValidators.isPath.validate(input, {}); + await InputValidators.isPath.validate(input); // install from system path const fileName = path.basename(input); return await attemptInstall({ fileName, dataP: readFileNotify(input) }); } catch (error) { - if (error instanceof AsyncInputValidationError) { - const extNameCaptures = InputValidators.isExtensionNameInstallRegex.captures(input); + const extNameCaptures = InputValidators.isExtensionNameInstallRegex.captures(input); - if (extNameCaptures) { - const { name, version } = extNameCaptures; + if (extNameCaptures) { + const { name, version } = extNameCaptures; - return await attemptInstallByInfo({ name, version }); - } - } else { - throw error; + return await attemptInstallByInfo({ name, version }); } } diff --git a/src/renderer/components/+extensions/install.tsx b/src/renderer/components/+extensions/install.tsx index 52c0bd8906..7fa192e3a2 100644 --- a/src/renderer/components/+extensions/install.tsx +++ b/src/renderer/components/+extensions/install.tsx @@ -13,10 +13,9 @@ import { Input, InputValidators } from "../input"; import { SubTitle } from "../layout/sub-title"; import { TooltipPosition } from "../tooltip"; import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store"; -import extensionInstallationStateStoreInjectable - from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable"; +import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { inputValidator } from "../input/input_validators"; +import { unionInputValidatorsAsync } from "../input/input_validators"; export interface InstallProps { installPath: string; @@ -30,18 +29,14 @@ interface Dependencies { extensionInstallationStateStore: ExtensionInstallationStateStore; } -const installInputValidators = [ +const installInputValidator = unionInputValidatorsAsync( + { + message: "Invalid URL, absolute path, or extension name", + }, InputValidators.isUrl, - InputValidators.isPath, InputValidators.isExtensionNameInstall, -]; - -const installInputValidator = inputValidator({ - message: "Invalid URL, absolute path, or extension name", - validate: (value: string, props) => ( - installInputValidators.some(({ validate }) => validate(value, props)) - ), -}); + InputValidators.isPath, +); const NonInjectedInstall: React.FC = ({ installPath, diff --git a/src/renderer/components/input/__tests__/input_validators.test.ts b/src/renderer/components/input/__tests__/input_validators.test.ts index ae45b998dd..cb6a0b3db9 100644 --- a/src/renderer/components/input/__tests__/input_validators.test.ts +++ b/src/renderer/components/input/__tests__/input_validators.test.ts @@ -3,11 +3,86 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { isEmail, isUrl, systemName } from "../input_validators"; +import { isEmail, isUrl, systemName, unionInputValidators, unionInputValidatorsAsync } from "../input_validators"; type TextValidationCase = [string, boolean]; describe("input validation tests", () => { + describe("unionInputValidators()", () => { + const emailOrUrl = unionInputValidators( + { + message: "Not an email or URL", + }, + isEmail, + isUrl, + ); + + it.each([ + "abc@news.com", + "abc@news.co.uk", + ])("Given '%s' is a valid email, emailOrUrl matches", (input) => { + expect(emailOrUrl.validate(input)).toBe(true); + }); + + it.each([ + "https://github-production-registry-package-file-4f11e5.s3.amazonaws.com/307985088/68bbbf00-309f-11eb-8457-a15e4efe9e77?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20201127%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20201127T123754Z&X-Amz-Expires=300&X-Amz-Signature=9b8167f00685a20d980224d397892195abc187cdb2934cefb79edcd7ec600f78&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=0&response-content-disposition=filename%3Dstarboard-lens-extension-0.0.1-alpha.1-npm.tgz&response-content-type=application%2Foctet-stream", + "http://www.google.com", + ])("Given '%s' is a valid url, emailOrUrl matches", (input) => { + expect(emailOrUrl.validate(input)).toBe(true); + }); + + it.each([ + "hello", + "57", + ])("Given '%s' is neither a valid email nor URL, emailOrUrl does not match", (input) => { + expect(emailOrUrl.validate(input)).toBe(false); + }); + }); + + describe("unionInputValidatorsAsync()", () => { + const emailOrUrl = unionInputValidatorsAsync( + { + message: "Not an email or URL", + }, + isEmail, + isUrl, + ); + + it.each([ + "abc@news.com", + "abc@news.co.uk", + ])("Given '%s' is a valid email, emailOrUrl matches", async (input) => { + try { + await emailOrUrl.validate(input); + } catch { + fail("Should not throw on valid input"); + } + }); + + it.each([ + "https://github-production-registry-package-file-4f11e5.s3.amazonaws.com/307985088/68bbbf00-309f-11eb-8457-a15e4efe9e77?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20201127%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20201127T123754Z&X-Amz-Expires=300&X-Amz-Signature=9b8167f00685a20d980224d397892195abc187cdb2934cefb79edcd7ec600f78&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=0&response-content-disposition=filename%3Dstarboard-lens-extension-0.0.1-alpha.1-npm.tgz&response-content-type=application%2Foctet-stream", + "http://www.google.com", + ])("Given '%s' is a valid url, emailOrUrl matches", async (input) => { + try { + await emailOrUrl.validate(input); + } catch { + fail("Should not throw on valid input"); + } + }); + + it.each([ + "hello", + "57", + ])("Given '%s' is neither a valid email nor URL, emailOrUrl does not match", async (input) => { + try { + await emailOrUrl.validate(input); + fail("Should throw on invalid input"); + } catch { + // We want this to happen + } + }); + }); + describe("isEmail tests", () => { const tests: TextValidationCase[] = [ ["abc@news.com", true], @@ -21,7 +96,7 @@ describe("input validation tests", () => { ]; it.each(tests)("validate %s", (input, output) => { - expect(isEmail.validate(input, {})).toBe(output); + expect(isEmail.validate(input)).toBe(output); }); }); @@ -38,7 +113,7 @@ describe("input validation tests", () => { ]; it.each(cases)("validate %s", (input, output) => { - expect(isUrl.validate(input, {})).toBe(output); + expect(isUrl.validate(input)).toBe(output); }); }); @@ -68,7 +143,7 @@ describe("input validation tests", () => { ]; it.each(tests)("validate %s", (input, output) => { - expect(systemName.validate(input, {})).toBe(output); + expect(systemName.validate(input)).toBe(output); }); }); }); diff --git a/src/renderer/components/input/input.tsx b/src/renderer/components/input/input.tsx index 9514e796e3..f45c8377a0 100644 --- a/src/renderer/components/input/input.tsx +++ b/src/renderer/components/input/input.tsx @@ -7,20 +7,37 @@ import "./input.scss"; import type { DOMAttributes, InputHTMLAttributes, TextareaHTMLAttributes } from "react"; import React from "react"; -import { autoBind, cssNames, debouncePromise, getRandId } from "../../utils"; +import { autoBind, cssNames, debouncePromise, getRandId, isPromiseSettledFulfilled } from "../../utils"; import { Icon } from "../icon"; import type { TooltipProps } from "../tooltip"; import { Tooltip } from "../tooltip"; import * as Validators from "./input_validators"; -import type { InputValidator } from "./input_validators"; -import isFunction from "lodash/isFunction"; +import type { InputValidator, InputValidation, InputValidationResult, SyncValidationMessage } from "./input_validators"; import uniqueId from "lodash/uniqueId"; import { debounce } from "lodash"; -const { conditionalValidators, ...InputValidators } = Validators; +const { + conditionalValidators, + asyncInputValidator, + inputValidator, + isAsyncValidator, + unionInputValidatorsAsync, + ...InputValidators +} = Validators; -export { InputValidators }; -export type { InputValidator }; +export { + InputValidators, + asyncInputValidator, + inputValidator, + isAsyncValidator, + unionInputValidatorsAsync, +}; +export type { + InputValidator, + InputValidation, + InputValidationResult, + SyncValidationMessage, +}; type InputElement = HTMLInputElement | HTMLTextAreaElement; type InputElementProps = @@ -78,15 +95,11 @@ const defaultProps: Partial = { blurOnEnter: true, }; -function isAsyncValidator(validator: InputValidator): validator is InputValidator { - return typeof validator.debounce === "number"; -} - export class Input extends React.Component { static defaultProps = defaultProps as object; public input: InputElement | null = null; - public validators: InputValidator[] = []; + public validators: InputValidator[] = []; public state: State = { focused: false, @@ -155,7 +168,7 @@ export class Input extends React.Component { async validate() { const value = this.getValue(); let validationId = (this.validationId = ""); // reset every time for async validators - const asyncValidators: Promise[] = []; + const asyncValidators: Promise[] = []; const errors: React.ReactNode[] = []; // run validators @@ -169,28 +182,15 @@ export class Input extends React.Component { if (!validationId) { this.validationId = validationId = uniqueId("validation_id_"); } - asyncValidators.push( - validator.validate(value, this.props).then( - () => null, // don't consider any valid result from promise since we interested in errors only - error => this.getValidatorError(value, validator) || error, - ), - ); - } - - const isValid = validator.validate(value, this.props); - - if (isValid === false) { + asyncValidators.push((async () => { + try { + await validator.validate(value, this.props); + } catch (error) { + return this.getValidatorError(value, validator) || (error instanceof Error ? error.message : String(error)); + } + })()); + } else if (!validator.validate(value, this.props)) { errors.push(this.getValidatorError(value, validator)); - } else if (isValid instanceof Promise) { - if (!validationId) { - this.validationId = validationId = uniqueId("validation_id_"); - } - asyncValidators.push( - isValid.then( - () => null, // don't consider any valid result from promise since we interested in errors only - error => this.getValidatorError(value, validator) || error, - ), - ); } } @@ -200,10 +200,15 @@ export class Input extends React.Component { // handle async validators result if (asyncValidators.length > 0) { this.setState({ validating: true, valid: false }); - const asyncErrors = await Promise.all(asyncValidators); + const asyncErrors = await Promise.allSettled(asyncValidators); if (this.validationId === validationId) { - this.setValidation(errors.concat(...asyncErrors.filter(err => err))); + errors.push(...asyncErrors + .filter(isPromiseSettledFulfilled) + .map(res => res.value) + .filter(Boolean)); + + this.setValidation(errors); } } @@ -218,10 +223,10 @@ export class Input extends React.Component { }); } - private getValidatorError(value: string, { message }: InputValidator) { - if (isFunction(message)) return message(value, this.props); - - return message || ""; + private getValidatorError(value: string, { message }: InputValidator) { + return typeof message === "function" + ? message(value, this.props) + : message; } private setupValidators() { diff --git a/src/renderer/components/input/input_validators.ts b/src/renderer/components/input/input_validators.ts index a9844bfcd8..59e12a977a 100644 --- a/src/renderer/components/input/input_validators.ts +++ b/src/renderer/components/input/input_validators.ts @@ -4,41 +4,113 @@ */ import type { InputProps } from "./input"; -import type { ReactNode } from "react"; +import type React from "react"; import fse from "fs-extra"; import { TypedRegEx } from "typed-regex"; +import type { SetRequired } from "type-fest"; -export class AsyncInputValidationError extends Error { -} +export type InputValidationResult = + IsAsync extends true + ? Promise + : boolean; -export type InputValidator = { +export type InputValidation = (value: string, props?: InputProps) => InputValidationResult; + +export type SyncValidationMessage = React.ReactNode | ((value: string, props?: InputProps) => React.ReactNode); + +export type InputValidator = { /** * Filters itself based on the input props */ condition?: (props: InputProps) => any; } & ( - IsAsync extends false + IsAsync extends true ? { - validate: (value: string, props: InputProps) => boolean; - message: ReactNode | ((value: string, props: InputProps) => ReactNode | string); - debounce?: undefined; + /** + * The validation message maybe either specified from the `message` field (higher priority) + * or if that is not provided then the message will retrived from the rejected with value + */ + validate: InputValidation; + message?: SyncValidationMessage; + debounce: number; } : { - /** - * If asyncronous then the rejection message is the error message - * - * This function MUST reject with an instance of {@link AsyncInputValidationError} - */ - validate: (value: string, props: InputProps) => Promise; - message?: undefined; - debounce: number; + validate: InputValidation; + message: SyncValidationMessage; + debounce?: undefined; } ); -export function inputValidator(validator: InputValidator): InputValidator { +export function isAsyncValidator(validator: InputValidator): validator is InputValidator { + return typeof validator.debounce === "number"; +} + +export function asyncInputValidator(validator: InputValidator): InputValidator { return validator; } +export function inputValidator(validator: InputValidator): InputValidator { + return validator; +} + +/** + * Create a new input validator from a list of syncronous input validators. Will match as valid if + * one of the input validators matches the input + */ +export function unionInputValidators( + baseValidator: Pick, "condition" | "message">, + ...validators: InputValidator[] +): InputValidator { + return inputValidator({ + ...baseValidator, + validate: (value, props) => validators.some(validator => validator.validate(value, props)), + }); +} + +/** + * Create a new input validator from a list of syncronous or async input validators. Will match as + * valid if one of the input validators matches the input + */ +export function unionInputValidatorsAsync( + baseValidator: SetRequired, "condition" | "message">, "message">, + ...validators: InputValidator[] +): InputValidator { + const longestDebounce = Math.max( + ...validators + .filter(isAsyncValidator) + .map(validator => validator.debounce), + 0, + ); + + return asyncInputValidator({ + debounce: longestDebounce, + validate: async (value, props) => { + for (const validator of validators) { + if (isAsyncValidator(validator)) { + try { + await validator.validate(value, props); + + return; + } catch { + // Do nothing + } + } else { + if (validator.validate(value, props)) { + return; + } + } + } + + /** + * If no validator returns `true` then mark as invalid by throwing. The message will be + * obtained from the `message` field. + */ + throw new Error(); + }, + ...baseValidator, + }); +} + export const isRequired = inputValidator({ condition: ({ required }) => required, message: () => `This field is required`, @@ -53,7 +125,7 @@ export const isEmail = inputValidator({ export const isNumber = inputValidator({ condition: ({ type }) => type === "number", - message(value, { min, max }) { + message(value, { min, max } = {}) { const minMax: string = [ typeof min === "number" ? `min: ${min}` : undefined, typeof max === "number" ? `max: ${max}` : undefined, @@ -61,7 +133,7 @@ export const isNumber = inputValidator({ return `Invalid number${minMax ? ` (${minMax})` : ""}`; }, - validate: (value, { min, max }) => { + validate: (value, { min, max } = {}) => { const numVal = +value; return !( @@ -100,30 +172,26 @@ export const isExtensionNameInstall = inputValidator({ validate: value => isExtensionNameInstallRegex.isMatch(value), }); -export const isPath = inputValidator({ +export const isPath = asyncInputValidator({ debounce: 100, condition: ({ type }) => type === "text", validate: async value => { - try { - await fse.pathExists(value); - } catch { - throw new AsyncInputValidationError(`${value} is not a valid file path`); + if (!await fse.pathExists(value)) { + throw new Error(`"${value}" is not a valid file path`); } }, }); export const minLength = inputValidator({ condition: ({ minLength }) => !!minLength, - message: (value, { minLength }) => `Minimum length is ${minLength}`, - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - validate: (value, { minLength }) => value.length >= minLength!, + message: (value, { minLength = 0 } = {}) => `Minimum length is ${minLength}`, + validate: (value, { minLength = 0 } = {}) => value.length >= minLength, }); export const maxLength = inputValidator({ condition: ({ maxLength }) => !!maxLength, - message: (value, { maxLength }) => `Maximum length is ${maxLength}`, - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - validate: (value, { maxLength }) => value.length <= maxLength!, + message: (value, { maxLength = 0 } = {}) => `Maximum length is ${maxLength}`, + validate: (value, { maxLength = 0 } = {}) => value.length <= maxLength, }); const systemNameMatcher = /^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$/; @@ -135,7 +203,7 @@ export const systemName = inputValidator({ export const accountId = inputValidator({ message: () => `Invalid account ID`, - validate: (value, props) => (isEmail.validate(value, props) || systemName.validate(value, props)), + validate: (value) => (isEmail.validate(value) || systemName.validate(value)), }); export const conditionalValidators = [ From 1393cc303d6c04268904cac476e33b4ebe4ba5a7 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 13 Jun 2022 11:42:53 +0300 Subject: [PATCH 06/64] Stop using HelmCli from Renderer (#4861) * Introduce way for execute file Signed-off-by: Janne Savolainen * Make typing of HelmRepo shared Signed-off-by: Janne Savolainen * Introduce way to get Helm environment values Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Introduce function to read YAML file Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Introduce competition for listing active helm repositories in preferences Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Make sense in name of injectable Signed-off-by: Janne Savolainen * Introduce helper for opening and selecting values of select Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Introduce competition for activating, deactivating public helm repositories in preferences Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Introduce competition for deactivating helm repository from list of active repositories Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Add missing global overrides Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Make some tests more deterministic by mocking tooltips Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Introduce competition for activating custom helm repository in preferences Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Update snapshots Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Remove old implementation made redundant with competition for preferences of helm repositories Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Add success notification for activating custom helm repository Signed-off-by: Janne Savolainen * Introduce way to get single active helm repository Signed-off-by: Janne Savolainen * Extract responsibilities from god-class and switch to getting helm repositories using competition instead of another god class Signed-off-by: Janne Savolainen * Remove dead code Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Add TODO Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Tweak position of spinner Signed-off-by: Janne Savolainen * Start handling errors when accessing helm repositories Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Handle error about no helm repositories when updating repositories Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Remove unwarranted function configuration Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Add missing global overrides Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Remove duplication how to acquire binary path for helm Signed-off-by: Janne Savolainen * Remove redundant comment Signed-off-by: Janne Savolainen * Consolidate naming to match Helm's internal Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Relocate file closer to it's relatives Signed-off-by: Janne Savolainen --- ...elm-repository-in-preferences.test.ts.snap | 6813 +++++++++++++++++ ...tory-from-list-in-preferences.test.ts.snap | 4926 ++++++++++++ ...m-repositories-in-preferences.test.ts.snap | 4184 ++++++++++ ...ive-repository-in-preferences.test.ts.snap | 1887 +++++ ...tom-helm-repository-in-preferences.test.ts | 387 + ...epository-from-list-in-preferences.test.ts | 278 + ...e-helm-repositories-in-preferences.test.ts | 458 ++ ...f-active-repository-in-preferences.test.ts | 126 + ...ion-to-kubernetes-preferences.test.ts.snap | 185 +- ...vigation-to-kubernetes-preferences.test.ts | 11 + src/common/fs/exec-file.injectable.ts | 25 + src/common/fs/read-yaml-file.injectable.ts | 25 + .../add-helm-repository-channel.injectable.ts | 23 + ...ve-helm-repositories-channel.injectable.ts | 23 + src/common/helm/helm-repo.ts | 16 + ...move-helm-repository-channel.injectable.ts | 22 + src/common/utils/async-result.ts | 7 + src/common/utils/get-error-message.ts | 15 + .../base-bundled-binaries-dir.injectable.ts | 24 +- .../vars/bundled-resources-dir.injectable.ts | 9 +- ...lized-platform-architecture.injectable.ts} | 6 +- .../vars/normalized-platform.injectable.ts | 11 +- src/main/getDiForUnitTesting.ts | 58 +- src/main/helm/__mocks__/helm-chart-manager.ts | 2 +- src/main/helm/__tests__/helm-service.test.ts | 56 +- .../helm/exec-helm/exec-helm.injectable.ts | 31 + .../get-helm-env/get-helm-env.injectable.ts | 43 + src/main/helm/helm-binary-path.injectable.ts | 25 + src/main/helm/helm-chart-manager.ts | 2 +- src/main/helm/helm-repo-manager.injectable.ts | 172 - src/main/helm/helm-repo-manager.ts | 33 - src/main/helm/helm-service.ts | 134 - .../delete-helm-release.injectable.ts | 28 + .../get-helm-chart-values.injectable.ts | 29 + .../helm-service/get-helm-chart.injectable.ts | 34 + .../get-helm-release-history.injectable.ts | 28 + .../get-helm-release-values.injectable.ts | 41 + .../get-helm-release.injectable.ts | 30 + .../install-helm-chart.injectable.ts | 30 + .../list-helm-charts.injectable.ts | 41 + .../list-helm-releases.injectable.ts | 28 + .../rollback-helm-release.injectable.ts | 32 + .../update-helm-release.injectable.ts | 45 + ...-repository-channel-listener.injectable.ts | 26 + .../add-helm-repository.injectable.ts | 62 + ...epositories-channel-listener.injectable.ts | 26 + ...get-active-helm-repositories.injectable.ts | 131 + .../get-active-helm-repository.injectable.ts | 27 + ...-repository-channel-listener.injectable.ts | 26 + .../remove-helm-repository.injectable.ts | 29 + .../create-kube-auth-proxy.injectable.ts | 4 +- .../kubectl/bundled-binary-path.injectable.ts | 4 +- src/main/kubectl/create-kubectl.injectable.ts | 4 +- .../helm/charts/get-chart-route.injectable.ts | 32 +- .../get-chart-values-route.injectable.ts | 26 +- .../charts/list-charts-route.injectable.ts | 18 +- .../delete-release-route.injectable.ts | 22 +- .../get-release-history-route.injectable.ts | 26 +- .../releases/get-release-route.injectable.ts | 26 +- .../get-release-values-route.injectable.ts | 28 +- .../install-chart-route.injectable.ts | 24 +- .../list-releases-route.injectable.ts | 18 +- .../rollback-release-route.injectable.ts | 20 +- .../update-release-route.injectable.ts | 32 +- src/renderer/bootstrap.tsx | 3 - .../+preferences/add-helm-repo-dialog.tsx | 220 - .../components/+preferences/helm-charts.tsx | 202 - .../components/+preferences/kubernetes.tsx | 3 +- .../active-helm-repositories.injectable.ts | 43 + .../add-helm-repo-dialog.scss | 0 ...-custom-helm-repository-dialog-content.tsx | 152 + ...dding-of-custom-helm-repository-dialog.tsx | 47 + ...-of-custom-helm-repository-open-button.tsx | 32 + .../custom-helm-repo.injectable.ts | 25 + ...repository-dialog-is-visible.injectable.ts | 13 + ...dding-custom-helm-repository.injectable.ts | 21 + ...dding-custom-helm-repository.injectable.ts | 21 + .../get-file-paths.injectable.ts | 23 + .../helm-file-input/helm-file-input.tsx | 74 + ...-helm-repo-options-are-shown.injectable.ts | 13 + ...ubmit-custom-helm-repository.injectable.ts | 25 + .../adding-of-public-helm-repository.tsx | 80 + ...for-public-helm-repositories.injectable.ts | 29 + .../public-helm-repositories.injectable.ts | 21 + .../add-helm-repository.injectable.ts | 42 + .../select-helm-repository.injectable.ts | 33 + .../helm-charts}/helm-charts.module.scss | 0 .../kubernetes/helm-charts/helm-charts.tsx | 61 + ...elm-repositories-error-state.injectable.ts | 19 + .../helm-charts/helm-repositories.tsx | 68 + .../remove-helm-repository.injectable.ts | 27 + .../+preferences/removable-item.tsx | 4 +- .../input/validators/is-path.injectable.ts | 32 + .../show-error-notification.injectable.ts | 26 + .../show-success-notification.injectable.ts | 26 + src/renderer/components/select/select.tsx | 4 +- .../test-utils/get-application-builder.tsx | 34 +- src/renderer/components/wizard/wizard.tsx | 6 +- src/renderer/getDiForUnitTesting.tsx | 25 +- 99 files changed, 21409 insertions(+), 1039 deletions(-) create mode 100644 src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap create mode 100644 src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap create mode 100644 src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap create mode 100644 src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap create mode 100644 src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts create mode 100644 src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts create mode 100644 src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts create mode 100644 src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts create mode 100644 src/common/fs/exec-file.injectable.ts create mode 100644 src/common/fs/read-yaml-file.injectable.ts create mode 100644 src/common/helm/add-helm-repository-channel.injectable.ts create mode 100644 src/common/helm/get-active-helm-repositories-channel.injectable.ts create mode 100644 src/common/helm/helm-repo.ts create mode 100644 src/common/helm/remove-helm-repository-channel.injectable.ts create mode 100644 src/common/utils/async-result.ts create mode 100644 src/common/utils/get-error-message.ts rename src/common/vars/{bundled-binaries-normalized-arch.injectable.ts => normalized-platform-architecture.injectable.ts} (77%) create mode 100644 src/main/helm/exec-helm/exec-helm.injectable.ts create mode 100644 src/main/helm/get-helm-env/get-helm-env.injectable.ts create mode 100644 src/main/helm/helm-binary-path.injectable.ts delete mode 100644 src/main/helm/helm-repo-manager.injectable.ts delete mode 100644 src/main/helm/helm-repo-manager.ts delete mode 100644 src/main/helm/helm-service.ts create mode 100644 src/main/helm/helm-service/delete-helm-release.injectable.ts create mode 100644 src/main/helm/helm-service/get-helm-chart-values.injectable.ts create mode 100644 src/main/helm/helm-service/get-helm-chart.injectable.ts create mode 100644 src/main/helm/helm-service/get-helm-release-history.injectable.ts create mode 100644 src/main/helm/helm-service/get-helm-release-values.injectable.ts create mode 100644 src/main/helm/helm-service/get-helm-release.injectable.ts create mode 100644 src/main/helm/helm-service/install-helm-chart.injectable.ts create mode 100644 src/main/helm/helm-service/list-helm-charts.injectable.ts create mode 100644 src/main/helm/helm-service/list-helm-releases.injectable.ts create mode 100644 src/main/helm/helm-service/rollback-helm-release.injectable.ts create mode 100644 src/main/helm/helm-service/update-helm-release.injectable.ts create mode 100644 src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts create mode 100644 src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts create mode 100644 src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts create mode 100644 src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts create mode 100644 src/main/helm/repositories/get-active-helm-repository.injectable.ts create mode 100644 src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts create mode 100644 src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts delete mode 100644 src/renderer/components/+preferences/add-helm-repo-dialog.tsx delete mode 100644 src/renderer/components/+preferences/helm-charts.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/active-helm-repositories.injectable.ts rename src/renderer/components/+preferences/{ => kubernetes/helm-charts/adding-of-custom-helm-repository}/add-helm-repo-dialog.scss (100%) create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts rename src/renderer/components/+preferences/{ => kubernetes/helm-charts}/helm-charts.module.scss (100%) create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories-error-state.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts create mode 100644 src/renderer/components/input/validators/is-path.injectable.ts create mode 100644 src/renderer/components/notifications/show-error-notification.injectable.ts create mode 100644 src/renderer/components/notifications/show-success-notification.injectable.ts diff --git a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap new file mode 100644 index 0000000000..35db1088d9 --- /dev/null +++ b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap @@ -0,0 +1,6813 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when closing the dialog by clicking cancel renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ Security settings + +
+ +
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+ Chart Repository Credentials + +
+
+ +
+
+
+ +
+
+
+
+
+
+ + +
+ +
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when hiding maximal options renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when inputted maximal options renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ Security settings + +
+ +
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+ Chart Repository Credentials + +
+
+ +
+
+
+ +
+
+
+
+
+
+ + +
+ +
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation rejects renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+ +`; + +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success when adding custom repository again renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; diff --git a/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap new file mode 100644 index 0000000000..641d557170 --- /dev/null +++ b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap @@ -0,0 +1,4926 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + Some already active repository + + + + check + + +
+
+
+
+ + Some to be added repository + +
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding rejects renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+ Some to be added repository +
+
+ some-other-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+ Some to be added repository +
+
+ some-other-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + Some already active repository + + + + check + + +
+
+
+
+ + Some to be added repository + + + + check + + +
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+ Some to be added repository +
+
+ some-other-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected when removing resolves renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; diff --git a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap new file mode 100644 index 0000000000..9e7b5c2385 --- /dev/null +++ b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap @@ -0,0 +1,4184 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with any other error renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+ Error updating Helm repositories: Some error +
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories when adding default repository reject renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+ Error when adding default Helm repository: Some error +
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories when adding of default repository resolves renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories resolve when repositories resolves renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ some-repository +
+
+ some-repository-url +
+ + + delete + + +
+
+
+ some-other-repository +
+
+ some-other-repository-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves without path to repository cache directory renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+ Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`. +
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves without path to repository config file renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+ Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`. +
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when getting configuration rejects renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+ Error getting Helm configuration: some-error +
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; diff --git a/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap new file mode 100644 index 0000000000..d32ca6ffb7 --- /dev/null +++ b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap @@ -0,0 +1,1887 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ some-active-repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ some-active-repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository when removing resolves renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; diff --git a/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts b/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts new file mode 100644 index 0000000000..a39526e663 --- /dev/null +++ b/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts @@ -0,0 +1,387 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { RenderResult } from "@testing-library/react"; +import { fireEvent } from "@testing-library/react"; +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import execFileInjectable from "../../common/fs/exec-file.injectable"; +import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; +import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; +import type { HelmRepo } from "../../common/helm/helm-repo"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +import isPathInjectable from "../../renderer/components/input/validators/is-path.injectable"; +import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; +import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; +import type { AsyncResult } from "../../common/utils/async-result"; + +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + +describe("add custom helm repository in preferences", () => { + let applicationBuilder: ApplicationBuilder; + let showSuccessNotificationMock: jest.Mock; + let showErrorNotificationMock: jest.Mock; + let rendered: RenderResult; + let execFileMock: AsyncFnMock< + ReturnType + >; + let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult>; + + beforeEach(async () => { + jest.useFakeTimers("modern"); + + applicationBuilder = getApplicationBuilder(); + + execFileMock = asyncFn(); + getActiveHelmRepositoriesMock = asyncFn(); + + applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { + rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []); + + showSuccessNotificationMock = jest.fn(); + + rendererDi.override(showSuccessNotificationInjectable, () => showSuccessNotificationMock); + + showErrorNotificationMock = jest.fn(); + + rendererDi.override(showErrorNotificationInjectable, () => showErrorNotificationMock); + + // TODO: Figure out how to make async validators unit testable + rendererDi.override(isPathInjectable, () => ({ debounce: 0, validate: async () => {} })); + + mainDi.override( + getActiveHelmRepositoriesInjectable, + () => getActiveHelmRepositoriesMock, + ); + + mainDi.override(execFileInjectable, () => execFileMock); + mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path"); + }); + + rendered = await applicationBuilder.render(); + }); + + describe("when navigating to preferences containing helm repositories", () => { + beforeEach(async () => { + applicationBuilder.preferences.navigate(); + applicationBuilder.preferences.navigation.click("kubernetes"); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when active repositories resolve", () => { + beforeEach(async () => { + await Promise.all([ + getActiveHelmRepositoriesMock.resolve({ + callWasSuccessful: true, + response: [ + { name: "Some active repository", url: "some-url" }, + ], + }), + ]); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when selecting to add custom repository", () => { + beforeEach(() => { + const button = rendered.getByTestId("add-custom-helm-repo-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows dialog", () => { + expect( + rendered.queryByTestId("add-custom-helm-repository-dialog"), + ).toBeInTheDocument(); + }); + + // TODO: Figure out how to close dialog by clicking outside of it + xdescribe("when closing the dialog by clicking outside", () => { + beforeEach(() => {}); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show dialog anymore", () => { + expect( + rendered.queryByTestId("add-custom-helm-repository-dialog"), + ).not.toBeInTheDocument(); + }); + }); + + describe("when closing the dialog by clicking cancel", () => { + beforeEach(() => { + const button = rendered.getByTestId("custom-helm-repository-cancel-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show dialog anymore", () => { + expect( + rendered.queryByTestId("add-custom-helm-repository-dialog"), + ).not.toBeInTheDocument(); + }); + }); + + describe("when inputted minimal options for the repository", () => { + beforeEach(() => { + getActiveHelmRepositoriesMock.mockClear(); + + const nameInput = rendered.getByTestId("custom-helm-repository-name-input"); + + fireEvent.change(nameInput, { target: { value: "some-custom-repository" }}); + + const urlInput = rendered.getByTestId("custom-helm-repository-url-input"); + + fireEvent.change(urlInput, { target: { value: "http://some.url" }}); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when submitted and some time passes", () => { + beforeEach(() => { + const submitButton = rendered.getByTestId("custom-helm-repository-submit-button"); + + fireEvent.click(submitButton); + + // TODO: Remove when debounce is removed from WizardStep.submit + jest.runOnlyPendingTimers(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("adds the repository", () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "add", "some-custom-repository", "http://some.url"], + ); + }); + + it("does not reload active repositories yet", () => { + expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); + }); + + it("does not show notification yet", () => { + expect(showSuccessNotificationMock).not.toHaveBeenCalled(); + }); + + describe("when activation rejects", () => { + beforeEach(async () => { + await execFileMock.reject( + "Some error", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalledWith( + "Some error", + ); + }); + + it("does not show success notification", () => { + expect(showSuccessNotificationMock).not.toHaveBeenCalled(); + }); + + it("does not show dialog anymore", () => { + expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument(); + }); + + it("does not reload active repositories", () => { + expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); + }); + }); + + describe("when activation resolves with success", () => { + beforeEach(async () => { + await execFileMock.resolveSpecific( + [ + "some-helm-binary-path", + ["repo", "add", "some-custom-repository", "http://some.url"], + ], + + "", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show dialog anymore", () => { + expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument(); + }); + + it("reloads active repositories", () => { + expect(getActiveHelmRepositoriesMock).toHaveBeenCalled(); + }); + + it("shows success notification", () => { + expect(showSuccessNotificationMock).toHaveBeenCalledWith( + "Helm repository some-custom-repository has been added.", + ); + }); + + describe("when adding custom repository again", () => { + beforeEach(() => { + const button = rendered.getByTestId("add-custom-helm-repo-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("repository name is empty", () => { + const input = rendered.getByTestId("custom-helm-repository-name-input") as HTMLInputElement; + + expect(input.value).toBe(""); + }); + + it("repository url is empty", () => { + const input = rendered.getByTestId("custom-helm-repository-url-input") as HTMLInputElement; + + expect(input.value).toBe(""); + }); + }); + }); + }); + + describe("when showing the maximal options", () => { + beforeEach(() => { + const button = rendered.getByTestId("toggle-maximal-options-for-custom-helm-repository-button"); + + fireEvent.click(button); + }); + + it("shows maximal options", () => { + const maximalOptions = rendered.getByTestId("maximal-options-for-custom-helm-repository-dialog"); + + expect(maximalOptions).toBeInTheDocument(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("given closing the dialog, when reopening the dialog, still shows maximal options", () => { + const cancelButton = rendered.getByTestId("custom-helm-repository-cancel-button"); + + fireEvent.click(cancelButton); + + const openButton = rendered.getByTestId("add-custom-helm-repo-button"); + + fireEvent.click(openButton); + + const maximalOptions = rendered.getByTestId("maximal-options-for-custom-helm-repository-dialog"); + + expect(maximalOptions).toBeInTheDocument(); + }); + + describe("when hiding maximal options", () => { + beforeEach(() => { + const button = rendered.getByTestId("toggle-maximal-options-for-custom-helm-repository-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show maximal options anymore", () => { + const maximalOptions = rendered.queryByTestId("maximal-options-for-custom-helm-repository-dialog"); + + expect(maximalOptions).not.toBeInTheDocument(); + }); + }); + + describe("when inputted maximal options", () => { + beforeEach(async () => { + [ + { selector: "username-input", value: "some-username" }, + { selector: "password-input", value: "some-password" }, + { selector: "ca-cert-file-input", value: "some-ca-cert-file" }, + { selector: "cert-file-input", value: "some-cert-file" }, + { selector: "key-file-input", value: "some-key-file" }, + ].forEach(({ selector, value }) => { + const input = rendered.getByTestId(`custom-helm-repository-${selector}`); + + fireEvent.change(input, { target: { value }}); + }); + + const checkbox = rendered.getByTestId(`custom-helm-repository-verify-tls-input`); + + fireEvent.click(checkbox); + + jest.runOnlyPendingTimers(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("when submitted and some time passes, adds the repository with maximal options", () => { + const submitButton = rendered.getByTestId("custom-helm-repository-submit-button"); + + fireEvent.click(submitButton); + + // TODO: Remove when debounce is removed from WizardStep.submit + jest.runOnlyPendingTimers(); + + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + [ + "repo", + "add", + "some-custom-repository", + "http://some.url", + "--insecure-skip-tls-verify", + "--username", + "some-username", + "--password", + "some-password", + "--ca-file", + "some-ca-cert-file", + "--key-file", + "some-key-file", + "--cert-file", + "some-cert-file", + ], + ); + }); + }); + }); + }); + }); + }); + }); +}); diff --git a/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts new file mode 100644 index 0000000000..1a4b9db775 --- /dev/null +++ b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts @@ -0,0 +1,278 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { RenderResult } from "@testing-library/react"; +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import execFileInjectable from "../../common/fs/exec-file.injectable"; +import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; +import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; +import type { HelmRepo } from "../../common/helm/helm-repo"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; +import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; +import type { AsyncResult } from "../../common/utils/async-result"; + +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + +describe("add helm repository from list in preferences", () => { + let applicationBuilder: ApplicationBuilder; + let showSuccessNotificationMock: jest.Mock; + let showErrorNotificationMock: jest.Mock; + let rendered: RenderResult; + let execFileMock: AsyncFnMock< + ReturnType + >; + let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult>; + let callForPublicHelmRepositoriesMock: AsyncFnMock<() => Promise>; + + beforeEach(async () => { + applicationBuilder = getApplicationBuilder(); + + execFileMock = asyncFn(); + getActiveHelmRepositoriesMock = asyncFn(); + callForPublicHelmRepositoriesMock = asyncFn(); + + applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { + showSuccessNotificationMock = jest.fn(); + + rendererDi.override(showSuccessNotificationInjectable, () => showSuccessNotificationMock); + + showErrorNotificationMock = jest.fn(); + + rendererDi.override(showErrorNotificationInjectable, () => showErrorNotificationMock); + + rendererDi.override( + callForPublicHelmRepositoriesInjectable, + () => callForPublicHelmRepositoriesMock, + ); + + mainDi.override( + getActiveHelmRepositoriesInjectable, + () => getActiveHelmRepositoriesMock, + ); + mainDi.override(execFileInjectable, () => execFileMock); + mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path"); + }); + + rendered = await applicationBuilder.render(); + }); + + describe("when navigating to preferences containing helm repositories", () => { + beforeEach(async () => { + applicationBuilder.preferences.navigate(); + applicationBuilder.preferences.navigation.click("kubernetes"); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for public repositories", () => { + expect(callForPublicHelmRepositoriesMock).toHaveBeenCalled(); + }); + + it("calls for active repositories", () => { + expect(getActiveHelmRepositoriesMock).toHaveBeenCalled(); + }); + + describe("when both active and public repositories resolve", () => { + beforeEach(async () => { + await Promise.all([ + callForPublicHelmRepositoriesMock.resolve([ + { name: "Some already active repository", url: "some-url" }, + { name: "Some to be added repository", url: "some-other-url" }, + ]), + + getActiveHelmRepositoriesMock.resolve({ + callWasSuccessful: true, + response: [ + { name: "Some already active repository", url: "some-url" }, + ], + }), + ]); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when select for adding public repositories is clicked", () => { + beforeEach(() => { + applicationBuilder.select.openMenu( + "selection-of-active-public-helm-repository", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when deactive public repository is selected", () => { + beforeEach(async () => { + getActiveHelmRepositoriesMock.mockClear(); + + applicationBuilder.select.selectOption( + "selection-of-active-public-helm-repository", + "Some to be added repository", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("adds the repository", () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "add", "Some to be added repository", "some-other-url"], + ); + }); + + it("does not reload active repositories yet", () => { + expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); + }); + + describe("when adding rejects", () => { + beforeEach(async () => { + await execFileMock.reject( + "Some error", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalledWith( + "Some error", + ); + }); + + it("does not show success notification", () => { + expect(showSuccessNotificationMock).not.toHaveBeenCalled(); + }); + + it("does not show dialog anymore", () => { + expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument(); + }); + + it("does not reload active repositories", () => { + expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); + }); + }); + + describe("when adding resolves", () => { + beforeEach(async () => { + await execFileMock.resolveSpecific( + [ + "some-helm-binary-path", + ["repo", "add", "Some to be added repository", "some-other-url"], + ], + + "", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("reloads active repositories", () => { + expect(getActiveHelmRepositoriesMock).toHaveBeenCalled(); + }); + + it("shows success notification", () => { + expect(showSuccessNotificationMock).toHaveBeenCalledWith( + "Helm repository Some to be added repository has been added.", + ); + }); + + describe("when active repositories resolve again", () => { + beforeEach(async () => { + await getActiveHelmRepositoriesMock.resolve({ + callWasSuccessful: true, + response: [ + { name: "Some already active repository", url: "some-url" }, + { name: "Some to be added repository", url: "some-other-url" }, + ], + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when select for selecting active repositories is clicked", () => { + beforeEach(() => { + applicationBuilder.select.openMenu( + "selection-of-active-public-helm-repository", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when active repository is selected", () => { + beforeEach(() => { + execFileMock.mockClear(); + getActiveHelmRepositoriesMock.mockClear(); + + applicationBuilder.select.selectOption( + "selection-of-active-public-helm-repository", + "Some already active repository", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("removes the repository", () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "remove", "Some already active repository"], + ); + }); + + it("does not reload active repositories yet", () => { + expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); + }); + + describe("when removing resolves", () => { + beforeEach(async () => { + await execFileMock.resolveSpecific( + [ + "some-helm-binary-path", + ["repo", "remove", "Some already active repository"], + ], + + "", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("reloads active repositories", () => { + expect(getActiveHelmRepositoriesMock).toHaveBeenCalled(); + }); + }); + }); + }); + }); + }); + }); + }); + }); + }); +}); diff --git a/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts new file mode 100644 index 0000000000..a801487d10 --- /dev/null +++ b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts @@ -0,0 +1,458 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { RenderResult } from "@testing-library/react"; +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { ReadYamlFile } from "../../common/fs/read-yaml-file.injectable"; +import readYamlFileInjectable from "../../common/fs/read-yaml-file.injectable"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import type { HelmRepositoriesFromYaml } from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; +import execFileInjectable from "../../common/fs/exec-file.injectable"; +import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; +import loggerInjectable from "../../common/logger.injectable"; +import type { Logger } from "../../common/logger"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; + +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + +describe("listing active helm repositories in preferences", () => { + let applicationBuilder: ApplicationBuilder; + let rendered: RenderResult; + let readYamlFileMock: AsyncFnMock; + let execFileMock: AsyncFnMock>; + let loggerStub: Logger; + let showErrorNotificationMock: jest.Mock; + + beforeEach(async () => { + applicationBuilder = getApplicationBuilder(); + + readYamlFileMock = asyncFn(); + execFileMock = asyncFn(); + + loggerStub = { error: jest.fn() } as unknown as Logger; + + applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { + showErrorNotificationMock = jest.fn(); + + rendererDi.override(showErrorNotificationInjectable, () => showErrorNotificationMock); + rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []); + mainDi.override(readYamlFileInjectable, () => readYamlFileMock); + mainDi.override(execFileInjectable, () => execFileMock); + mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path"); + mainDi.override(loggerInjectable, () => loggerStub); + }); + + rendered = await applicationBuilder.render(); + }); + + describe("when navigating to preferences containing helm repositories", () => { + beforeEach(async () => { + applicationBuilder.preferences.navigate(); + applicationBuilder.preferences.navigation.click("kubernetes"); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows loader for repositories", () => { + expect( + rendered.getByTestId("helm-repositories-are-loading"), + ).toBeInTheDocument(); + }); + + it("calls for helm configuration", () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["env"], + ); + }); + + it("does not call for updating of repositories yet", () => { + expect(execFileMock).not.toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "update"], + ); + }); + + describe("when getting configuration rejects", () => { + beforeEach(async () => { + await execFileMock.reject("some-error"); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalledWith( + "Error getting Helm configuration: some-error", + ); + }); + + it("removes all helm controls", () => { + expect( + rendered.queryByTestId("helm-controls"), + ).not.toBeInTheDocument(); + }); + + it("does not show loader for repositories anymore", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).not.toBeInTheDocument(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); + + describe("when configuration resolves without path to repository config file", () => { + beforeEach(async () => { + execFileMock.mockClear(); + + await execFileMock.resolveSpecific( + ["some-helm-binary-path", ["env"]], + "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path", + ); + }); + + it("logs error", () => { + expect(loggerStub.error).toHaveBeenCalledWith( + "Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in `$ helm env`.", + ); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalledWith( + "Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in `$ helm env`.", + ); + }); + + it("removes all helm controls", () => { + expect( + rendered.queryByTestId("helm-controls"), + ).not.toBeInTheDocument(); + }); + + it("does not show loader for repositories anymore", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).not.toBeInTheDocument(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); + + describe("when configuration resolves without path to repository cache directory", () => { + beforeEach(async () => { + execFileMock.mockClear(); + + await execFileMock.resolveSpecific( + ["some-helm-binary-path", ["env"]], + "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml", + ); + }); + + it("logs error", () => { + expect(loggerStub.error).toHaveBeenCalledWith( + "Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in `$ helm env`.", + ); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalledWith( + "Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in `$ helm env`.", + ); + }); + + it("removes all helm controls", () => { + expect( + rendered.queryByTestId("helm-controls"), + ).not.toBeInTheDocument(); + }); + + it("does not show loader for repositories anymore", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).not.toBeInTheDocument(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); + + describe("when configuration resolves", () => { + beforeEach(async () => { + execFileMock.mockClear(); + + await execFileMock.resolveSpecific( + ["some-helm-binary-path", ["env"]], + + [ + "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml", + "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path", + ].join("\n"), + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for update of repositories", () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "update"], + ); + }); + + it("does not call for repositories yet", () => { + expect(readYamlFileMock).not.toHaveBeenCalled(); + }); + + describe("when updating repositories reject with any other error", () => { + beforeEach(async () => { + await execFileMock.reject("Some error"); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalledWith( + "Error updating Helm repositories: Some error", + ); + }); + + it("removes all helm controls", () => { + expect( + rendered.queryByTestId("helm-controls"), + ).not.toBeInTheDocument(); + }); + + it("does not show loader for repositories anymore", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).not.toBeInTheDocument(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); + + describe("when updating repositories reject with error about no existing repositories", () => { + beforeEach(async () => { + execFileMock.mockClear(); + + await execFileMock.reject( + "Error: no repositories found. You must add one before updating", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("still shows the loader for repositories", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).toBeInTheDocument(); + }); + + it('adds "bitnami" as default repository', () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"], + ); + }); + + describe("when adding default repository reject", () => { + beforeEach(async () => { + await execFileMock.reject("Some error"); + }); + + it("shows error notification", () => { + expect(showErrorNotificationMock).toHaveBeenCalledWith( + "Error when adding default Helm repository: Some error", + ); + }); + + it("removes all helm controls", () => { + expect( + rendered.queryByTestId("helm-controls"), + ).not.toBeInTheDocument(); + }); + + it("does not show loader for repositories anymore", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).not.toBeInTheDocument(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); + + describe("when adding of default repository resolves", () => { + beforeEach(async () => { + readYamlFileMock.mockClear(); + + await execFileMock.resolveSpecific( + [ + "some-helm-binary-path", + + [ + "repo", + "add", + "bitnami", + "https://charts.bitnami.com/bitnami", + ], + ], + + "", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("still shows the loader for repositories", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).toBeInTheDocument(); + }); + + it("calls for repositories again", () => { + expect(readYamlFileMock).toHaveBeenCalledWith( + "some-helm-repository-config-file.yaml", + ); + }); + + describe("when another call for repositories resolve", () => { + beforeEach(async () => { + await readYamlFileMock.resolveSpecific( + ["some-helm-repository-config-file.yaml"], + + { + repositories: [ + { + name: "bitnami", + url: "https://charts.bitnami.com/bitnami", + caFile: "irrelevant", + certFile: "irrelevant", + insecure_skip_tls_verify: false, + keyFile: "irrelevant", + pass_credentials_all: false, + password: "irrelevant", + username: "irrelevant", + }, + ], + }, + ); + }); + + it("does not show loader for repositories anymore", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).not.toBeInTheDocument(); + }); + + it("shows the added repository", () => { + const actual = rendered.getByTestId("helm-repository-bitnami"); + + expect(actual).toBeInTheDocument(); + }); + }); + }); + }); + + describe("when updating repositories resolve", () => { + beforeEach(async () => { + execFileMock.mockClear(); + + await execFileMock.resolveSpecific( + ["some-helm-binary-path", ["repo", "update"]], + "", + ); + }); + + it("loads repositories from file system", () => { + expect(readYamlFileMock).toHaveBeenCalledWith( + "some-helm-repository-config-file.yaml", + ); + }); + + describe("when repositories resolves", () => { + beforeEach(async () => { + execFileMock.mockClear(); + + await readYamlFileMock.resolveSpecific( + ["some-helm-repository-config-file.yaml"], + repositoryConfigStub, + ); + }); + + it("does not add default repository", () => { + expect(execFileMock).not.toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"], + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show loader for repositories anymore", () => { + expect( + rendered.queryByTestId("helm-repositories-are-loading"), + ).not.toBeInTheDocument(); + }); + + it("shows repositories in use", () => { + const actual = rendered.getAllByTestId( + /^helm-repository-(some-repository|some-other-repository)$/, + ); + + expect(actual).toHaveLength(2); + }); + }); + }); + }); + }); +}); + +const repositoryConfigStub: HelmRepositoriesFromYaml = { + repositories: [ + { + name: "some-repository", + url: "some-repository-url", + caFile: "irrelevant", + certFile: "irrelevant", + insecure_skip_tls_verify: false, + keyFile: "irrelevant", + pass_credentials_all: false, + password: "irrelevant", + username: "irrelevant", + }, + + { + name: "some-other-repository", + url: "some-other-repository-url", + caFile: "irrelevant", + certFile: "irrelevant", + insecure_skip_tls_verify: false, + keyFile: "irrelevant", + pass_credentials_all: false, + password: "irrelevant", + username: "irrelevant", + }, + ], +}; diff --git a/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts b/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts new file mode 100644 index 0000000000..0d3dfe331a --- /dev/null +++ b/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts @@ -0,0 +1,126 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { RenderResult } from "@testing-library/react"; +import { fireEvent } from "@testing-library/react"; +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import execFileInjectable from "../../common/fs/exec-file.injectable"; +import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; +import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; +import type { HelmRepo } from "../../common/helm/helm-repo"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +import type { AsyncResult } from "../../common/utils/async-result"; + +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + +describe("remove helm repository from list of active repositories in preferences", () => { + let applicationBuilder: ApplicationBuilder; + let rendered: RenderResult; + let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult>; + let execFileMock: AsyncFnMock< + ReturnType + >; + + beforeEach(async () => { + applicationBuilder = getApplicationBuilder(); + + execFileMock = asyncFn(); + getActiveHelmRepositoriesMock = asyncFn(); + + applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { + rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []); + + mainDi.override( + getActiveHelmRepositoriesInjectable, + () => getActiveHelmRepositoriesMock, + ); + + mainDi.override(execFileInjectable, () => execFileMock); + mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path"); + }); + + rendered = await applicationBuilder.render(); + }); + + describe("when navigating to preferences containing helm repositories", () => { + beforeEach(async () => { + applicationBuilder.preferences.navigate(); + applicationBuilder.preferences.navigation.click("kubernetes"); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when active repositories resolve", () => { + beforeEach(async () => { + getActiveHelmRepositoriesMock.resolve({ + callWasSuccessful: true, + response: [ + { name: "some-active-repository", url: "some-url" }, + ], + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when removing repository", () => { + beforeEach(() => { + execFileMock.mockClear(); + getActiveHelmRepositoriesMock.mockClear(); + + const removeButton = rendered.getByTestId( + "remove-helm-repository-some-active-repository", + ); + + fireEvent.click(removeButton); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("removes the repository", () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "remove", "some-active-repository"], + ); + }); + + it("does not reload active repositories yet", () => { + expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); + }); + + describe("when removing resolves", () => { + beforeEach(async () => { + await execFileMock.resolveSpecific( + [ + "some-helm-binary-path", + ["repo", "remove", "some-active-repository"], + ], + + "", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("reloads active repositories", () => { + expect(getActiveHelmRepositoriesMock).toHaveBeenCalled(); + }); + }); + }); + }); + }); +}); diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap index 8ab873fac4..9fbc6388b9 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap @@ -834,114 +834,121 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
- -
+ +
- Repositories -
-
- -
-
-
- - - +
+ + +
+
- -
-
+ class="pt-5 relative" + > +
+
+
diff --git a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts index e404e1f489..75b4585c21 100644 --- a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts @@ -5,6 +5,8 @@ import type { RenderResult } from "@testing-library/react"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; describe("preferences - navigation to kubernetes preferences", () => { let applicationBuilder: ApplicationBuilder; @@ -17,6 +19,15 @@ describe("preferences - navigation to kubernetes preferences", () => { let rendered: RenderResult; beforeEach(async () => { + applicationBuilder.beforeApplicationStart(({ rendererDi, mainDi }) => { + rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []); + + mainDi.override( + getActiveHelmRepositoriesInjectable, + () => async () => ({ callWasSuccessful: true, response: [] }), + ); + }); + applicationBuilder.beforeRender(() => { applicationBuilder.preferences.navigate(); }); diff --git a/src/common/fs/exec-file.injectable.ts b/src/common/fs/exec-file.injectable.ts new file mode 100644 index 0000000000..510fa025e4 --- /dev/null +++ b/src/common/fs/exec-file.injectable.ts @@ -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; + +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; diff --git a/src/common/fs/read-yaml-file.injectable.ts b/src/common/fs/read-yaml-file.injectable.ts new file mode 100644 index 0000000000..a34a69d388 --- /dev/null +++ b/src/common/fs/read-yaml-file.injectable.ts @@ -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; + +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; diff --git a/src/common/helm/add-helm-repository-channel.injectable.ts b/src/common/helm/add-helm-repository-channel.injectable.ts new file mode 100644 index 0000000000..0bc10564ad --- /dev/null +++ b/src/common/helm/add-helm-repository-channel.injectable.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 { 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>; + +const addHelmRepositoryChannelInjectable = getInjectable({ + id: "add-helm-repository-channel", + + instantiate: (): AddHelmRepositoryChannel => ({ + id: "add-helm-repository-channel", + }), + + injectionToken: requestChannelInjectionToken, +}); + +export default addHelmRepositoryChannelInjectable; diff --git a/src/common/helm/get-active-helm-repositories-channel.injectable.ts b/src/common/helm/get-active-helm-repositories-channel.injectable.ts new file mode 100644 index 0000000000..ac7355ace7 --- /dev/null +++ b/src/common/helm/get-active-helm-repositories-channel.injectable.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 { 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>; + +const getActiveHelmRepositoriesChannelInjectable = getInjectable({ + id: "get-active-helm-repositories-channel", + + instantiate: (): GetHelmRepositoriesChannel => ({ + id: "get-helm-active-list-repositories", + }), + + injectionToken: requestChannelInjectionToken, +}); + +export default getActiveHelmRepositoriesChannelInjectable; diff --git a/src/common/helm/helm-repo.ts b/src/common/helm/helm-repo.ts new file mode 100644 index 0000000000..9405d59bed --- /dev/null +++ b/src/common/helm/helm-repo.ts @@ -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; +}; diff --git a/src/common/helm/remove-helm-repository-channel.injectable.ts b/src/common/helm/remove-helm-repository-channel.injectable.ts new file mode 100644 index 0000000000..eddecb1ccd --- /dev/null +++ b/src/common/helm/remove-helm-repository-channel.injectable.ts @@ -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; + +const removeHelmRepositoryChannelInjectable = getInjectable({ + id: "remove-helm-repository-channel", + + instantiate: (): RemoveHelmRepositoryChannel => ({ + id: "remove-helm-repository-channel", + }), + + injectionToken: requestChannelInjectionToken, +}); + +export default removeHelmRepositoryChannelInjectable; diff --git a/src/common/utils/async-result.ts b/src/common/utils/async-result.ts new file mode 100644 index 0000000000..4e4f37866e --- /dev/null +++ b/src/common/utils/async-result.ts @@ -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 = + | { callWasSuccessful: true; response: Response } + | { callWasSuccessful: false; error: Error }; diff --git a/src/common/utils/get-error-message.ts b/src/common/utils/get-error-message.ts new file mode 100644 index 0000000000..b5d7dd4244 --- /dev/null +++ b/src/common/utils/get-error-message.ts @@ -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); +}; diff --git a/src/common/vars/base-bundled-binaries-dir.injectable.ts b/src/common/vars/base-bundled-binaries-dir.injectable.ts index 41f5a5e0a3..f0d78482c8 100644 --- a/src/common/vars/base-bundled-binaries-dir.injectable.ts +++ b/src/common/vars/base-bundled-binaries-dir.injectable.ts @@ -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; diff --git a/src/common/vars/bundled-resources-dir.injectable.ts b/src/common/vars/bundled-resources-dir.injectable.ts index a73ff98e78..e20a638384 100644 --- a/src/common/vars/bundled-resources-dir.injectable.ts +++ b/src/common/vars/bundled-resources-dir.injectable.ts @@ -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); }, }); diff --git a/src/common/vars/bundled-binaries-normalized-arch.injectable.ts b/src/common/vars/normalized-platform-architecture.injectable.ts similarity index 77% rename from src/common/vars/bundled-binaries-normalized-arch.injectable.ts rename to src/common/vars/normalized-platform-architecture.injectable.ts index 3c838d626c..c2053d2d8e 100644 --- a/src/common/vars/bundled-binaries-normalized-arch.injectable.ts +++ b/src/common/vars/normalized-platform-architecture.injectable.ts @@ -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; diff --git a/src/common/vars/normalized-platform.injectable.ts b/src/common/vars/normalized-platform.injectable.ts index 7177678407..cb34f1d2fa 100644 --- a/src/common/vars/normalized-platform.injectable.ts +++ b/src/common/vars/normalized-platform.injectable.ts @@ -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; diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 2cc78ec528..43f61c22cc 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -5,7 +5,7 @@ import glob from "glob"; import { kebabCase, memoize, noop } from "lodash/fp"; -import type { DiContainer } from "@ogre-tools/injectable"; +import type { DiContainer, Injectable } from "@ogre-tools/injectable"; import { createContainer } from "@ogre-tools/injectable"; import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import appNameInjectable from "./app-paths/app-name/app-name.injectable"; @@ -76,7 +76,7 @@ import quitAndInstallUpdateInjectable from "./electron-app/features/quit-and-ins import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable"; import publishIsConfiguredInjectable from "./application-update/publish-is-configured.injectable"; import checkForPlatformUpdatesInjectable from "./application-update/check-for-platform-updates/check-for-platform-updates.injectable"; -import baseBundeledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable"; +import baseBundledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable"; import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable"; import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable"; import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable"; @@ -84,6 +84,19 @@ import startKubeConfigSyncInjectable from "./start-main-application/runnables/ku import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable"; import getRandomIdInjectable from "../common/utils/get-random-id.injectable"; import periodicalCheckForUpdatesInjectable from "./application-update/periodical-check-for-updates/periodical-check-for-updates.injectable"; +import execFileInjectable from "../common/fs/exec-file.injectable"; +import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-platform-architecture.injectable"; +import getHelmChartInjectable from "./helm/helm-service/get-helm-chart.injectable"; +import getHelmChartValuesInjectable from "./helm/helm-service/get-helm-chart-values.injectable"; +import listHelmChartsInjectable from "./helm/helm-service/list-helm-charts.injectable"; +import deleteHelmReleaseInjectable from "./helm/helm-service/delete-helm-release.injectable"; +import getHelmReleaseHistoryInjectable from "./helm/helm-service/get-helm-release-history.injectable"; +import getHelmReleaseInjectable from "./helm/helm-service/get-helm-release.injectable"; +import getHelmReleaseValuesInjectable from "./helm/helm-service/get-helm-release-values.injectable"; +import installHelmChartInjectable from "./helm/helm-service/install-helm-chart.injectable"; +import listHelmReleasesInjectable from "./helm/helm-service/list-helm-releases.injectable"; +import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-release.injectable"; +import updateHelmReleaseInjectable from "./helm/helm-service/update-helm-release.injectable"; export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) { const { @@ -134,6 +147,24 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) di.override(periodicalCheckForUpdatesInjectable, () => ({ start: () => {}, stop: () => {}, started: false })); + overrideFunctionalInjectables(di, [ + getHelmChartInjectable, + getHelmChartValuesInjectable, + listHelmChartsInjectable, + deleteHelmReleaseInjectable, + getHelmReleaseHistoryInjectable, + getHelmReleaseInjectable, + getHelmReleaseValuesInjectable, + installHelmChartInjectable, + listHelmReleasesInjectable, + rollbackHelmReleaseInjectable, + updateHelmReleaseInjectable, + writeJsonFileInjectable, + readJsonFileInjectable, + readFileInjectable, + execFileInjectable, + ]); + // TODO: Remove usages of globally exported appEventBus to get rid of this di.override(appEventBusInjectable, () => new EventEmitter<[AppEvent]>()); @@ -141,7 +172,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) di.override(broadcastMessageInjectable, () => (channel) => { throw new Error(`Tried to broadcast message to channel "${channel}" over IPC without explicit override.`); }); - di.override(baseBundeledBinariesDirectoryInjectable, () => "some-bin-directory"); + di.override(baseBundledBinariesDirectoryInjectable, () => "some-bin-directory"); di.override(spawnInjectable, () => () => { return { stderr: { on: jest.fn(), removeAllListeners: jest.fn() }, @@ -150,18 +181,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) } as never; }); - di.override(writeJsonFileInjectable, () => () => { - throw new Error("Tried to write JSON file to file system without specifying explicit override."); - }); - - di.override(readJsonFileInjectable, () => () => { - throw new Error("Tried to read JSON file from file system without specifying explicit override."); - }); - - di.override(readFileInjectable, () => () => { - throw new Error("Tried to read file from file system without specifying explicit override."); - }); - di.override(loggerInjectable, () => ({ warn: noop, debug: noop, @@ -204,6 +223,7 @@ const overrideOperatingSystem = (di: DiContainer) => { di.override(platformInjectable, () => "darwin"); di.override(getAbsolutePathInjectable, () => getAbsolutePathFake); di.override(joinPathsInjectable, () => joinPathsFake); + di.override(normalizedPlatformArchitectureInjectable, () => "arm64"); }; const overrideElectronFeatures = (di: DiContainer) => { @@ -257,3 +277,11 @@ const overrideElectronFeatures = (di: DiContainer) => { di.override(publishIsConfiguredInjectable, () => false); di.override(electronUpdaterIsActiveInjectable, () => false); }; + +const overrideFunctionalInjectables = (di: DiContainer, injectables: Injectable[]) => { + injectables.forEach(injectable => { + di.override(injectable, () => () => { + throw new Error(`Tried to run "${injectable.id}" without explicit override.`); + }); + }); +}; diff --git a/src/main/helm/__mocks__/helm-chart-manager.ts b/src/main/helm/__mocks__/helm-chart-manager.ts index 858d6c24a4..62c4ce4508 100644 --- a/src/main/helm/__mocks__/helm-chart-manager.ts +++ b/src/main/helm/__mocks__/helm-chart-manager.ts @@ -4,7 +4,7 @@ */ import { sortCharts } from "../../../common/utils"; -import type { HelmRepo } from "../helm-repo-manager"; +import type { HelmRepo } from "../../../common/helm/helm-repo"; const charts = new Map([ ["stable", { diff --git a/src/main/helm/__tests__/helm-service.test.ts b/src/main/helm/__tests__/helm-service.test.ts index d9e6532e5c..fab93bf1e5 100644 --- a/src/main/helm/__tests__/helm-service.test.ts +++ b/src/main/helm/__tests__/helm-service.test.ts @@ -3,27 +3,48 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { helmService } from "../helm-service"; -import { HelmRepoManager } from "../helm-repo-manager"; - -const mockHelmRepoManager = jest.spyOn(HelmRepoManager, "getInstance").mockImplementation(); +import { getDiForUnitTesting } from "../../getDiForUnitTesting"; +import listHelmChartsInjectable from "../helm-service/list-helm-charts.injectable"; +import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; +import type { AsyncResult } from "../../../common/utils/async-result"; +import type { HelmRepo } from "../../../common/helm/helm-repo"; jest.mock("../helm-chart-manager"); describe("Helm Service tests", () => { + let listHelmCharts: () => Promise; + let getActiveHelmRepositoriesMock: jest.Mock>>; + + beforeEach(() => { + const di = getDiForUnitTesting({ doGeneralOverrides: true }); + + getActiveHelmRepositoriesMock = jest.fn(); + + di.override(getActiveHelmRepositoriesInjectable, () => getActiveHelmRepositoriesMock); + + di.unoverride(listHelmChartsInjectable); + di.permitSideEffects(listHelmChartsInjectable); + + listHelmCharts = di.inject(listHelmChartsInjectable); + }); + afterEach(() => { jest.resetAllMocks(); }); it("list charts with deprecated entries", async () => { - mockHelmRepoManager.mockReturnValue({ - repositories: jest.fn().mockImplementation(async () => [ - { name: "stable", url: "stableurl" }, - { name: "experiment", url: "experimenturl" }, - ]), - } as any); + getActiveHelmRepositoriesMock.mockReturnValue( + Promise.resolve({ + callWasSuccessful: true, - const charts = await helmService.listCharts(); + response: [ + { name: "stable", url: "stableurl" }, + { name: "experiment", url: "experimenturl" }, + ], + }), + ); + + const charts = await listHelmCharts(); expect(charts).toEqual({ stable: { @@ -123,15 +144,14 @@ describe("Helm Service tests", () => { }); it("list charts sorted by version in descending order", async () => { - mockHelmRepoManager.mockReturnValue({ - repositories: jest.fn().mockImplementation(async () => { - return [ - { name: "bitnami", url: "bitnamiurl" }, - ]; + getActiveHelmRepositoriesMock.mockReturnValue( + Promise.resolve({ + callWasSuccessful: true, + response: [{ name: "bitnami", url: "bitnamiurl" }], }), - } as any); + ); - const charts = await helmService.listCharts(); + const charts = await listHelmCharts(); expect(charts).toEqual({ bitnami: { diff --git a/src/main/helm/exec-helm/exec-helm.injectable.ts b/src/main/helm/exec-helm/exec-helm.injectable.ts new file mode 100644 index 0000000000..a97953706d --- /dev/null +++ b/src/main/helm/exec-helm/exec-helm.injectable.ts @@ -0,0 +1,31 @@ +/** + * 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 execFileInjectable from "../../../common/fs/exec-file.injectable"; +import helmBinaryPathInjectable from "../helm-binary-path.injectable"; +import type { AsyncResult } from "../../../common/utils/async-result"; +import { getErrorMessage } from "../../../common/utils/get-error-message"; + +const execHelmInjectable = getInjectable({ + id: "exec-helm", + + instantiate: (di) => { + const execFile = di.inject(execFileInjectable); + const helmBinaryPath = di.inject(helmBinaryPathInjectable); + + return async (...args: string[]): Promise> => { + try { + const response = await execFile(helmBinaryPath, args); + + return { callWasSuccessful: true, response }; + } catch (error) { + return { callWasSuccessful: false, error: getErrorMessage(error) }; + } + }; + }, +}); + + +export default execHelmInjectable; diff --git a/src/main/helm/get-helm-env/get-helm-env.injectable.ts b/src/main/helm/get-helm-env/get-helm-env.injectable.ts new file mode 100644 index 0000000000..f4bf4cf739 --- /dev/null +++ b/src/main/helm/get-helm-env/get-helm-env.injectable.ts @@ -0,0 +1,43 @@ +/** + * 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"; +import type { AsyncResult } from "../../../common/utils/async-result"; + +export type HelmEnv = Record & { + HELM_REPOSITORY_CACHE?: string; + HELM_REPOSITORY_CONFIG?: string; +}; + +const getHelmEnvInjectable = getInjectable({ + id: "get-helm-env", + + instantiate: (di) => { + const execHelm = di.inject(execHelmInjectable); + + return async (): Promise> => { + const result = await execHelm("env"); + + if (!result.callWasSuccessful) { + return { callWasSuccessful: false, error: result.error }; + } + + const lines = result.response.split(/\r?\n/); // split by new line feed + const env: HelmEnv = {}; + + lines.forEach((line: string) => { + const [key, value] = line.split("="); + + if (key && value) { + env[key] = value.replace(/"/g, ""); // strip quotas + } + }); + + return { callWasSuccessful: true, response: env }; + }; + }, +}); + +export default getHelmEnvInjectable; diff --git a/src/main/helm/helm-binary-path.injectable.ts b/src/main/helm/helm-binary-path.injectable.ts new file mode 100644 index 0000000000..d5983572c7 --- /dev/null +++ b/src/main/helm/helm-binary-path.injectable.ts @@ -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 { getBinaryName } from "../../common/vars"; +import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable"; +import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; +import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable"; + +const helmBinaryPathInjectable = getInjectable({ + id: "helm-binary-path", + + instantiate: (di) => { + const getAbsolutePath = di.inject(getAbsolutePathInjectable); + const normalizedPlatform = di.inject(normalizedPlatformInjectable); + const baseBundledBinariesDirectory = di.inject(baseBundledBinariesDirectoryInjectable); + + const helmBinaryName = getBinaryName("helm", { forPlatform: normalizedPlatform }); + + return getAbsolutePath(baseBundledBinariesDirectory, helmBinaryName); + }, +}); + +export default helmBinaryPathInjectable; diff --git a/src/main/helm/helm-chart-manager.ts b/src/main/helm/helm-chart-manager.ts index 981c8602e8..8ba7a83101 100644 --- a/src/main/helm/helm-chart-manager.ts +++ b/src/main/helm/helm-chart-manager.ts @@ -5,13 +5,13 @@ import fs from "fs"; import * as yaml from "js-yaml"; -import type { HelmRepo } from "./helm-repo-manager"; import logger from "../logger"; import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api"; import { iter, put, sortCharts } from "../../common/utils"; import { execHelm } from "./exec"; import type { SetRequired } from "type-fest"; import { assert } from "console"; +import type { HelmRepo } from "../../common/helm/helm-repo"; interface ChartCacheEntry { data: string; // serialized JSON diff --git a/src/main/helm/helm-repo-manager.injectable.ts b/src/main/helm/helm-repo-manager.injectable.ts deleted file mode 100644 index 9a12a3ca71..0000000000 --- a/src/main/helm/helm-repo-manager.injectable.ts +++ /dev/null @@ -1,172 +0,0 @@ -/** - * 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 yaml from "js-yaml"; -import { readFile } from "fs-extra"; -import { customRequestPromise } from "../../common/request"; -import orderBy from "lodash/orderBy"; -import logger from "../logger"; -import { execHelm } from "./exec"; -import type { HelmEnv, HelmRepo, HelmRepoConfig } from "./helm-repo-manager"; - -interface EnsuredHelmRepoManagerData { - helmEnv: HelmEnv; - didUpdateOnce: boolean; -} - -export class HelmRepoManager { - protected helmEnv?: HelmEnv; - protected didUpdateOnce?: boolean; - - public async loadAvailableRepos(): Promise { - const res = await customRequestPromise({ - uri: "https://github.com/lensapp/artifact-hub-repositories/releases/download/latest/repositories.json", - json: true, - resolveWithFullResponse: true, - timeout: 10000, - }); - - return orderBy(res.body as HelmRepo[], repo => repo.name); - } - - private async ensureInitialized(): Promise { - this.helmEnv ??= await this.parseHelmEnv(); - - const repos = await this.list(this.helmEnv); - - if (repos.length === 0) { - await this.addRepo({ - name: "bitnami", - url: "https://charts.bitnami.com/bitnami", - }); - } - - if (!this.didUpdateOnce) { - await this.update(); - this.didUpdateOnce = true; - } - - return { - didUpdateOnce: this.didUpdateOnce, - helmEnv: this.helmEnv, - }; - } - - protected async parseHelmEnv() { - const output = await execHelm(["env"]); - const lines = output.split(/\r?\n/); // split by new line feed - const env: Partial> = {}; - - lines.forEach((line: string) => { - const [key, value] = line.split("="); - - if (key && value) { - env[key] = value.replace(/"/g, ""); // strip quotas - } - }); - - return env as HelmEnv; - } - - public async repo(name: string): Promise { - const repos = await this.repositories(); - - return repos.find(repo => repo.name === name); - } - - private async list(helmEnv: HelmEnv): Promise { - try { - const rawConfig = await readFile(helmEnv.HELM_REPOSITORY_CONFIG, "utf8"); - const parsedConfig = yaml.load(rawConfig) as HelmRepoConfig; - - if (typeof parsedConfig === "object" && parsedConfig) { - return parsedConfig.repositories; - } - } catch { - // ignore error - } - - return []; - } - - public async repositories(): Promise { - try { - const { helmEnv } = await this.ensureInitialized(); - - const repos = await this.list(helmEnv); - - return repos.map(repo => ({ - ...repo, - cacheFilePath: `${helmEnv.HELM_REPOSITORY_CACHE}/${repo.name}-index.yaml`, - })); - } catch (error) { - logger.error(`[HELM]: repositories listing error`, error); - - return []; - } - } - - public async update() { - return execHelm([ - "repo", - "update", - ]); - } - - public async addRepo({ name, url, insecureSkipTlsVerify, username, password, caFile, keyFile, certFile }: HelmRepo) { - logger.info(`[HELM]: adding repo ${name} from ${url}`); - const args = [ - "repo", - "add", - name, - url, - ]; - - if (insecureSkipTlsVerify) { - args.push("--insecure-skip-tls-verify"); - } - - if (username) { - args.push("--username", username); - } - - if (password) { - args.push("--password", password); - } - - if (caFile) { - args.push("--ca-file", caFile); - } - - if (keyFile) { - args.push("--key-file", keyFile); - } - - if (certFile) { - args.push("--cert-file", certFile); - } - - return execHelm(args); - } - - public async removeRepo({ name, url }: HelmRepo): Promise { - logger.info(`[HELM]: removing repo ${name} (${url})`); - - return execHelm([ - "repo", - "remove", - name, - ]); - } -} - -const helmRepoManagerInjectable = getInjectable({ - id: "helm-repo-manager", - - instantiate: () => new HelmRepoManager(), -}); - -export default helmRepoManagerInjectable; diff --git a/src/main/helm/helm-repo-manager.ts b/src/main/helm/helm-repo-manager.ts deleted file mode 100644 index 5726bafe16..0000000000 --- a/src/main/helm/helm-repo-manager.ts +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { - asLegacyGlobalSingletonForExtensionApi, -} from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api"; - -import helmRepoManagerInjectable from "./helm-repo-manager.injectable"; - -export type HelmEnv = Partial> & { - HELM_REPOSITORY_CACHE: string; - HELM_REPOSITORY_CONFIG: string; -}; - -export interface HelmRepoConfig { - repositories: HelmRepo[]; -} - -export interface HelmRepo { - name: string; - url: string; - cacheFilePath?: string; - caFile?: string; - certFile?: string; - insecureSkipTlsVerify?: boolean; - keyFile?: string; - username?: string; - password?: string; -} - -export const HelmRepoManager = asLegacyGlobalSingletonForExtensionApi(helmRepoManagerInjectable); diff --git a/src/main/helm/helm-service.ts b/src/main/helm/helm-service.ts deleted file mode 100644 index adc9ea30a5..0000000000 --- a/src/main/helm/helm-service.ts +++ /dev/null @@ -1,134 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import type { Cluster } from "../../common/cluster/cluster"; -import logger from "../logger"; -import { HelmRepoManager } from "./helm-repo-manager"; -import { HelmChartManager } from "./helm-chart-manager"; -import { deleteRelease, getHistory, getRelease, getValues, installChart, listReleases, rollback, upgradeRelease } from "./helm-release-manager"; -import type { JsonObject } from "type-fest"; -import { object } from "../../common/utils"; - -interface GetReleaseValuesArgs { - cluster: Cluster; - namespace: string; - all: boolean; -} - -export interface InstallChartArgs { - chart: string; - values: JsonObject; - name: string; - namespace: string; - version: string; -} - -export interface UpdateChartArgs { - chart: string; - values: JsonObject; - version: string; -} - -class HelmService { - public async installChart(cluster: Cluster, data: InstallChartArgs) { - const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); - - return installChart(data.chart, data.values, data.name, data.namespace, data.version, proxyKubeconfig); - } - - public async listCharts() { - const repositories = await HelmRepoManager.getInstance().repositories(); - - return object.fromEntries( - await Promise.all(repositories.map(async repo => [repo.name, await HelmChartManager.forRepo(repo).charts()] as const)), - ); - } - - public async getChart(repoName: string, chartName: string, version = "") { - const repo = await HelmRepoManager.getInstance().repo(repoName); - - if (!repo) { - return undefined; - } - - const chartManager = HelmChartManager.forRepo(repo); - - return { - readme: await chartManager.getReadme(chartName, version), - versions: await chartManager.chartVersions(chartName), - }; - } - - public async getChartValues(repoName: string, chartName: string, version = "") { - const repo = await HelmRepoManager.getInstance().repo(repoName); - - if (!repo) { - return undefined; - } - - return HelmChartManager.forRepo(repo).getValues(chartName, version); - } - - public async listReleases(cluster: Cluster, namespace?: string) { - const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); - - logger.debug("list releases"); - - return listReleases(proxyKubeconfig, namespace); - } - - public async getRelease(cluster: Cluster, releaseName: string, namespace: string) { - const kubeconfigPath = await cluster.getProxyKubeconfigPath(); - const kubectl = await cluster.ensureKubectl(); - const kubectlPath = await kubectl.getPath(); - - logger.debug("Fetch release"); - - return getRelease(releaseName, namespace, kubeconfigPath, kubectlPath); - } - - public async getReleaseValues(releaseName: string, { cluster, namespace, all }: GetReleaseValuesArgs) { - const pathToKubeconfig = await cluster.getProxyKubeconfigPath(); - - logger.debug("Fetch release values"); - - return getValues(releaseName, { namespace, all, kubeconfigPath: pathToKubeconfig }); - } - - public async getReleaseHistory(cluster: Cluster, releaseName: string, namespace: string) { - const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); - - logger.debug("Fetch release history"); - - return getHistory(releaseName, namespace, proxyKubeconfig); - } - - public async deleteRelease(cluster: Cluster, releaseName: string, namespace: string) { - const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); - - logger.debug("Delete release"); - - return deleteRelease(releaseName, namespace, proxyKubeconfig); - } - - public async updateRelease(cluster: Cluster, releaseName: string, namespace: string, data: UpdateChartArgs) { - const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); - const kubectl = await cluster.ensureKubectl(); - const kubectlPath = await kubectl.getPath(); - - logger.debug("Upgrade release"); - - return upgradeRelease(releaseName, data.chart, data.values, namespace, data.version, proxyKubeconfig, kubectlPath); - } - - public async rollback(cluster: Cluster, releaseName: string, namespace: string, revision: number) { - const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); - - logger.debug("Rollback release"); - await rollback(releaseName, namespace, revision, proxyKubeconfig); - } -} - -export const helmService = new HelmService(); diff --git a/src/main/helm/helm-service/delete-helm-release.injectable.ts b/src/main/helm/helm-service/delete-helm-release.injectable.ts new file mode 100644 index 0000000000..d03cd480dc --- /dev/null +++ b/src/main/helm/helm-service/delete-helm-release.injectable.ts @@ -0,0 +1,28 @@ +/** + * 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 { Cluster } from "../../../common/cluster/cluster"; +import { deleteRelease } from "../helm-release-manager"; +import loggerInjectable from "../../../common/logger.injectable"; + +const deleteHelmReleaseInjectable = getInjectable({ + id: "delete-helm-release", + + instantiate: (di) => { + const logger = di.inject(loggerInjectable); + + return async (cluster: Cluster, releaseName: string, namespace: string) => { + const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); + + logger.debug("Delete release"); + + return deleteRelease(releaseName, namespace, proxyKubeconfig); + }; + }, + + causesSideEffects: true, +}); + +export default deleteHelmReleaseInjectable; diff --git a/src/main/helm/helm-service/get-helm-chart-values.injectable.ts b/src/main/helm/helm-service/get-helm-chart-values.injectable.ts new file mode 100644 index 0000000000..2394a591f0 --- /dev/null +++ b/src/main/helm/helm-service/get-helm-chart-values.injectable.ts @@ -0,0 +1,29 @@ +/** + * 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 { HelmChartManager } from "../helm-chart-manager"; +import getActiveHelmRepositoryInjectable from "../repositories/get-active-helm-repository.injectable"; + +const getHelmChartValuesInjectable = getInjectable({ + id: "get-helm-chart-values", + + instantiate: (di) => { + const getActiveHelmRepository = di.inject(getActiveHelmRepositoryInjectable); + + return async (repoName: string, chartName: string, version = "") => { + const repo = await getActiveHelmRepository(repoName); + + if (!repo) { + return undefined; + } + + return HelmChartManager.forRepo(repo).getValues(chartName, version); + }; + }, + + causesSideEffects: true, +}); + +export default getHelmChartValuesInjectable; diff --git a/src/main/helm/helm-service/get-helm-chart.injectable.ts b/src/main/helm/helm-service/get-helm-chart.injectable.ts new file mode 100644 index 0000000000..1a5a43da36 --- /dev/null +++ b/src/main/helm/helm-service/get-helm-chart.injectable.ts @@ -0,0 +1,34 @@ +/** + * 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 { HelmChartManager } from "../helm-chart-manager"; +import getActiveHelmRepositoryInjectable from "../repositories/get-active-helm-repository.injectable"; + +const getHelmChartInjectable = getInjectable({ + id: "get-helm-chart", + + instantiate: (di) => { + const getActiveHelmRepository = di.inject(getActiveHelmRepositoryInjectable); + + return async (repoName: string, chartName: string, version = "") => { + const repo = await getActiveHelmRepository(repoName); + + if (!repo) { + return undefined; + } + + const chartManager = HelmChartManager.forRepo(repo); + + return { + readme: await chartManager.getReadme(chartName, version), + versions: await chartManager.chartVersions(chartName), + }; + }; + }, + + causesSideEffects: true, +}); + +export default getHelmChartInjectable; diff --git a/src/main/helm/helm-service/get-helm-release-history.injectable.ts b/src/main/helm/helm-service/get-helm-release-history.injectable.ts new file mode 100644 index 0000000000..a642c2e265 --- /dev/null +++ b/src/main/helm/helm-service/get-helm-release-history.injectable.ts @@ -0,0 +1,28 @@ +/** + * 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 { Cluster } from "../../../common/cluster/cluster"; +import { getHistory } from "../helm-release-manager"; +import loggerInjectable from "../../../common/logger.injectable"; + +const getHelmReleaseHistoryInjectable = getInjectable({ + id: "get-helm-release-history", + + instantiate: (di) => { + const logger = di.inject(loggerInjectable); + + return async (cluster: Cluster, releaseName: string, namespace: string) => { + const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); + + logger.debug("Fetch release history"); + + return getHistory(releaseName, namespace, proxyKubeconfig); + }; + }, + + causesSideEffects: true, +}); + +export default getHelmReleaseHistoryInjectable; diff --git a/src/main/helm/helm-service/get-helm-release-values.injectable.ts b/src/main/helm/helm-service/get-helm-release-values.injectable.ts new file mode 100644 index 0000000000..5bca2d5723 --- /dev/null +++ b/src/main/helm/helm-service/get-helm-release-values.injectable.ts @@ -0,0 +1,41 @@ +/** + * 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 { getValues } from "../helm-release-manager"; +import loggerInjectable from "../../../common/logger.injectable"; +import type { Cluster } from "../../../common/cluster/cluster"; + +interface GetReleaseValuesArgs { + cluster: Cluster; + namespace: string; + all: boolean; +} + +const getHelmReleaseValuesInjectable = getInjectable({ + id: "get-helm-release-values", + + instantiate: (di) => { + const logger = di.inject(loggerInjectable); + + return async ( + releaseName: string, + { cluster, namespace, all }: GetReleaseValuesArgs, + ) => { + const pathToKubeconfig = await cluster.getProxyKubeconfigPath(); + + logger.debug("Fetch release values"); + + return getValues(releaseName, { + namespace, + all, + kubeconfigPath: pathToKubeconfig, + }); + }; + }, + + causesSideEffects: true, +}); + +export default getHelmReleaseValuesInjectable; diff --git a/src/main/helm/helm-service/get-helm-release.injectable.ts b/src/main/helm/helm-service/get-helm-release.injectable.ts new file mode 100644 index 0000000000..130d94af52 --- /dev/null +++ b/src/main/helm/helm-service/get-helm-release.injectable.ts @@ -0,0 +1,30 @@ +/** + * 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 { Cluster } from "../../../common/cluster/cluster"; +import { getRelease } from "../helm-release-manager"; +import loggerInjectable from "../../../common/logger.injectable"; + +const getHelmReleaseInjectable = getInjectable({ + id: "get-helm-release", + + instantiate: (di) => { + const logger = di.inject(loggerInjectable); + + return async (cluster: Cluster, releaseName: string, namespace: string) => { + const kubeconfigPath = await cluster.getProxyKubeconfigPath(); + const kubectl = await cluster.ensureKubectl(); + const kubectlPath = await kubectl.getPath(); + + logger.debug("Fetch release"); + + return getRelease(releaseName, namespace, kubeconfigPath, kubectlPath); + }; + }, + + causesSideEffects: true, +}); + +export default getHelmReleaseInjectable; diff --git a/src/main/helm/helm-service/install-helm-chart.injectable.ts b/src/main/helm/helm-service/install-helm-chart.injectable.ts new file mode 100644 index 0000000000..9ddb4fa599 --- /dev/null +++ b/src/main/helm/helm-service/install-helm-chart.injectable.ts @@ -0,0 +1,30 @@ +/** + * 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 { JsonObject } from "type-fest"; +import type { Cluster } from "../../../common/cluster/cluster"; +import { installChart } from "../helm-release-manager"; + +export interface InstallChartArgs { + chart: string; + values: JsonObject; + name: string; + namespace: string; + version: string; +} + +const installHelmChartInjectable = getInjectable({ + id: "install-helm-chart", + + instantiate: () => async (cluster: Cluster, data: InstallChartArgs) => { + const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); + + return installChart(data.chart, data.values, data.name, data.namespace, data.version, proxyKubeconfig); + }, + + causesSideEffects: true, +}); + +export default installHelmChartInjectable; diff --git a/src/main/helm/helm-service/list-helm-charts.injectable.ts b/src/main/helm/helm-service/list-helm-charts.injectable.ts new file mode 100644 index 0000000000..b537021f0f --- /dev/null +++ b/src/main/helm/helm-service/list-helm-charts.injectable.ts @@ -0,0 +1,41 @@ +/** + * 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 assert from "assert"; +import { object } from "../../../common/utils"; +import { HelmChartManager } from "../helm-chart-manager"; +import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; + +const listHelmChartsInjectable = getInjectable({ + id: "list-helm-charts", + + instantiate: (di) => { + const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable); + + return async () => { + const result = await getActiveHelmRepositories(); + + assert(result.callWasSuccessful); + + const repositories = result.response; + + return object.fromEntries( + await Promise.all( + repositories.map( + async (repo) => + [ + repo.name, + await HelmChartManager.forRepo(repo).charts(), + ] as const, + ), + ), + ); + }; + }, + + causesSideEffects: true, +}); + +export default listHelmChartsInjectable; diff --git a/src/main/helm/helm-service/list-helm-releases.injectable.ts b/src/main/helm/helm-service/list-helm-releases.injectable.ts new file mode 100644 index 0000000000..f6250f768d --- /dev/null +++ b/src/main/helm/helm-service/list-helm-releases.injectable.ts @@ -0,0 +1,28 @@ +/** + * 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 { Cluster } from "../../../common/cluster/cluster"; +import loggerInjectable from "../../../common/logger.injectable"; +import { listReleases } from "../helm-release-manager"; + +const listHelmReleasesInjectable = getInjectable({ + id: "list-helm-releases", + + instantiate: (di) => { + const logger = di.inject(loggerInjectable); + + return async (cluster: Cluster, namespace?: string) => { + const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); + + logger.debug("list releases"); + + return listReleases(proxyKubeconfig, namespace); + }; + }, + + causesSideEffects: true, +}); + +export default listHelmReleasesInjectable; diff --git a/src/main/helm/helm-service/rollback-helm-release.injectable.ts b/src/main/helm/helm-service/rollback-helm-release.injectable.ts new file mode 100644 index 0000000000..62ee05463d --- /dev/null +++ b/src/main/helm/helm-service/rollback-helm-release.injectable.ts @@ -0,0 +1,32 @@ +/** + * 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 { Cluster } from "../../../common/cluster/cluster"; +import loggerInjectable from "../../../common/logger.injectable"; +import { rollback } from "../helm-release-manager"; + +const rollbackHelmReleaseInjectable = getInjectable({ + id: "rollback-helm-release", + + instantiate: (di) => { + const logger = di.inject(loggerInjectable); + + return async ( + cluster: Cluster, + releaseName: string, + namespace: string, + revision: number, + ) => { + const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); + + logger.debug("Rollback release"); + await rollback(releaseName, namespace, revision, proxyKubeconfig); + }; + }, + + causesSideEffects: true, +}); + +export default rollbackHelmReleaseInjectable; diff --git a/src/main/helm/helm-service/update-helm-release.injectable.ts b/src/main/helm/helm-service/update-helm-release.injectable.ts new file mode 100644 index 0000000000..96e0e0050b --- /dev/null +++ b/src/main/helm/helm-service/update-helm-release.injectable.ts @@ -0,0 +1,45 @@ +/** + * 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 { Cluster } from "../../../common/cluster/cluster"; +import { upgradeRelease } from "../helm-release-manager"; +import loggerInjectable from "../../../common/logger.injectable"; +import type { JsonObject } from "type-fest"; + +export interface UpdateChartArgs { + chart: string; + values: JsonObject; + version: string; +} + +const updateHelmReleaseInjectable = getInjectable({ + id: "update-helm-release", + + instantiate: (di) => { + const logger = di.inject(loggerInjectable); + + return async (cluster: Cluster, releaseName: string, namespace: string, data: UpdateChartArgs) => { + const proxyKubeconfig = await cluster.getProxyKubeconfigPath(); + const kubectl = await cluster.ensureKubectl(); + const kubectlPath = await kubectl.getPath(); + + logger.debug("Upgrade release"); + + return upgradeRelease( + releaseName, + data.chart, + data.values, + namespace, + data.version, + proxyKubeconfig, + kubectlPath, + ); + }; + }, + + causesSideEffects: true, +}); + +export default updateHelmReleaseInjectable; diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts new file mode 100644 index 0000000000..f4effd1a62 --- /dev/null +++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.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 addHelmRepositoryChannelInjectable from "../../../../common/helm/add-helm-repository-channel.injectable"; +import addHelmRepositoryInjectable from "./add-helm-repository.injectable"; +import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; + +const addHelmRepositoryChannelListenerInjectable = getInjectable({ + id: "add-helm-repository-channel-listener", + + instantiate: (di) => { + const addHelmRepository = di.inject(addHelmRepositoryInjectable); + const channel = di.inject(addHelmRepositoryChannelInjectable); + + return { + channel, + handler: addHelmRepository, + }; + }, + + injectionToken: requestChannelListenerInjectionToken, +}); + +export default addHelmRepositoryChannelListenerInjectable; diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts new file mode 100644 index 0000000000..aa898eb099 --- /dev/null +++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts @@ -0,0 +1,62 @@ +/** + * 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"; +import type { HelmRepo } from "../../../../common/helm/helm-repo"; +import loggerInjectable from "../../../../common/logger.injectable"; + +const addHelmRepositoryInjectable = getInjectable({ + id: "add-helm-repository", + + instantiate: (di) => { + const execHelm = di.inject(execHelmInjectable); + const logger = di.inject(loggerInjectable); + + return async (repo: HelmRepo) => { + const { + name, + url, + insecureSkipTlsVerify, + username, + password, + caFile, + keyFile, + certFile, + } = repo; + + logger.info(`[HELM]: adding repo ${name} from ${url}`); + + const args = ["repo", "add", name, url]; + + if (insecureSkipTlsVerify) { + args.push("--insecure-skip-tls-verify"); + } + + if (username) { + args.push("--username", username); + } + + if (password) { + args.push("--password", password); + } + + if (caFile) { + args.push("--ca-file", caFile); + } + + if (keyFile) { + args.push("--key-file", keyFile); + } + + if (certFile) { + args.push("--cert-file", certFile); + } + + return await execHelm(...args); + }; + }, +}); + +export default addHelmRepositoryInjectable; diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts new file mode 100644 index 0000000000..e48ec7665e --- /dev/null +++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.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 { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; +import getActiveHelmRepositoriesChannelInjectable from "../../../../common/helm/get-active-helm-repositories-channel.injectable"; +import getActiveHelmRepositoriesInjectable from "./get-active-helm-repositories.injectable"; + +const getActiveHelmRepositoriesChannelListenerInjectable = getInjectable({ + id: "get-active-helm-repositories-channel-listener", + + instantiate: (di) => { + const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable); + + return { + channel: di.inject(getActiveHelmRepositoriesChannelInjectable), + + handler: getActiveHelmRepositories, + }; + }, + + injectionToken: requestChannelListenerInjectionToken, +}); + +export default getActiveHelmRepositoriesChannelListenerInjectable; diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts new file mode 100644 index 0000000000..d1b0c64311 --- /dev/null +++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts @@ -0,0 +1,131 @@ +/** + * 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 "../../../../common/helm/helm-repo"; +import type { ReadYamlFile } from "../../../../common/fs/read-yaml-file.injectable"; +import readYamlFileInjectable from "../../../../common/fs/read-yaml-file.injectable"; +import getHelmEnvInjectable from "../../get-helm-env/get-helm-env.injectable"; +import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; +import loggerInjectable from "../../../../common/logger.injectable"; +import type { AsyncResult } from "../../../../common/utils/async-result"; + +interface HelmRepositoryFromYaml { + name: string; + url: string; + caFile: string; + certFile: string; + insecure_skip_tls_verify: boolean; + keyFile: string; + pass_credentials_all: boolean; + password: string; + username: string; +} + +export interface HelmRepositoriesFromYaml { + repositories: HelmRepositoryFromYaml[]; +} + +const getActiveHelmRepositoriesInjectable = getInjectable({ + id: "get-helm-repositories", + + instantiate: (di) => { + const readYamlFile = di.inject(readYamlFileInjectable); + const execHelm = di.inject(execHelmInjectable); + const getHelmEnv = di.inject(getHelmEnvInjectable); + const logger = di.inject(loggerInjectable); + + const getRepositories = getRepositoriesFor(readYamlFile); + + return async (): Promise> => { + const envResult = await getHelmEnv(); + + if (!envResult.callWasSuccessful) { + return { + callWasSuccessful: false, + error: `Error getting Helm configuration: ${envResult.error}`, + }; + } + + const { + HELM_REPOSITORY_CONFIG: repositoryConfigFilePath, + HELM_REPOSITORY_CACHE: helmRepositoryCacheDirPath, + } = envResult.response; + + if (!repositoryConfigFilePath) { + const errorMessage = "Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in `$ helm env`."; + + logger.error(errorMessage); + + return { + callWasSuccessful: false, + error: `Error getting Helm configuration: ${errorMessage}`, + }; + } + + if (!helmRepositoryCacheDirPath) { + const errorMessage = "Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in `$ helm env`."; + + logger.error(errorMessage); + + return { + callWasSuccessful: false, + error: `Error getting Helm configuration: ${errorMessage}`, + }; + } + + const updateResult = await execHelm("repo", "update"); + + if (!updateResult.callWasSuccessful) { + if (!updateResult.error.includes(internalHelmErrorForNoRepositoriesFound)) { + return { + callWasSuccessful: false, + error: `Error updating Helm repositories: ${updateResult.error}`, + }; + } + const resultOfAddingDefaultRepository = await execHelm("repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"); + + if (!resultOfAddingDefaultRepository.callWasSuccessful) { + return { + callWasSuccessful: false, + error: `Error when adding default Helm repository: ${resultOfAddingDefaultRepository.error}`, + }; + } + } + + return { + callWasSuccessful: true, + + response: await getRepositories( + repositoryConfigFilePath, + helmRepositoryCacheDirPath, + ), + }; + }; + }, +}); + +export default getActiveHelmRepositoriesInjectable; + +const getRepositoriesFor = + (readYamlFile: ReadYamlFile) => + async (repositoryConfigFilePath: string, helmRepositoryCacheDirPath: string): Promise => { + const { repositories } = (await readYamlFile( + repositoryConfigFilePath, + )) as HelmRepositoriesFromYaml; + + return repositories.map((repository) => ({ + name: repository.name, + url: repository.url, + caFile: repository.caFile, + certFile: repository.certFile, + insecureSkipTlsVerify: repository.insecure_skip_tls_verify, + keyFile: repository.keyFile, + username: repository.username, + password: repository.password, + cacheFilePath: `${helmRepositoryCacheDirPath}/${repository.name}-index.yaml`, + })); + }; + +const internalHelmErrorForNoRepositoriesFound = "no repositories found. You must add one before updating"; diff --git a/src/main/helm/repositories/get-active-helm-repository.injectable.ts b/src/main/helm/repositories/get-active-helm-repository.injectable.ts new file mode 100644 index 0000000000..548e04b2ec --- /dev/null +++ b/src/main/helm/repositories/get-active-helm-repository.injectable.ts @@ -0,0 +1,27 @@ +/** + * 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 assert from "assert"; +import getActiveHelmRepositoriesInjectable from "./get-active-helm-repositories/get-active-helm-repositories.injectable"; + +const getActiveHelmRepositoryInjectable = getInjectable({ + id: "get-active-helm-repository", + + instantiate: (di) => { + const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable); + + return async (name: string) => { + const activeHelmRepositories = await getActiveHelmRepositories(); + + assert(activeHelmRepositories.callWasSuccessful); + + return activeHelmRepositories.response.find( + (repository) => repository.name === name, + ); + }; + }, +}); + +export default getActiveHelmRepositoryInjectable; diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts new file mode 100644 index 0000000000..b9b2f11777 --- /dev/null +++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.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 { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; +import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable"; +import removeHelmRepositoryChannelInjectable from "../../../../common/helm/remove-helm-repository-channel.injectable"; + +const removeHelmRepositoryChannelListenerInjectable = getInjectable({ + id: "remove-helm-repository-channel-listener", + + instantiate: (di) => { + const removeHelmRepository = di.inject(removeHelmRepositoryInjectable); + const channel = di.inject(removeHelmRepositoryChannelInjectable); + + return { + channel, + handler: removeHelmRepository, + }; + }, + + injectionToken: requestChannelListenerInjectionToken, +}); + +export default removeHelmRepositoryChannelListenerInjectable; diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts new file mode 100644 index 0000000000..21f37490bc --- /dev/null +++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts @@ -0,0 +1,29 @@ +/** + * 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"; +import type { HelmRepo } from "../../../../common/helm/helm-repo"; +import loggerInjectable from "../../../../common/logger.injectable"; + +const removeHelmRepositoryInjectable = getInjectable({ + id: "remove-helm-repository", + + instantiate: (di) => { + const execHelm = di.inject(execHelmInjectable); + const logger = di.inject(loggerInjectable); + + return async (repo: HelmRepo) => { + logger.info(`[HELM]: removing repo ${repo.name} (${repo.url})`); + + return execHelm( + "repo", + "remove", + repo.name, + ); + }; + }, +}); + +export default removeHelmRepositoryInjectable; diff --git a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts index 07bb87bd63..8546adb4fb 100644 --- a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts +++ b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts @@ -12,7 +12,7 @@ import { getBinaryName } from "../../common/vars"; import spawnInjectable from "../child-process/spawn.injectable"; import { getKubeAuthProxyCertificate } from "./get-kube-auth-proxy-certificate"; import loggerInjectable from "../../common/logger.injectable"; -import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable"; +import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable"; export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy; @@ -25,7 +25,7 @@ const createKubeAuthProxyInjectable = getInjectable({ return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => { const clusterUrl = new URL(cluster.apiUrl); const dependencies: KubeAuthProxyDependencies = { - proxyBinPath: path.join(di.inject(baseBundeledBinariesDirectoryInjectable), binaryName), + proxyBinPath: path.join(di.inject(baseBundledBinariesDirectoryInjectable), binaryName), proxyCert: getKubeAuthProxyCertificate(clusterUrl.hostname, selfsigned.generate), spawn: di.inject(spawnInjectable), logger: di.inject(loggerInjectable), diff --git a/src/main/kubectl/bundled-binary-path.injectable.ts b/src/main/kubectl/bundled-binary-path.injectable.ts index 99cb7f2e7e..df5ee63c04 100644 --- a/src/main/kubectl/bundled-binary-path.injectable.ts +++ b/src/main/kubectl/bundled-binary-path.injectable.ts @@ -4,13 +4,13 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import path from "path"; -import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable"; +import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable"; import kubectlBinaryNameInjectable from "./binary-name.injectable"; const bundledKubectlBinaryPathInjectable = getInjectable({ id: "bundled-kubectl-binary-path", instantiate: (di) => path.join( - di.inject(baseBundeledBinariesDirectoryInjectable), + di.inject(baseBundledBinariesDirectoryInjectable), di.inject(kubectlBinaryNameInjectable), ), }); diff --git a/src/main/kubectl/create-kubectl.injectable.ts b/src/main/kubectl/create-kubectl.injectable.ts index d670e8e665..1e13b7d02c 100644 --- a/src/main/kubectl/create-kubectl.injectable.ts +++ b/src/main/kubectl/create-kubectl.injectable.ts @@ -11,7 +11,7 @@ import kubectlDownloadingNormalizedArchInjectable from "./normalized-arch.inject import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; import kubectlBinaryNameInjectable from "./binary-name.injectable"; import bundledKubectlBinaryPathInjectable from "./bundled-binary-path.injectable"; -import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable"; +import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable"; const createKubectlInjectable = getInjectable({ id: "create-kubectl", @@ -24,7 +24,7 @@ const createKubectlInjectable = getInjectable({ normalizedDownloadPlatform: di.inject(normalizedPlatformInjectable), kubectlBinaryName: di.inject(kubectlBinaryNameInjectable), bundledKubectlBinaryPath: di.inject(bundledKubectlBinaryPathInjectable), - baseBundeledBinariesDirectory: di.inject(baseBundeledBinariesDirectoryInjectable), + baseBundeledBinariesDirectory: di.inject(baseBundledBinariesDirectoryInjectable), }; return (clusterVersion: string) => new Kubectl(dependencies, clusterVersion); diff --git a/src/main/routes/helm/charts/get-chart-route.injectable.ts b/src/main/routes/helm/charts/get-chart-route.injectable.ts index cc711be5d5..012584dbfc 100644 --- a/src/main/routes/helm/charts/get-chart-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts b/src/main/routes/helm/charts/get-chart-values-route.injectable.ts index 57fd067ed5..3cb7fd8f46 100644 --- a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/charts/list-charts-route.injectable.ts b/src/main/routes/helm/charts/list-charts-route.injectable.ts index 670cc9b889..946b7fe022 100644 --- a/src/main/routes/helm/charts/list-charts-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/releases/delete-release-route.injectable.ts b/src/main/routes/helm/releases/delete-release-route.injectable.ts index b17a8ea5c3..2da28fd591 100644 --- a/src/main/routes/helm/releases/delete-release-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/releases/get-release-history-route.injectable.ts b/src/main/routes/helm/releases/get-release-history-route.injectable.ts index a58f125a97..142adfc0d5 100644 --- a/src/main/routes/helm/releases/get-release-history-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/releases/get-release-route.injectable.ts b/src/main/routes/helm/releases/get-release-route.injectable.ts index f2e8917ebf..7b264b4fe9 100644 --- a/src/main/routes/helm/releases/get-release-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/releases/get-release-values-route.injectable.ts b/src/main/routes/helm/releases/get-release-values-route.injectable.ts index 6908257f5b..d68e5c53d1 100644 --- a/src/main/routes/helm/releases/get-release-values-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/releases/install-chart-route.injectable.ts b/src/main/routes/helm/releases/install-chart-route.injectable.ts index bb1d0c923c..a585443193 100644 --- a/src/main/routes/helm/releases/install-chart-route.injectable.ts +++ b/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({ chart: Joi @@ -31,14 +31,18 @@ const installChartArgsValidator = Joi.object 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; diff --git a/src/main/routes/helm/releases/list-releases-route.injectable.ts b/src/main/routes/helm/releases/list-releases-route.injectable.ts index b57d646526..8e9ea1e305 100644 --- a/src/main/routes/helm/releases/list-releases-route.injectable.ts +++ b/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; diff --git a/src/main/routes/helm/releases/rollback-release-route.injectable.ts b/src/main/routes/helm/releases/rollback-release-route.injectable.ts index 36a92c2820..eb27b675c4 100644 --- a/src/main/routes/helm/releases/rollback-release-route.injectable.ts +++ b/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 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; diff --git a/src/main/routes/helm/releases/update-release-route.injectable.ts b/src/main/routes/helm/releases/update-release-route.injectable.ts index 0d3602f505..573c85d962 100644 --- a/src/main/routes/helm/releases/update-release-route.injectable.ts +++ b/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({ chart: Joi @@ -24,18 +24,22 @@ const updateChartArgsValidator = Joi.object 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; diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx index fabb17cb5a..d0f671d20a 100644 --- a/src/renderer/bootstrap.tsx +++ b/src/renderer/bootstrap.tsx @@ -15,7 +15,6 @@ import * as LensExtensionsCommonApi from "../extensions/common-api"; import * as LensExtensionsRendererApi from "../extensions/renderer-api"; import { delay } from "../common/utils"; import { isMac, isDevelopment } from "../common/vars"; -import { HelmRepoManager } from "../main/helm/helm-repo-manager"; import { DefaultProps } from "./mui-base-theme"; import configurePackages from "../common/configure-packages"; import * as initializers from "./initializers"; @@ -151,8 +150,6 @@ export async function bootstrap(di: DiContainer) { extensionInstallationStateStore.bindIpcListeners(); - HelmRepoManager.createInstance(); // initialize the manager - // Register additional store listeners clusterStore.registerIpcListener(); diff --git a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx deleted file mode 100644 index 60b7ba1d44..0000000000 --- a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx +++ /dev/null @@ -1,220 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import "./add-helm-repo-dialog.scss"; - -import React from "react"; -import type { FileFilter } from "electron"; -import { observable, makeObservable, action } from "mobx"; -import { observer } from "mobx-react"; -import type { DialogProps } from "../dialog"; -import { Dialog } from "../dialog"; -import { Wizard, WizardStep } from "../wizard"; -import { Input } from "../input"; -import { Checkbox } from "../checkbox"; -import { Button } from "../button"; -import { systemName, isUrl, isPath } from "../input/input_validators"; -import { SubTitle } from "../layout/sub-title"; -import { Icon } from "../icon"; -import { Notifications } from "../notifications"; -import { type HelmRepo, HelmRepoManager } from "../../../main/helm/helm-repo-manager"; -import { requestOpenFilePickingDialog } from "../../ipc"; - -export interface AddHelmRepoDialogProps extends Partial { - onAddRepo: () => void; -} - -enum FileType { - CaFile = "caFile", - KeyFile = "keyFile", - CertFile = "certFile", -} - -const dialogState = observable.object({ - isOpen: false, -}); - -function getEmptyRepo(): HelmRepo { - return { name: "", url: "", username: "", password: "", insecureSkipTlsVerify: false, caFile: "", keyFile: "", certFile: "" }; -} -@observer -export class AddHelmRepoDialog extends React.Component { - private static keyExtensions = ["key", "keystore", "jks", "p12", "pfx", "pem"]; - private static certExtensions = ["crt", "cer", "ca-bundle", "p7b", "p7c", "p7s", "p12", "pfx", "pem"]; - - constructor(props: AddHelmRepoDialogProps) { - super(props); - makeObservable(this); - } - - static open() { - dialogState.isOpen = true; - } - - static close() { - dialogState.isOpen = false; - } - - @observable helmRepo = getEmptyRepo(); - @observable showOptions = false; - - @action - close = () => { - AddHelmRepoDialog.close(); - this.helmRepo = getEmptyRepo(); - this.showOptions = false; - }; - - setFilepath(type: FileType, value: string) { - this.helmRepo[type] = value; - } - - getFilePath(type: FileType) { - return this.helmRepo[type]; - } - - async selectFileDialog(type: FileType, fileFilter: FileFilter) { - const { canceled, filePaths } = await requestOpenFilePickingDialog({ - defaultPath: this.getFilePath(type), - properties: ["openFile", "showHiddenFiles"], - message: `Select file`, - buttonLabel: `Use file`, - filters: [ - fileFilter, - { name: "Any", extensions: ["*"] }, - ], - }); - - if (!canceled && filePaths.length) { - this.setFilepath(type, filePaths[0]); - } - } - - async addCustomRepo() { - try { - await HelmRepoManager.getInstance().addRepo(this.helmRepo); - Notifications.ok(( - <> - {"Helm repository "} - {this.helmRepo.name} - {" has been added."} - - )); - this.props.onAddRepo(); - this.close(); - } catch (err) { - Notifications.error(( - <> - {"Adding helm branch "} - {this.helmRepo.name} - {" has failed: "} - {String(err)} - - )); - } - } - - renderFileInput(placeholder:string, fileType:FileType, fileExtensions:string[]){ - return ( -
- this.setFilepath(fileType, v)} - /> - this.selectFileDialog(fileType, { name: placeholder, extensions: fileExtensions })} - tooltip="Browse" - /> -
- ); - } - - renderOptions() { - return ( - <> - - this.helmRepo.insecureSkipTlsVerify = v} - /> - {this.renderFileInput("Key file", FileType.KeyFile, AddHelmRepoDialog.keyExtensions)} - {this.renderFileInput("Ca file", FileType.CaFile, AddHelmRepoDialog.certExtensions)} - {this.renderFileInput("Certificate file", FileType.CertFile, AddHelmRepoDialog.certExtensions)} - - this.helmRepo.username = v} - /> - this.helmRepo.password = v} - /> - - ); - } - - render() { - const { ...dialogProps } = this.props; - - const header =
Add custom Helm Repo
; - - return ( - - - this.addCustomRepo()} - > -
- this.helmRepo.name = v} - /> - this.helmRepo.url = v} - /> - - {this.showOptions && this.renderOptions()} -
- - - - ); - } -} diff --git a/src/renderer/components/+preferences/helm-charts.tsx b/src/renderer/components/+preferences/helm-charts.tsx deleted file mode 100644 index d4f67902a6..0000000000 --- a/src/renderer/components/+preferences/helm-charts.tsx +++ /dev/null @@ -1,202 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import styles from "./helm-charts.module.scss"; - -import React from "react"; -import { observable, makeObservable, computed } from "mobx"; - -import type { HelmRepo } from "../../../main/helm/helm-repo-manager"; -import { HelmRepoManager } from "../../../main/helm/helm-repo-manager"; -import { Button } from "../button"; -import { Icon } from "../icon"; -import { Notifications } from "../notifications"; -import type { SelectOption } from "../select"; -import { Select } from "../select"; -import { AddHelmRepoDialog } from "./add-helm-repo-dialog"; -import { observer } from "mobx-react"; -import { RemovableItem } from "./removable-item"; -import { Notice } from "../+extensions/notice"; -import { Spinner } from "../spinner"; -import { noop } from "../../utils"; -import type { SingleValue } from "react-select"; - -@observer -export class HelmCharts extends React.Component { - @observable loadingRepos = false; - @observable loadingAvailableRepos = false; - @observable repos: HelmRepo[] = []; - @observable addedRepos = observable.map(); - - constructor(props: {}) { - super(props); - makeObservable(this); - } - - @computed get repoOptions() { - return this.repos.map(repo => ({ - value: repo, - label: repo.name, - isSelected: this.addedRepos.has(repo.name), - })); - } - - componentDidMount() { - this.loadAvailableRepos().catch(noop); - this.loadRepos().catch(noop); - } - - async loadAvailableRepos() { - this.loadingAvailableRepos = true; - - try { - if (!this.repos.length) { - this.repos = await HelmRepoManager.getInstance().loadAvailableRepos(); - } - } catch (err) { - Notifications.error(String(err)); - } - - this.loadingAvailableRepos = false; - } - - async loadRepos() { - this.loadingRepos = true; - - try { - const repos = await HelmRepoManager.getInstance().repositories(); // via helm-cli - - this.addedRepos.replace(repos.map(repo => [repo.name, repo])); - } catch (err) { - Notifications.error(String(err)); - } - - this.loadingRepos = false; - } - - async addRepo(repo: HelmRepo) { - try { - await HelmRepoManager.getInstance().addRepo(repo); - this.addedRepos.set(repo.name, repo); - } catch (err) { - Notifications.error(( - <> - {"Adding helm branch "} - {repo.name} - {" has failed: "} - {String(err)} - - )); - } - } - - async removeRepo(repo: HelmRepo) { - try { - await HelmRepoManager.getInstance().removeRepo(repo); - this.addedRepos.delete(repo.name); - } catch (err) { - Notifications.error( - <> - {"Removing helm branch "} - {repo.name} - {" has failed: "} - {String(err)} - , - ); - } - } - - onRepoSelect = async (option: SingleValue<{ value: HelmRepo }>): Promise => { - if (!option) { - return; - } - - if (this.addedRepos.has(option.value.name)) { - return void Notifications.ok(( - <> - {"Helm repo "} - {option.value.name} - {" already in use."} - - )); - } - - await this.addRepo(option.value); - }; - - formatOptionLabel = ({ value, isSelected }: SelectOption) => ( -
- {value.name} - {isSelected && ( - - )} -
- ); - - renderRepositories() { - const repos = Array.from(this.addedRepos); - - if (this.loadingRepos) { - return
; - } - - if (!repos.length) { - return ( - -
The repositories have not been added yet
- - ); - } - - return repos.map(([name, repo]) => { - return ( - this.removeRepo(repo)} - className="mt-3" - > -
-
{name}
-
{repo.url}
-
- - ); - }); - } - - render() { - return ( -
-
- helmRepo.name = v)} + data-testid="custom-helm-repository-name-input" + /> + helmRepo.url = v)} + data-testid="custom-helm-repository-url-input" + /> + + + {maximalOptionsAreShown.get() && ( +
+ + + { + helmRepo.insecureSkipTlsVerify = v; + })} + data-testid="custom-helm-repository-verify-tls-input" + /> + + helmRepo.keyFile = value)} + fileExtensions={keyExtensions} + data-testid="custom-helm-repository-key-file-input" + /> + + helmRepo.caFile = value)} + fileExtensions={certExtensions} + data-testid="custom-helm-repository-ca-cert-file-input" + /> + + helmRepo.certFile = value)} + fileExtensions={certExtensions} + data-testid="custom-helm-repository-cert-file-input" + /> + + + + helmRepo.username = v)} + data-testid="custom-helm-repository-username-input" + /> + helmRepo.password = v)} + data-testid="custom-helm-repository-password-input" + /> +
+ )} +
+ + +)); + + + +export const AddingOfCustomHelmRepositoryDialogContent = withInjectables( + NonInjectedActivationOfCustomHelmRepositoryDialogContent, + + { + getProps: (di) => ({ + helmRepo: di.inject(customHelmRepoInjectable), + hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable), + submitCustomRepository: di.inject(submitCustomHelmRepositoryInjectable), + maximalOptionsAreShown: di.inject(maximalCustomHelmRepoOptionsAreShownInjectable), + }), + }, +); + +const keyExtensions = ["key", "keystore", "jks", "p12", "pfx", "pem"]; +const certExtensions = ["crt", "cer", "ca-bundle", "p7b", "p7c", "p7s", "p12", "pfx", "pem"]; + diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx new file mode 100644 index 0000000000..3c6a2da9a4 --- /dev/null +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx @@ -0,0 +1,47 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import "./add-helm-repo-dialog.scss"; + +import React from "react"; +import { Dialog } from "../../../../dialog"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import { AddingOfCustomHelmRepositoryDialogContent } from "./adding-of-custom-helm-repository-dialog-content"; +import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable"; +import type { IObservableValue } from "mobx"; +import { observer } from "mobx-react"; +import hideDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable"; + +interface Dependencies { + contentIsVisible: IObservableValue; + hideDialog: () => void; +} + +const NonInjectedActivationOfCustomHelmRepositoryDialog = observer(({ + contentIsVisible, + hideDialog, +}: Dependencies) => ( +
+ + {contentIsVisible.get() && } + +
+)); + + +export const AddingOfCustomHelmRepositoryDialog = withInjectables( + NonInjectedActivationOfCustomHelmRepositoryDialog, + + { + getProps: (di) => ({ + contentIsVisible: di.inject(addingOfCustomHelmRepositoryDialogIsVisibleInjectable), + hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable), + }), + }, +); diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx new file mode 100644 index 0000000000..99f16a83ed --- /dev/null +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { withInjectables } from "@ogre-tools/injectable-react"; +import React from "react"; +import { Button } from "../../../../button"; +import showDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable"; + +interface Dependencies { + showDialog: () => void; +} + +const NonInjectedActivationOfCustomHelmRepositoryOpenButton = ({ showDialog }: Dependencies) => ( +