Fix vtclient vtgate missing flags (specifically --grpc_*) (#17800)

Signed-off-by: Kyle Johnson <[email protected]>
Co-authored-by: Kyle Johnson <[email protected]>

go/cmd/vtclient/cli/vtclient.go

@@ -82,7 +82,7 @@ var (
 	seqChan = make(chan int, 10)
 )
 
-func init() {
+func InitializeFlags() {
 	servenv.MoveFlagsToCobraCommand(Main)
 
 	Main.Flags().StringVar(&server, "server", server, "vtgate server to connect to")

go/cmd/vtclient/cli/vtclient_test.go

@@ -121,6 +121,8 @@ func TestVtclient(t *testing.T) {
 		},
 	}
 
+	// initialize the vtclient flags before running any commands
+	InitializeFlags()
 	for _, q := range queries {
 		// Run main function directly and not as external process. To achieve this,
 		// overwrite os.Args which is used by pflag.Parse().

go/cmd/vtclient/vtclient.go

@@ -22,6 +22,7 @@ import (
 )
 
 func main() {
+	cli.InitializeFlags()
 	if err := cli.Main.Execute(); err != nil {
 		log.Exit(err)
 	}

go/vt/servenv/servenv.go

@@ -336,7 +336,7 @@ func ParseFlagsForTests(cmd string) {
 // the given cobra command, then copies over the glog flags that otherwise
 // require manual transferring.
 func MoveFlagsToCobraCommand(cmd *cobra.Command) {
-	moveFlags(cmd.Use, cmd.Flags())
+	moveFlags(cmd.Name(), cmd.Flags())
 }
 
 // MovePersistentFlagsToCobraCommand functions exactly like MoveFlagsToCobraCommand,
@@ -347,7 +347,7 @@ func MoveFlagsToCobraCommand(cmd *cobra.Command) {
 // Useful for transferring flags to a parent command whose subcommands should
 // inherit the servenv-registered flags.
 func MovePersistentFlagsToCobraCommand(cmd *cobra.Command) {
-	moveFlags(cmd.Use, cmd.PersistentFlags())
+	moveFlags(cmd.Name(), cmd.PersistentFlags())
 }
 
 func moveFlags(name string, fs *pflag.FlagSet) {