From 8dee604fd0a800226f19dfe587bc08511a8f13b3 Mon Sep 17 00:00:00 2001 From: Jim Ehrismann Date: Mon, 25 Apr 2022 17:27:28 -0400 Subject: [PATCH] adding https_proxy to execHelm env Signed-off-by: Jim Ehrismann --- src/main/helm/exec.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/helm/exec.ts b/src/main/helm/exec.ts index 8d8d0d4340..dd60271b36 100644 --- a/src/main/helm/exec.ts +++ b/src/main/helm/exec.ts @@ -7,6 +7,7 @@ import { promiseExecFile } from "../../common/utils/promise-exec"; import type { BaseEncodingOptions } from "fs"; import type { ExecFileOptions } from "child_process"; import { helmBinaryPath } from "../../common/vars"; +import { UserStore } from "../../common/user-store"; /** * ExecFile the bundled helm CLI @@ -14,7 +15,17 @@ import { helmBinaryPath } from "../../common/vars"; */ export async function execHelm(args: string[], options?: BaseEncodingOptions & ExecFileOptions): Promise { try { - const { stdout } = await promiseExecFile(helmBinaryPath.get(), args, options); + const opts = { ...options }; + + if (!opts.env) { + opts.env = process.env + } + + if (!opts.env.HTTPS_PROXY && UserStore.getInstance().httpsProxy) { + opts.env.HTTPS_PROXY = UserStore.getInstance().httpsProxy; + } + + const { stdout } = await promiseExecFile(helmBinaryPath.get(), args, opts); return stdout; } catch (error) {