From e7045727d40722661cc500ebefaf268bc3abc6f9 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 9 Dec 2021 11:38:06 -0500
Subject: [PATCH] Fix addCustomRepo getResources error output

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/main/helm/helm-release-manager.ts                     | 8 +++++---
 src/main/helm/helm-repo-manager.ts                        | 2 ++
 .../components/+preferences/add-helm-repo-dialog.tsx      | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/helm/helm-release-manager.ts b/src/main/helm/helm-release-manager.ts
index 824341023e..5a5f1e6ef2 100644
--- a/src/main/helm/helm-release-manager.ts
+++ b/src/main/helm/helm-release-manager.ts
@@ -223,15 +223,16 @@ async function getResources(name: string, namespace: string, kubeconfigPath: str
 
     return new Promise((resolve, reject) => {
       let stdout = "";
+      let stderr = "";
       const kubectl = execFile(kubectlPath, kubectlArgs);
 
       kubectl
         .on("exit", (code, signal) => {
           if (typeof code === "number") {
-            if (code) {
-              reject(new Error(`Kubectl exited with code ${code}`));
-            } else {
+            if (code === 0) {
               resolve(JSON.parse(stdout).items);
+            } else {
+              reject(stderr);
             }
           } else {
             reject(new Error(`Kubectl exited with signal ${signal}`));
@@ -239,6 +240,7 @@ async function getResources(name: string, namespace: string, kubeconfigPath: str
         })
         .on("error", reject);
 
+      kubectl.stderr.on("data", output => stderr += output);
       kubectl.stdout.on("data", output => stdout += output);
       kubectl.stdin.write(helmOutput);
       kubectl.stdin.end();
diff --git a/src/main/helm/helm-repo-manager.ts b/src/main/helm/helm-repo-manager.ts
index 69dfd3bd62..ec5b61565a 100644
--- a/src/main/helm/helm-repo-manager.ts
+++ b/src/main/helm/helm-repo-manager.ts
@@ -178,6 +178,8 @@ export class HelmRepoManager extends Singleton {
     const args = [
       "repo",
       "add",
+      name,
+      url,
     ];
 
     if (insecureSkipTlsVerify) {
diff --git a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx
index d6760fa561..608c33bad2 100644
--- a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx
+++ b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx
@@ -121,7 +121,7 @@ export class AddHelmRepoDialog extends React.Component<Props> {
       <div className="flex gaps align-center">
         <Input
           placeholder={placeholder}
-          validators = {isPath}
+          validators={isPath}
           className="box grow"
           value={this.getFilePath(fileType)}
           onChange={v => this.setFilepath(fileType, v)}
@@ -172,7 +172,7 @@ export class AddHelmRepoDialog extends React.Component<Props> {
         close={this.close}
       >
         <Wizard header={header} done={this.close}>
-          <WizardStep contentClass="flow column" nextLabel="Add" next={()=>{this.addCustomRepo();}}>
+          <WizardStep contentClass="flow column" nextLabel="Add" next={() => this.addCustomRepo()}>
             <div className="flex column gaps">
               <Input
                 autoFocus required