diff --git a/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts b/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts index e7d2b00bbc..a1b215c40c 100644 --- a/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts +++ b/src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts @@ -169,7 +169,10 @@ describe("add custom helm repository in preferences", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "add", "some-custom-repository", "http://some.url"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); @@ -373,7 +376,10 @@ describe("add custom helm repository in preferences", () => { "--cert-file", "some-cert-file", ], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); }); diff --git a/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts b/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts index eab408f337..29e6ea890d 100644 --- a/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts +++ b/src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts @@ -118,7 +118,10 @@ describe("add helm repository from list in preferences", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "add", "Some to be added repository", "some-other-url"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); @@ -232,7 +235,10 @@ describe("add helm repository from list in preferences", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "remove", "Some already active repository"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); diff --git a/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts index b3cf629e1d..df92796e76 100644 --- a/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts +++ b/src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts @@ -69,7 +69,10 @@ describe("listing active helm repositories in preferences", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["env"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); @@ -77,7 +80,10 @@ describe("listing active helm repositories in preferences", () => { expect(execFileMock).not.toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "update"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); @@ -222,7 +228,10 @@ describe("listing active helm repositories in preferences", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "update"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); @@ -289,7 +298,10 @@ describe("listing active helm repositories in preferences", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); @@ -434,7 +446,10 @@ describe("listing active helm repositories in preferences", () => { expect(execFileMock).not.toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); diff --git a/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts b/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts index 87a83c8eb3..f2a23f0409 100644 --- a/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts +++ b/src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts @@ -85,7 +85,10 @@ describe("remove helm repository from list of active repositories in preferences expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "remove", "some-active-repository"], - { "maxBuffer": 34359738368 }, + { + maxBuffer: 34359738368, + env: {}, + }, ); }); diff --git a/src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts b/src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts index 4d6e564dc0..59c376cffd 100644 --- a/src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts +++ b/src/main/helm/exec-helm/exec-env.global-override-for-injectable.ts @@ -3,7 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { computed } from "mobx"; import { getGlobalOverride } from "../../../common/test-utils/get-global-override"; import execHelmEnvInjectable from "./exec-env.injectable"; -export default getGlobalOverride(execHelmEnvInjectable, () => ({})); +export default getGlobalOverride(execHelmEnvInjectable, () => computed(() => ({}))); diff --git a/src/main/helm/exec-helm/exec-env.injectable.ts b/src/main/helm/exec-helm/exec-env.injectable.ts index 4d7610a2f7..f562dc2d4b 100644 --- a/src/main/helm/exec-helm/exec-env.injectable.ts +++ b/src/main/helm/exec-helm/exec-env.injectable.ts @@ -17,7 +17,7 @@ const execHelmEnvInjectable = getInjectable({ ...env } = process.env; - return { HTTPS_PROXY, ...env }; + return { HTTPS_PROXY, ...env } as Partial>; }); }, causesSideEffects: true,