Merge pull request #2261 from rsteube/helm-actionreleases

helm: extracted local ActionReleases
carapace-sh · Feb 22, 2024 · 31bd8bb · 31bd8bb
2 parents 9f62c84 + d6d52bd
commit 31bd8bb
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 75 deletions.
diff --git a/completers/helm_completer/cmd/action/release.go b/completers/helm_completer/cmd/action/release.go
@@ -0,0 +1,16 @@
+package action
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/spf13/cobra"
+)
+
+func ActionReleases(cmd *cobra.Command) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		return helm.ActionReleases(helm.ReleasesOpts{
+			Namespace:   cmd.Root().Flag("namespace").Value.String(),
+			KubeContext: cmd.Root().Flag("kube-context").Value.String(),
+		})
+	})
+}
diff --git a/completers/helm_completer/cmd/get_all.go b/completers/helm_completer/cmd/get_all.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -19,11 +19,6 @@ func init() {
 	getCmd.AddCommand(get_allCmd)
 
 	carapace.Gen(get_allCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(get_allCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_hooks.go b/completers/helm_completer/cmd/get_hooks.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -18,11 +18,6 @@ func init() {
 	getCmd.AddCommand(get_hooksCmd)
 
 	carapace.Gen(get_hooksCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(get_hooksCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_manifest.go b/completers/helm_completer/cmd/get_manifest.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -18,11 +18,6 @@ func init() {
 	getCmd.AddCommand(get_manifestCmd)
 
 	carapace.Gen(get_manifestCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(get_manifestCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_notes.go b/completers/helm_completer/cmd/get_notes.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -18,11 +18,6 @@ func init() {
 	getCmd.AddCommand(get_notesCmd)
 
 	carapace.Gen(get_notesCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(get_notesCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/get_values.go b/completers/helm_completer/cmd/get_values.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -24,11 +24,6 @@ func init() {
 	})
 
 	carapace.Gen(get_valuesCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(get_valuesCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/history.go b/completers/helm_completer/cmd/history.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -24,11 +24,6 @@ func init() {
 	})
 
 	carapace.Gen(historyCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(historyCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/rollback.go b/completers/helm_completer/cmd/rollback.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
 	"github.com/spf13/cobra"
 )
@@ -29,12 +30,7 @@ func init() {
 	rootCmd.AddCommand(rollbackCmd)
 
 	carapace.Gen(rollbackCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(rollbackCmd),
 		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
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -25,11 +25,6 @@ func init() {
 	})
 
 	carapace.Gen(statusCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(statusCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/test.go b/completers/helm_completer/cmd/test.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -23,11 +23,6 @@ func init() {
 	rootCmd.AddCommand(testCmd)
 
 	carapace.Gen(testCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(testCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/uninstall.go b/completers/helm_completer/cmd/uninstall.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -25,11 +25,6 @@ func init() {
 	rootCmd.AddCommand(uninstallCmd)
 
 	carapace.Gen(uninstallCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(uninstallCmd),
 	)
 }
diff --git a/completers/helm_completer/cmd/upgrade.go b/completers/helm_completer/cmd/upgrade.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/completers/helm_completer/cmd/action"
 	"github.com/rsteube/carapace-bin/pkg/actions/tools/helm"
 	"github.com/rsteube/carapace/pkg/condition"
 	"github.com/spf13/cobra"
@@ -86,12 +87,7 @@ func init() {
 	})
 
 	carapace.Gen(upgradeCmd).PositionalCompletion(
-		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(),
-			})
-		}),
+		action.ActionReleases(upgradeCmd),
 		carapace.Batch(
 			carapace.ActionFiles(),
 			helm.ActionRepositoryCharts().Unless(condition.CompletingPath),