add kube-context

carapace-sh · Feb 21, 2024 · 526e394 · 526e394
1 parent 8fb6138
commit 526e394
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 13 deletions.
diff --git a/completers/helm_completer/cmd/get_all.go b/completers/helm_completer/cmd/get_all.go
@@ -19,6 +19,11 @@ func init() {
 	getCmd.AddCommand(get_allCmd)
 
 	carapace.Gen(get_allCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_hooks.go b/completers/helm_completer/cmd/get_hooks.go
@@ -18,6 +18,11 @@ func init() {
 	getCmd.AddCommand(get_hooksCmd)
 
 	carapace.Gen(get_hooksCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_manifest.go b/completers/helm_completer/cmd/get_manifest.go
@@ -18,6 +18,11 @@ func init() {
 	getCmd.AddCommand(get_manifestCmd)
 
 	carapace.Gen(get_manifestCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_notes.go b/completers/helm_completer/cmd/get_notes.go
@@ -18,6 +18,11 @@ func init() {
 	getCmd.AddCommand(get_notesCmd)
 
 	carapace.Gen(get_notesCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_values.go b/completers/helm_completer/cmd/get_values.go
@@ -24,6 +24,11 @@ func init() {
 	})
 
 	carapace.Gen(get_valuesCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/history.go b/completers/helm_completer/cmd/history.go
@@ -24,6 +24,11 @@ func init() {
 	})
 
 	carapace.Gen(historyCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/rollback.go b/completers/helm_completer/cmd/rollback.go
@@ -29,7 +29,12 @@ func init() {
 	rootCmd.AddCommand(rollbackCmd)
 
 	carapace.Gen(rollbackCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return helm.ActionRevisions(c.Args[0])
 		}),

diff --git a/completers/helm_completer/cmd/status.go b/completers/helm_completer/cmd/status.go
@@ -25,6 +25,11 @@ func init() {
 	})
 
 	carapace.Gen(statusCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/test.go b/completers/helm_completer/cmd/test.go
@@ -23,6 +23,11 @@ func init() {
 	rootCmd.AddCommand(testCmd)
 
 	carapace.Gen(testCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/uninstall.go b/completers/helm_completer/cmd/uninstall.go
@@ -25,6 +25,11 @@ func init() {
 	rootCmd.AddCommand(uninstallCmd)
 
 	carapace.Gen(uninstallCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 	)
 }
diff --git a/completers/helm_completer/cmd/upgrade.go b/completers/helm_completer/cmd/upgrade.go
@@ -86,7 +86,12 @@ func init() {
 	})
 
 	carapace.Gen(upgradeCmd).PositionalCompletion(
-		helm.ActionReleases(),
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return helm.ActionReleases(helm.ReleasesOpts{
+				Namespace:   rootCmd.Flag("namespace").Value.String(),
+				KubeContext: rootCmd.Flag("kube-context").Value.String(),
+			})
+		}),
 		carapace.Batch(
 			carapace.ActionFiles(),
 			helm.ActionRepositoryCharts().Unless(condition.CompletingPath),

diff --git a/pkg/actions/tools/helm/release.go b/pkg/actions/tools/helm/release.go
@@ -16,9 +16,23 @@ type release struct {
 	AppVersion string `json:"app_version"`
 }
 
+type ReleasesOpts struct {
+	KubeContext string
+	Namespace   string
+}
+
 // ActionReleases completes releases
-func ActionReleases() carapace.Action {
-	return carapace.ActionExecCommand("helm", "list", "--output", "json")(func(output []byte) carapace.Action {
+func ActionReleases(opts ReleasesOpts) carapace.Action {
+	args := []string{"list", "--output", "json"}
+	if opts.KubeContext != "" {
+		args = append(args, "--kube-context", opts.KubeContext)
+	}
+
+	if opts.Namespace != "" {
+		args = append(args, "--namespace", opts.Namespace)
+	}
+
+	return carapace.ActionExecCommand("helm", args...)(func(output []byte) carapace.Action {
 		var releases []release
 		if err := json.Unmarshal(output, &releases); err != nil {
 			return carapace.ActionMessage(err.Error())