turn "vi" into a proper flag

rockset · Nov 9, 2023 · 141b638 · 141b638
1 parent 8f3cd91
commit 141b638
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/cmd/mount.go b/cmd/mount.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/rockset/cli/completion"
 	"github.com/rockset/cli/config"
+	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/lookup"
 	"github.com/rockset/cli/sort"
@@ -66,7 +67,7 @@ func NewGetMountCmd() *cobra.Command {
 				return err
 			}
 
-			vi, _ := cmd.Flags().GetString("vi")
+			vi, _ := cmd.Flags().GetString(flag.VI)
 			id, err := lookup.VirtualInstanceNameOrIDtoID(ctx, rs, vi)
 			if err != nil {
 				return err
@@ -81,9 +82,9 @@ func NewGetMountCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().String("vi", "", "virtual instance id or name")
-	cmd.MarkFlagRequired("vi")
-	_ = cmd.RegisterFlagCompletionFunc("vi", completion.VirtualInstance(Version))
+	cmd.Flags().String(flag.VI, "", "virtual instance id or name")
+	cmd.MarkFlagRequired(flag.VI)
+	_ = cmd.RegisterFlagCompletionFunc(flag.VI, completion.VirtualInstance(Version))
 
 	return &cmd
 }
@@ -102,7 +103,7 @@ func NewMountCollectionsCmd() *cobra.Command {
 				return err
 			}
 
-			vi, _ := cmd.Flags().GetString("vi")
+			vi, _ := cmd.Flags().GetString(flag.VI)
 			id, err := lookup.VirtualInstanceNameOrIDtoID(ctx, rs, vi)
 			if err != nil {
 				return err
@@ -124,9 +125,9 @@ func NewMountCollectionsCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().String("vi", "", "virtual instance id or name")
-	cmd.MarkFlagRequired("vi")
-	_ = cmd.RegisterFlagCompletionFunc("vi", completion.VirtualInstance(Version))
+	cmd.Flags().String(flag.VI, "", "virtual instance id or name")
+	cmd.MarkFlagRequired(flag.VI)
+	_ = cmd.RegisterFlagCompletionFunc(flag.VI, completion.VirtualInstance(Version))
 
 	return &cmd
 }
@@ -146,7 +147,7 @@ func NewUnmountCollectionCmd() *cobra.Command {
 				return err
 			}
 
-			vi, _ := cmd.Flags().GetString("vi")
+			vi, _ := cmd.Flags().GetString(flag.VI)
 			id, err := lookup.VirtualInstanceNameOrIDtoID(ctx, rs, vi)
 			if err != nil {
 				return err
@@ -163,9 +164,9 @@ func NewUnmountCollectionCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().String("vi", "", "virtual instance id or name")
-	cmd.MarkFlagRequired("vi")
-	_ = cmd.RegisterFlagCompletionFunc("vi", completion.VirtualInstance(Version))
+	cmd.Flags().String(flag.VI, "", "virtual instance id or name")
+	cmd.MarkFlagRequired(flag.VI)
+	_ = cmd.RegisterFlagCompletionFunc(flag.VI, completion.VirtualInstance(Version))
 
 	return &cmd
 }
diff --git a/cmd/query.go b/cmd/query.go
@@ -74,7 +74,7 @@ func newQueryCmd() *cobra.Command {
 				return err
 			}
 
-			vi, _ := cmd.Flags().GetString("vi")
+			vi, _ := cmd.Flags().GetString(flag.VI)
 			file, _ := cmd.Flags().GetString(flag.File)
 			validate, _ := cmd.Flags().GetBool(flag.Validate)
 
@@ -134,7 +134,7 @@ func newQueryCmd() *cobra.Command {
 
 	cmd.Flags().Bool(flag.Validate, false, "validate SQL")
 	cmd.Flags().String(flag.File, "", "read SQL from file")
-	cmd.Flags().String("vi", "", "execute query on virtual instance")
+	cmd.Flags().String(flag.VI, "", "execute query on virtual instance")
 	_ = cobra.MarkFlagFilename(cmd.Flags(), flag.File, ".sql")
 
 	return &cmd

diff --git a/completion/completions.go b/completion/completions.go
@@ -319,7 +319,7 @@ func CollectionMount(version string) func(cmd *cobra.Command, args []string, toC
 			return nil, cobra.ShellCompDirectiveError
 		}
 
-		vi, _ := cmd.Flags().GetString("vi")
+		vi, _ := cmd.Flags().GetString(flag.VI)
 		id, err := lookup.VirtualInstanceNameOrIDtoID(ctx, rs, vi)
 
 		mounts, err := rs.ListCollectionMounts(ctx, id)

diff --git a/flag/command.go b/flag/command.go
@@ -22,6 +22,7 @@ const (
 	Tag                  = "tag"
 	Tags                 = "tags"
 	Validate             = "validate"
+	VI                   = "vi"
 	Version              = "version"
 	Versions             = "versions"
 	Wait                 = "wait"