Merge pull request #2258 from Trojan295/feat/helm/add-namespace-and-c…

…ontext-completions helm, kubectl: add namespace and kube-context completions
carapace-sh · Feb 21, 2024 · 62e1d9e · 62e1d9e
2 parents f038a18 + 0c8b774
commit 62e1d9e
Show file tree

Hide file tree

Showing 39 changed files with 147 additions and 39 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/root.go b/completers/helm_completer/cmd/root.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/rsteube/carapace"
 	"github.com/rsteube/carapace-bin/pkg/actions/os"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/kubectl"
 	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
 	"github.com/spf13/cobra"
 )
@@ -59,11 +60,13 @@ func init() {
 		"kube-as-group": os.ActionGroups(),
 		"kube-as-user":  os.ActionUsers(),
 		"kube-ca-file":  carapace.ActionFiles(),
-		// TODO "kube-context"
-		"kubeconfig": carapace.ActionFiles(),
-		"log-dir":    carapace.ActionDirectories(),
-		"log-file":   carapace.ActionFiles(),
-		// TODO namespace
+		"kube-context":  kubectl.ActionContexts(),
+		"kubeconfig":    carapace.ActionFiles(),
+		"log-dir":       carapace.ActionDirectories(),
+		"log-file":      carapace.ActionFiles(),
+		"namespace": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return kubectl.ActionResources(kubectl.ResourceOpts{Types: "namespaces", Context: rootCmd.Flag("kube-context").Value.String()})
+		}),
 		"registry-config":  carapace.ActionFiles(),
 		"repository-cache": carapace.ActionFiles(),
 	})

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/completers/kubectl_completer/cmd/annotate.go b/completers/kubectl_completer/cmd/annotate.go
@@ -59,6 +59,7 @@ func init() {
 				return carapace.ActionValues()
 			} else {
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     c.Args[0],
 				})

diff --git a/completers/kubectl_completer/cmd/autoscale.go b/completers/kubectl_completer/cmd/autoscale.go
@@ -49,6 +49,7 @@ func init() {
 		carapace.ActionValues("deployments", "replicasets", "replicationcontrollers"),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     c.Args[0],
 			})

diff --git a/completers/kubectl_completer/cmd/clusterInfo_dump.go b/completers/kubectl_completer/cmd/clusterInfo_dump.go
@@ -31,7 +31,11 @@ func init() {
 			if !clusterInfoCmd.Flag("all-namespaces").Changed {
 				namespace = rootCmd.Flag("namespace").Value.String()
 			}
-			return kubectl.ActionResources(kubectl.ResourceOpts{Namespace: namespace, Types: "namespaces"})
+			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
+				Namespace: namespace,
+				Types:     "namespaces",
+			})
 		}),
 		"output":           kubectl.ActionOutputFormats(),
 		"output-directory": carapace.ActionDirectories(),

diff --git a/completers/kubectl_completer/cmd/cordon.go b/completers/kubectl_completer/cmd/cordon.go
@@ -28,6 +28,7 @@ func init() {
 	carapace.Gen(cordonCmd).PositionalCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     "nodes",
 			})

diff --git a/completers/kubectl_completer/cmd/cp.go b/completers/kubectl_completer/cmd/cp.go
@@ -57,9 +57,17 @@ func ActionPathOrContainer() carapace.Action {
 		carapace.ActionMultiParts("/", func(c carapace.Context) carapace.Action {
 			switch len(c.Parts) {
 			case 0:
-				return kubectl.ActionResources(kubectl.ResourceOpts{Namespace: "", Types: "namespaces"}).Invoke(c).Suffix("/").ToA()
+				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
+					Namespace: "",
+					Types:     "namespaces",
+				}).Invoke(c).Suffix("/").ToA()
 			case 1:
-				return kubectl.ActionResources(kubectl.ResourceOpts{Namespace: c.Parts[0], Types: "pods"}).Invoke(c).Suffix(":").ToA()
+				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
+					Namespace: c.Parts[0],
+					Types:     "pods",
+				}).Invoke(c).Suffix(":").ToA()
 			default:
 				return carapace.ActionValues()
 			}

diff --git a/completers/kubectl_completer/cmd/create_clusterrolebinding.go b/completers/kubectl_completer/cmd/create_clusterrolebinding.go
@@ -35,6 +35,7 @@ func init() {
 	carapace.Gen(create_clusterrolebindingCmd).FlagCompletion(carapace.ActionMap{
 		"clusterrole": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     "clusterrole",
 			})

diff --git a/completers/kubectl_completer/cmd/create_job.go b/completers/kubectl_completer/cmd/create_job.go
@@ -33,6 +33,7 @@ func init() {
 		"dry-run": kubectl.ActionDryRunModes(),
 		"from": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     "cronjobs",
 			})

diff --git a/completers/kubectl_completer/cmd/create_rolebinding.go b/completers/kubectl_completer/cmd/create_rolebinding.go
@@ -35,6 +35,7 @@ func init() {
 	carapace.Gen(create_rolebindingCmd).FlagCompletion(carapace.ActionMap{
 		"clusterrole": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     "clusterroles",
 			})
@@ -43,6 +44,7 @@ func init() {
 		"output":  kubectl.ActionOutputFormats(),
 		"role": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     "roles",
 			})

