Merge pull request #2187 from sayboras/bugfix/version-flags

Fix flags issue in version cli

cmd/eksctl/main.go

@@ -39,7 +39,8 @@ func addCommands(rootCmd *cobra.Command, flagGrouping *cmdutils.FlagGrouping) {
 	}
 	rootCmd.AddCommand(utils.Command(flagGrouping))
 	rootCmd.AddCommand(completion.Command(rootCmd))
-	rootCmd.AddCommand(versionCmd(flagGrouping))
+
+	cmdutils.AddResourceCmd(flagGrouping, rootCmd, versionCmd)
 }
 
 func main() {

cmd/eksctl/version.go

@@ -3,30 +3,31 @@ package main
 import (
 	"fmt"
 
+	"github.com/spf13/pflag"
+
 	"github.com/spf13/cobra"
 
 	"github.com/weaveworks/eksctl/pkg/ctl/cmdutils"
 	"github.com/weaveworks/eksctl/pkg/version"
 )
 
-var output string
+func versionCmd(cmd *cmdutils.Cmd) {
+	var output string
 
-func versionCmd(_ *cmdutils.FlagGrouping) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "version",
-		Short: "Output the version of eksctl",
-		RunE: func(_ *cobra.Command, _ []string) error {
-			switch output {
-			case "":
-				fmt.Printf("%s\n", version.GetVersion())
-			case "json":
-				fmt.Printf("%s\n", version.String())
-			default:
-				return fmt.Errorf("unknown output: %s", output)
-			}
-			return nil
-		},
+	cmd.SetDescription("version", "Output the version of eksctl", "")
+	cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) {
+		fs.StringVarP(&output, "output", "o", "", "specifies the output format (valid option: json)")
+	})
+	cmd.CobraCommand.Args = cobra.NoArgs
+	cmd.CobraCommand.RunE = func(_ *cobra.Command, args []string) error {
+		switch output {
+		case "":
+			fmt.Printf("%s\n", version.GetVersion())
+		case "json":
+			fmt.Printf("%s\n", version.String())
+		default:
+			return fmt.Errorf("unknown output: %s", output)
+		}
+		return nil
 	}
-	cmd.Flags().StringVarP(&output, "output", "o", "", "specifies the output format (valid option: json)")
-	return cmd
 }