Normalize flag names at the pflag level.

go/cmd/mysqlctl/command/start.go

@@ -62,7 +62,7 @@ func commandStart(cmd *cobra.Command, args []string) error {
 
 func init() {
 	utils.SetFlagDurationVar(Start.Flags(), &startArgs.WaitTime, "wait-time", startArgs.WaitTime, "How long to wait for mysqld startup.")
-	Start.Flags().Var(&startArgs.MySQLdArgs, "mysqld_args", "List of comma-separated flags to pass additionally to mysqld.")
+	Start.Flags().Var(&startArgs.MySQLdArgs, "mysqld-args", "List of comma-separated flags to pass additionally to mysqld.")
 
 	Root.AddCommand(Start)
 }

go/cmd/mysqlctl/mysqlctl.go

@@ -20,9 +20,12 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/mysqlctl/command"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
+	command.Root.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
+
 	if err := command.Root.Execute(); err != nil {
 		log.Exit(err)
 	}

go/cmd/mysqlctld/mysqlctld.go

@@ -22,9 +22,12 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/mysqlctld/cli"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
+
 	if err := cli.Main.Execute(); err != nil {
 		log.Exit(err)
 	}

go/cmd/rulesctl/main.go

@@ -8,10 +8,12 @@ import (
 	vtlog "vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	rootCmd := cmd.Main()
+	rootCmd.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	vtlog.RegisterFlags(rootCmd.PersistentFlags())
 	logutil.RegisterFlags(rootCmd.PersistentFlags())
 	acl.RegisterFlags(rootCmd.PersistentFlags())

go/cmd/topo2topo/topo2topo.go

@@ -20,11 +20,13 @@ import (
 	"vitess.io/vitess/go/cmd/topo2topo/cli"
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	defer exit.RecoverAll()
 
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Exitf("%s", err)
 	}

go/cmd/vtaclcheck/cli/vtactlcheck.go

@@ -22,6 +22,7 @@ import (
 	"vitess.io/vitess/go/acl"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
+	"vitess.io/vitess/go/vt/utils"
 	"vitess.io/vitess/go/vt/vtaclcheck"
 )
 
@@ -58,6 +59,8 @@ func run(cmd *cobra.Command, args []string) error {
 }
 
 func init() {
+	Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
+
 	servenv.MoveFlagsToCobraCommand(Main)
 
 	Main.Flags().StringVar(&aclFile, "acl-file", aclFile, "The path of the JSON ACL file to check")

go/cmd/vtadmin/main.go

@@ -227,6 +227,7 @@ func registerFlags() {
 func main() {
 	registerFlags()
 
+	rootCmd.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := rootCmd.Execute(); err != nil {
 		log.Fatal(err)
 	}

go/cmd/vtbackup/vtbackup.go

@@ -20,11 +20,13 @@ import (
 	"vitess.io/vitess/go/cmd/vtbackup/cli"
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	defer exit.Recover()
 
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Error(err)
 		exit.Return(1)

go/cmd/vtbench/vtbench.go

@@ -20,11 +20,13 @@ import (
 	"vitess.io/vitess/go/cmd/vtbench/cli"
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	defer exit.Recover()
 
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Exit(err)
 	}

go/cmd/vtclient/vtclient.go

@@ -19,10 +19,13 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/vtclient/cli"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	cli.InitializeFlags()
+
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Exit(err)
 	}

go/cmd/vtcombo/main.go

@@ -25,11 +25,13 @@ import (
 	"vitess.io/vitess/go/cmd/vtcombo/cli"
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	defer exit.Recover()
 
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Error(err)
 		exit.Return(1)

go/cmd/vtctl/vtctl.go

@@ -91,6 +91,8 @@ func init() {
 		fs.BoolVar(&detachedMode, "detach", detachedMode, "detached mode - run vtcl detached from the terminal")
 
 		acl.RegisterFlags(fs)
+
+		fs.SetNormalizeFunc(utils.NormalizeUnderscoresToDashes)
 	})
 }
 

go/cmd/vtctlclient/main.go

@@ -52,6 +52,8 @@ func init() {
 		fs.StringVar(&server, "server", server, "server to use for connection")
 
 		acl.RegisterFlags(fs)
+
+		fs.SetNormalizeFunc(utils.NormalizeUnderscoresToDashes)
 	})
 }
 

go/cmd/vtctld/main.go

@@ -19,9 +19,11 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/vtctld/cli"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Fatal(err)
 	}

go/cmd/vtctldclient/main.go

@@ -33,6 +33,7 @@ import (
 	"vitess.io/vitess/go/vt/vttablet/tmclient"
 
 	_flag "vitess.io/vitess/go/internal/flag"
+	flagUtils "vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
@@ -55,6 +56,7 @@ func main() {
 	// hack to get rid of an "ERROR: logging before flag.Parse"
 	_flag.TrickGlog()
 
+	command.Root.SetGlobalNormalizationFunc(flagUtils.NormalizeUnderscoresToDashes)
 	// back to your regularly scheduled cobra programming
 	if err := command.Root.Execute(); err != nil {
 		log.Error(err)

go/cmd/vtexplain/vtexplain.go

@@ -21,11 +21,13 @@ import (
 
 	"vitess.io/vitess/go/cmd/vtexplain/cli"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	defer exit.RecoverAll()
 
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		fmt.Printf("ERROR: %s\n", err)
 		exit.Return(1)

go/cmd/vtgate/cli/cli.go

@@ -213,7 +213,5 @@ func init() {
 	Main.Flags().StringVar(&plannerName, "planner-version", plannerName, "Sets the default planner to use when the session has not changed it. Valid values are: Gen4, Gen4Greedy, Gen4Left2Right")
 
 	// Support both variants until v25
-	// Main.MarkFlagRequired("tablet-types-to-wait")
-	Main.MarkFlagsOneRequired("tablet-types-to-wait", "tablet_types_to_wait")
-
+	Main.MarkFlagsOneRequired("tablet-types-to-wait")
 }

go/cmd/vtgate/vtgate.go

@@ -19,9 +19,11 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/vtgate/cli"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Exit(err)
 	}

go/cmd/vtgateclienttest/main.go

@@ -20,11 +20,13 @@ import (
 	"vitess.io/vitess/go/cmd/vtgateclienttest/cli"
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	defer exit.Recover()
 
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Exitf("%s", err)
 	}

go/cmd/vtorc/main.go

@@ -19,12 +19,14 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/vtorc/cli"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 // main is the application's entry point. It will spawn an HTTP interface.
 func main() {
 	// TODO: viperutil.BindFlags()
 
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Exit(err)
 	}

go/cmd/vttablet/cli/cli_test.go

@@ -25,7 +25,6 @@ import (
 
 	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/topo/memorytopo"
-	"vitess.io/vitess/go/vt/utils"
 )
 
 // TestRunFailsToStartTabletManager tests the code path in 'run' where we fail to start the TabletManager
@@ -43,15 +42,16 @@ func TestRunFailsToStartTabletManager(t *testing.T) {
 		os.Args = append([]string{}, args...)
 	})
 
-	flags := make(map[string]string)
-	utils.SetFlagVariantsForTests(flags, "--topo-implementation", "test")
-	utils.SetFlagVariantsForTests(flags, "--topo-global-server-address", "localhost")
-	utils.SetFlagVariantsForTests(flags, "--topo-global-root", "cell")
-	utils.SetFlagVariantsForTests(flags, "--db-host", "localhost")
-	utils.SetFlagVariantsForTests(flags, "--db-port", "3306")
-	utils.SetFlagVariantsForTests(flags, "--init-keyspace", "ks")
-	utils.SetFlagVariantsForTests(flags, "--init-shard", "0")
-	utils.SetFlagVariantsForTests(flags, "--init-tablet-type", "replica")
+	flags := map[string]string{
+		"--topo-implementation":        "test",
+		"--topo-global-server-address": "localhost",
+		"--topo-global-root":           "cell",
+		"--db-host":                    "localhost",
+		"--db-port":                    "3306",
+		"--init-keyspace":              "ks",
+		"--init-shard":                 "0",
+		"--init-tablet-type":           "replica",
+	}
 
 	var flagArgs []string
 	for flag, value := range flags {

go/cmd/vttablet/vttablet.go

@@ -20,9 +20,11 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/vttablet/cli"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
+	cli.Main.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	if err := cli.Main.Execute(); err != nil {
 		log.Exit(err)
 	}

go/cmd/vttestserver/cli/main_test.go

@@ -38,7 +38,6 @@ import (
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/tlstest"
-	"vitess.io/vitess/go/vt/utils"
 	"vitess.io/vitess/go/vt/vtctl/vtctlclient"
 	"vitess.io/vitess/go/vt/vttest"
 
@@ -191,7 +190,7 @@ func TestNoScatter(t *testing.T) {
 	conf := config
 	defer resetConfig(conf)
 
-	cluster, err := startCluster(utils.GetFlagVariantForTests("--no-scatter"))
+	cluster, err := startCluster("--no-scatter")
 	require.NoError(t, err)
 	defer cluster.TearDown()
 
@@ -303,14 +302,14 @@ func TestMtlsAuth(t *testing.T) {
 	// When cluster starts it will apply SQL and VSchema migrations in the configured schema-dir folder
 	// With mtls authorization enabled, the authorized CN must match the certificate's CN
 	cluster, err := startCluster(
-		utils.GetFlagVariantForTests("--grpc-auth-mode")+"=mtls",
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--grpc-key"), key),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--grpc-cert"), cert),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--grpc-ca"), caCert),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--vtctld-grpc-key"), clientKey),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--vtctld-grpc-cert"), clientCert),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--vtctld-grpc-ca"), caCert),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--grpc-auth-mtls-allowed-substrings"), "CN=ClientApp"))
+		"--grpc-auth-mode=mtls",
+		fmt.Sprintf("%s=%s", "--grpc-key", key),
+		fmt.Sprintf("%s=%s", "--grpc-cert", cert),
+		fmt.Sprintf("%s=%s", "--grpc-ca", caCert),
+		fmt.Sprintf("%s=%s", "--vtctld-grpc-key", clientKey),
+		fmt.Sprintf("%s=%s", "--vtctld-grpc-cert", clientCert),
+		fmt.Sprintf("%s=%s", "--vtctld-grpc-ca", caCert),
+		fmt.Sprintf("%s=%s", "--grpc-auth-mtls-allowed-substrings", "CN=ClientApp"))
 	require.NoError(t, err)
 	defer func() {
 		cluster.PersistentMode = false // Cleanup the tmpdir as we're done
@@ -345,13 +344,13 @@ func TestMtlsAuthUnauthorizedFails(t *testing.T) {
 	// For mtls authorization failure by providing a client certificate with different CN thant the
 	// authorized in the configuration
 	cluster, err := startCluster(
-		utils.GetFlagVariantForTests("--grpc-auth-mode")+"=mtls",
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--grpc-key"), key),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--grpc-cert"), cert),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--grpc-ca"), caCert),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--vtctld-grpc-key"), clientKey),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--vtctld-grpc-cert"), clientCert),
-		fmt.Sprintf("%s=%s", utils.GetFlagVariantForTests("--vtctld-grpc-ca"), caCert),
+		"--grpc-auth-mode=mtls",
+		fmt.Sprintf("%s=%s", "--grpc-key", key),
+		fmt.Sprintf("%s=%s", "--grpc-cert", cert),
+		fmt.Sprintf("%s=%s", "--grpc-ca", caCert),
+		fmt.Sprintf("%s=%s", "--vtctld-grpc-key", clientKey),
+		fmt.Sprintf("%s=%s", "--vtctld-grpc-cert", clientCert),
+		fmt.Sprintf("%s=%s", "--vtctld-grpc-ca", caCert),
 		fmt.Sprintf("--grpc-auth-mtls-allowed-substrings=%s", "CN=ClientApp"))
 	defer cluster.TearDown()
 
