vttestserver and binlog player flags

Signed-off-by: Rohit Nayak <[email protected]>

Author: rohit-nayak-ps

go/cmd/vttestserver/cli/main.go

@@ -128,21 +128,21 @@ func New() (cmd *cobra.Command) {
 			" If the directory contains a vschema.json file, it"+
 			" will be used as the vschema for the V3 API.")
 
-	cmd.Flags().StringVar(&config.DefaultSchemaDir, "default_schema_dir", "",
+	utils.SetFlagStringVar(cmd.Flags(), &config.DefaultSchemaDir, "default-schema-dir", "",
 		"Default directory for initial schema files. If no schema is found"+
 			" in schema-dir, default to this location.")
 
-	cmd.Flags().StringVar(&config.DataDir, "data_dir", "",
+	utils.SetFlagStringVar(cmd.Flags(), &config.DataDir, "data-dir", "",
 		"Directory where the data files will be placed, defaults to a random "+
 			"directory under /vt/vtdataroot")
 
-	cmd.Flags().BoolVar(&config.OnlyMySQL, "mysql_only", false,
+	utils.SetFlagBoolVar(cmd.Flags(), &config.OnlyMySQL, "mysql-only", false,
 		"If this flag is set only mysql is initialized."+
 			" The rest of the vitess components are not started."+
 			" Also, the output specifies the mysql unix socket"+
 			" instead of the vtgate port.")
 
-	cmd.Flags().BoolVar(&config.PersistentMode, "persistent_mode", false,
+	utils.SetFlagBoolVar(cmd.Flags(), &config.PersistentMode, "persistent-mode", false,
 		"If this flag is set, the MySQL data directory is not cleaned up"+
 			" when LocalCluster.TearDown() is called. This is useful for running"+
 			" vttestserver as a database container in local developer environments. Note"+
@@ -157,56 +157,56 @@ func New() (cmd *cobra.Command) {
 			" with random data. See also the 'rng_seed' and 'min_shard_size'"+
 			" and 'max_shard_size' flags.")
 
-	cmd.Flags().IntVar(&seed.RngSeed, "rng_seed", 123,
+	utils.SetFlagIntVar(cmd.Flags(), &seed.RngSeed, "rng-seed", 123,
 		"The random number generator seed to use when initializing"+
 			" with random data (see also --initialize-with-random-data)."+
 			" Multiple runs with the same seed will result with the same"+
 			" initial data.")
 
-	cmd.Flags().IntVar(&seed.MinSize, "min_table_shard_size", 1000,
+	utils.SetFlagIntVar(cmd.Flags(), &seed.MinSize, "min-table-shard-size", 1000,
 		"The minimum number of initial rows in a table shard. Ignored if"+
 			"--initialize-with-random-data is false. The actual number is chosen"+
 			" randomly.")
 
-	cmd.Flags().IntVar(&seed.MaxSize, "max_table_shard_size", 10000,
+	utils.SetFlagIntVar(cmd.Flags(), &seed.MaxSize, "max-table-shard-size", 10000,
 		"The maximum number of initial rows in a table shard. Ignored if"+
 			"--initialize-with-random-data is false. The actual number is chosen"+
 			" randomly")
 
-	cmd.Flags().Float64Var(&seed.NullProbability, "null_probability", 0.1,
+	utils.SetFlagFloat64Var(cmd.Flags(), &seed.NullProbability, "null-probability", 0.1,
 		"The probability to initialize a field with 'NULL' "+
 			" if --initialize-with-random-data is true. Only applies to fields"+
 			" that can contain NULL values.")
 
-	cmd.Flags().StringVar(&config.MySQLBindHost, "mysql_bind_host", "localhost",
+	utils.SetFlagStringVar(cmd.Flags(), &config.MySQLBindHost, "mysql-bind-host", "localhost",
 		"which host to bind vtgate mysql listener to")
 
 	cmd.Flags().StringVar(&config.VtComboBindAddress, "vtcombo-bind-host", "localhost",
 		"which host to bind vtcombo servenv listener to")
 
-	cmd.Flags().StringVar(&mycnf, "extra_my_cnf", "",
+	utils.SetFlagStringVar(cmd.Flags(), &mycnf, "extra-my-cnf", "",
 		"extra files to add to the config, separated by ':'")
 
 	cmd.Flags().StringSliceVar(&topo.cells, "cells", []string{"test"}, "Comma separated list of cells")
 	cmd.Flags().StringSliceVar(&topo.keyspaces, "keyspaces", []string{"test_keyspace"},
 		"Comma separated list of keyspaces")
-	cmd.Flags().StringSliceVar(&topo.shards, "num_shards", []string{"2"},
+	utils.SetFlagStringSliceVar(cmd.Flags(), &topo.shards, "num-shards", []string{"2"},
 		"Comma separated shard count (one per keyspace)")
-	cmd.Flags().IntVar(&topo.replicas, "replica_count", 2,
+	utils.SetFlagIntVar(cmd.Flags(), &topo.replicas, "replica-count", 2,
 		"Replica tablets per shard (includes primary)")
-	cmd.Flags().IntVar(&topo.rdonly, "rdonly_count", 1,
+	utils.SetFlagIntVar(cmd.Flags(), &topo.rdonly, "rdonly-count", 1,
 		"Rdonly tablets per shard")
 
 	cmd.Flags().StringVar(&config.Charset, "charset", "utf8mb4", "MySQL charset")
 
 	cmd.Flags().StringVar(&config.PlannerVersion, "planner-version", "", "Sets the default planner to use when the session has not changed it. Valid values are: Gen4, Gen4Greedy, Gen4Left2Right")
 
-	cmd.Flags().StringVar(&config.SnapshotFile, "snapshot_file", "",
+	utils.SetFlagStringVar(cmd.Flags(), &config.SnapshotFile, "snapshot-file", "",
 		"A MySQL DB snapshot file")
 
-	cmd.Flags().BoolVar(&config.EnableSystemSettings, "enable_system_settings", true, "This will enable the system settings to be changed per session at the database connection level")
+	utils.SetFlagBoolVar(cmd.Flags(), &config.EnableSystemSettings, "enable-system-settings", true, "This will enable the system settings to be changed per session at the database connection level")
 
-	cmd.Flags().StringVar(&config.TransactionMode, "transaction_mode", "MULTI", "Transaction mode MULTI (default), SINGLE or TWOPC ")
+	utils.SetFlagStringVar(cmd.Flags(), &config.TransactionMode, "transaction-mode", "MULTI", "Transaction mode MULTI (default), SINGLE or TWOPC ")
 	cmd.Flags().DurationVar(&config.TransactionTimeout, "queryserver-config-transaction-timeout", 30*time.Second, "query server transaction timeout, a transaction will be killed if it takes longer than this value")
 
 	utils.SetFlagStringVar(cmd.Flags(), &config.TabletHostName, "tablet-hostname", "localhost", "The hostname to use for the tablet otherwise it will be derived from OS' hostname")

go/vt/binlog/grpcbinlogplayer/player.go

@@ -29,6 +29,7 @@ import (
 	binlogservicepb "vitess.io/vitess/go/vt/proto/binlogservice"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/servenv"
+	"vitess.io/vitess/go/vt/utils"
 )
 
 var cert, key, ca, crl, name string
@@ -39,11 +40,11 @@ func init() {
 }
 
 func registerFlags(fs *pflag.FlagSet) {
-	fs.StringVar(&cert, "binlog_player_grpc_cert", cert, "the cert to use to connect")
-	fs.StringVar(&key, "binlog_player_grpc_key", key, "the key to use to connect")
-	fs.StringVar(&ca, "binlog_player_grpc_ca", ca, "the server ca to use to validate servers when connecting")
-	fs.StringVar(&crl, "binlog_player_grpc_crl", crl, "the server crl to use to validate server certificates when connecting")
-	fs.StringVar(&name, "binlog_player_grpc_server_name", name, "the server name to use to validate server certificate")
+	utils.SetFlagStringVar(fs, &cert, "binlog-player-grpc-cert", cert, "the cert to use to connect")
+	utils.SetFlagStringVar(fs, &key, "binlog-player-grpc-key", key, "the key to use to connect")
+	utils.SetFlagStringVar(fs, &ca, "binlog-player-grpc-ca", ca, "the server ca to use to validate servers when connecting")
+	utils.SetFlagStringVar(fs, &crl, "binlog-player-grpc-crl", crl, "the server crl to use to validate server certificates when connecting")
+	utils.SetFlagStringVar(fs, &name, "binlog-player-grpc-server-name", name, "the server name to use to validate server certificate")
 }
 
 // client implements a Client over go rpc