diff --git a/completers/kubectl_completer/cmd/delete.go b/completers/kubectl_completer/cmd/delete.go
@@ -47,6 +47,7 @@ func init() {
 		kubectl.ActionApiResources().UniqueList(","),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     c.Args[0],
 			})

diff --git a/completers/kubectl_completer/cmd/describe.go b/completers/kubectl_completer/cmd/describe.go
@@ -36,11 +36,11 @@ func init() {
 
 	carapace.Gen(describeCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			var namespace string
-			if !describeCmd.Flag("all-namespaces").Changed {
-				namespace = rootCmd.Flag("namespace").Value.String()
-			}
-			return kubectl.ActionResources(kubectl.ResourceOpts{Namespace: namespace, Types: c.Args[0]}).Filter(c.Args[1:]...)
+			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
+				Namespace: rootCmd.Flag("namespace").Value.String(),
+				Types:     c.Args[0],
+			}).Filter(c.Args[1:]...)
 		}),
 	)
 }
diff --git a/completers/kubectl_completer/cmd/drain.go b/completers/kubectl_completer/cmd/drain.go
@@ -39,6 +39,7 @@ func init() {
 	carapace.Gen(drainCmd).PositionalCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     "nodes",
 			})

diff --git a/completers/kubectl_completer/cmd/expose.go b/completers/kubectl_completer/cmd/expose.go
@@ -57,6 +57,7 @@ func init() {
 		carapace.ActionValues("pod", "service", "replicationcontroller", "deployment", "replicaset"),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     c.Args[0],
 			})

diff --git a/completers/kubectl_completer/cmd/get.go b/completers/kubectl_completer/cmd/get.go
@@ -55,6 +55,7 @@ func init() {
 	carapace.Gen(getCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     c.Args[0],
 			}).Filter(c.Args[1:]...)

diff --git a/completers/kubectl_completer/cmd/label.go b/completers/kubectl_completer/cmd/label.go
@@ -59,6 +59,7 @@ func init() {
 				return carapace.ActionValues()
 			} else {
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     c.Args[0],
 				})

diff --git a/completers/kubectl_completer/cmd/patch.go b/completers/kubectl_completer/cmd/patch.go
@@ -58,6 +58,7 @@ func init() {
 				return carapace.ActionValues()
 			} else {
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     c.Args[0],
 				})

diff --git a/completers/kubectl_completer/cmd/root.go b/completers/kubectl_completer/cmd/root.go
@@ -68,10 +68,16 @@ func init() {
 		"certificate-authority": carapace.ActionFiles(),
 		"client-certificate":    carapace.ActionFiles(),
 		"client-key":            carapace.ActionFiles(),
+		"context":               kubectl.ActionContexts(),
 		"kubeconfig":            carapace.ActionFiles(),
-		"namespace":             kubectl.ActionResources(kubectl.ResourceOpts{Namespace: "", Types: "namespaces"}),
-		"profile":               carapace.ActionValues("none", "cpu", "heap", "goroutine", "threadcreate", "block", "mutex"),
-		"profile-output":        carapace.ActionFiles(),
+		"namespace": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context: rootCmd.Flag("context").Value.String(),
+				Types:   "namespaces",
+			})
+		}),
+		"profile":        carapace.ActionValues("none", "cpu", "heap", "goroutine", "threadcreate", "block", "mutex"),
+		"profile-output": carapace.ActionFiles(),
 		// TODO add completions for kubeconfig based flags
 	})
 

diff --git a/completers/kubectl_completer/cmd/scale.go b/completers/kubectl_completer/cmd/scale.go
@@ -51,6 +51,7 @@ func init() {
 				return carapace.ActionValues("deployments/", "replicasets/", "replicationcontrollers/").NoSpace()
 			case 1:
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     c.Parts[0],
 				})

diff --git a/completers/kubectl_completer/cmd/set_image.go b/completers/kubectl_completer/cmd/set_image.go
@@ -44,6 +44,7 @@ func init() {
 		carapace.ActionValues("pod", "service", "replicationcontroller", "deployment", "replicaset").UniqueList(","),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return kubectl.ActionResources(kubectl.ResourceOpts{
+				Context:   rootCmd.Flag("context").Value.String(),
 				Namespace: rootCmd.Flag("namespace").Value.String(),
 				Types:     c.Args[0],
 			})

diff --git a/completers/kubectl_completer/cmd/set_resources.go b/completers/kubectl_completer/cmd/set_resources.go
@@ -56,6 +56,7 @@ func init() {
 				return carapace.ActionValues()
 			} else {
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     c.Args[0],
 				})

diff --git a/completers/kubectl_completer/cmd/set_serviceaccount.go b/completers/kubectl_completer/cmd/set_serviceaccount.go
@@ -44,6 +44,7 @@ func init() {
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			if set_serviceaccountCmd.Flag("filename").Changed {
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     "serviceaccounts",
 				})
@@ -56,6 +57,7 @@ func init() {
 				return carapace.ActionValues()
 			} else {
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     c.Args[0],
 				})
@@ -66,6 +68,7 @@ func init() {
 				return carapace.ActionValues()
 			} else {
 				return kubectl.ActionResources(kubectl.ResourceOpts{
+					Context:   rootCmd.Flag("context").Value.String(),
 					Namespace: rootCmd.Flag("namespace").Value.String(),
 					Types:     "serviceaccounts",
 				})