@@ -376,8 +375,8 @@ var clusterKeyspaces = []string{
 
 func startCluster(flags ...string) (cluster vttest.LocalCluster, err error) {
 	args := []string{"vttestserver"}
-	schemaDirArg := utils.GetFlagVariantForTests("--schema-dir") + "=data/schema"
-	tabletHostname := fmt.Sprintf("%s=localhost", utils.GetFlagVariantForTests("--tablet-hostname"))
+	schemaDirArg := "--schema-dir=data/schema"
+	tabletHostname := fmt.Sprintf("%s=localhost", "--tablet-hostname")
 	keyspaceArg := "--keyspaces=" + strings.Join(clusterKeyspaces, ",")
 	numShardsArg := "--num-shards=2,2"
 	vschemaDDLAuthorizedUsers := "--vschema-ddl-authorized-users=%"

go/cmd/vttestserver/main.go

@@ -19,10 +19,13 @@ package main
 import (
 	"vitess.io/vitess/go/cmd/vttestserver/cli"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
-	if err := cli.New().Execute(); err != nil {
+	cmd := cli.New()
+	cmd.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
+	if err := cmd.Execute(); err != nil {
 		log.Fatal(err)
 	}
 }

go/cmd/vttlstest/vttlstest.go

@@ -22,11 +22,13 @@ import (
 	"vitess.io/vitess/go/cmd/vttlstest/cli"
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/logutil"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 func main() {
 	defer exit.Recover()
 	defer logutil.Flush()
 
+	cli.Root.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	cobra.CheckErr(cli.Root.Execute())
 }