Merge pull request #8364 from VilledeMontreal/feat/compRollbackRev

Complete revision parameter for rollback command

cmd/helm/get_all.go

@@ -67,7 +67,7 @@ func newGetAllCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.IntVar(&client.Version, "revision", 0, "get the named release with revision")
 	err := cmd.RegisterFlagCompletionFunc("revision", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 1 {
-			return compListRevisions(cfg, args[0])
+			return compListRevisions(toComplete, cfg, args[0])
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	})

cmd/helm/get_hooks.go

@@ -62,7 +62,7 @@ func newGetHooksCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	cmd.Flags().IntVar(&client.Version, "revision", 0, "get the named release with revision")
 	err := cmd.RegisterFlagCompletionFunc("revision", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 1 {
-			return compListRevisions(cfg, args[0])
+			return compListRevisions(toComplete, cfg, args[0])
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	})

cmd/helm/get_manifest.go

@@ -62,7 +62,7 @@ func newGetManifestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 	cmd.Flags().IntVar(&client.Version, "revision", 0, "get the named release with revision")
 	err := cmd.RegisterFlagCompletionFunc("revision", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 1 {
-			return compListRevisions(cfg, args[0])
+			return compListRevisions(toComplete, cfg, args[0])
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	})

cmd/helm/get_notes.go

@@ -61,7 +61,7 @@ func newGetNotesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.IntVar(&client.Version, "revision", 0, "get the named release with revision")
 	err := cmd.RegisterFlagCompletionFunc("revision", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 1 {
-			return compListRevisions(cfg, args[0])
+			return compListRevisions(toComplete, cfg, args[0])
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	})

cmd/helm/get_values.go

@@ -65,7 +65,7 @@ func newGetValuesCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.IntVar(&client.Version, "revision", 0, "get the named release with revision")
 	err := cmd.RegisterFlagCompletionFunc("revision", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 1 {
-			return compListRevisions(cfg, args[0])
+			return compListRevisions(toComplete, cfg, args[0])
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	})

cmd/helm/history.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/gosuri/uitable"
@@ -184,15 +185,18 @@ func min(x, y int) int {
 	return y
 }
 
-func compListRevisions(cfg *action.Configuration, releaseName string) ([]string, cobra.ShellCompDirective) {
+func compListRevisions(toComplete string, cfg *action.Configuration, releaseName string) ([]string, cobra.ShellCompDirective) {
 	client := action.NewHistory(cfg)
 
 	var revisions []string
 	if hist, err := client.Run(releaseName); err == nil {
 		for _, release := range hist {
-			revisions = append(revisions, strconv.Itoa(release.Version))
+			version := strconv.Itoa(release.Version)
+			if strings.HasPrefix(version, toComplete) {
+				revisions = append(revisions, version)
+			}
 		}
-		return revisions, cobra.ShellCompDirectiveDefault
+		return revisions, cobra.ShellCompDirectiveNoFileComp
 	}
 	return nil, cobra.ShellCompDirectiveError
 }

cmd/helm/rollback.go

@@ -47,10 +47,15 @@ func newRollbackCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 		Long:  rollbackDesc,
 		Args:  require.MinimumNArgs(1),
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			if len(args) != 0 {
-				return nil, cobra.ShellCompDirectiveNoFileComp
+			if len(args) == 0 {
+				return compListReleases(toComplete, cfg)
 			}
-			return compListReleases(toComplete, cfg)
+
+			if len(args) == 1 {
+				return compListRevisions(toComplete, cfg, args[0])
+			}
+
+			return nil, cobra.ShellCompDirectiveNoFileComp
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) > 1 {

cmd/helm/rollback_test.go

@@ -68,3 +68,39 @@ func TestRollbackCmd(t *testing.T) {
 	}}
 	runTestCmd(t, tests)
 }
+
+func TestRollbackRevisionCompletion(t *testing.T) {
+	mk := func(name string, vers int, status release.Status) *release.Release {
+		return release.Mock(&release.MockReleaseOptions{
+			Name:    name,
+			Version: vers,
+			Status:  status,
+		})
+	}
+
+	releases := []*release.Release{
+		mk("musketeers", 11, release.StatusDeployed),
+		mk("musketeers", 10, release.StatusSuperseded),
+		mk("musketeers", 9, release.StatusSuperseded),
+		mk("musketeers", 8, release.StatusSuperseded),
+		mk("carabins", 1, release.StatusSuperseded),
+	}
+
+	tests := []cmdTestCase{{
+		name:   "completion for release parameter",
+		cmd:    "__complete rollback ''",
+		rels:   releases,
+		golden: "output/rollback-comp.txt",
+	}, {
+		name:   "completion for revision parameter",
+		cmd:    "__complete rollback musketeers ''",
+		rels:   releases,
+		golden: "output/revision-comp.txt",
+	}, {
+		name:   "completion for with too many args",
+		cmd:    "__complete rollback musketeers 11 ''",
+		rels:   releases,
+		golden: "output/rollback-wrong-args-comp.txt",
+	}}
+	runTestCmd(t, tests)
+}

cmd/helm/status.go

@@ -78,7 +78,7 @@ func newStatusCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	err := cmd.RegisterFlagCompletionFunc("revision", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 1 {
-			return compListRevisions(cfg, args[0])
+			return compListRevisions(toComplete, cfg, args[0])
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	})

cmd/helm/testdata/output/revision-comp.txt

@@ -2,5 +2,5 @@
 9
 10
 11
-:0
-Completion ended with directive: ShellCompDirectiveDefault
+:4
+Completion ended with directive: ShellCompDirectiveNoFileComp

cmd/helm/testdata/output/rollback-comp.txt

@@ -0,0 +1,4 @@
+carabins
+musketeers
+:4
+Completion ended with directive: ShellCompDirectiveNoFileComp

cmd/helm/testdata/output/rollback-wrong-args-comp.txt

@@ -0,0 +1,2 @@
+:4
+Completion ended with directive: ShellCompDirectiveNoFileComp