Migrate vtclient and vtgate protocol flags

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

Author: rohit-nayak-ps

go/cmd/vtclient/cli/vtclient.go

@@ -39,6 +39,7 @@ import (
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/sqlparser"
+	"vitess.io/vitess/go/vt/utils"
 	"vitess.io/vitess/go/vt/vitessdriver"
 	"vitess.io/vitess/go/vt/vterrors"
 	"vitess.io/vitess/go/vt/vtgate/vtgateconn"
@@ -92,16 +93,16 @@ func InitializeFlags() {
 	Main.Flags().BoolVar(&jsonOutput, "json", jsonOutput, "Output JSON instead of human-readable table")
 	Main.Flags().IntVar(&parallel, "parallel", parallel, "DMLs only: Number of threads executing the same query in parallel. Useful for simple load testing.")
 	Main.Flags().IntVar(&count, "count", count, "DMLs only: Number of times each thread executes the query. Useful for simple, sustained load testing.")
-	Main.Flags().IntVar(&minSeqID, "min_sequence_id", minSeqID, "min sequence ID to generate. When max_sequence_id > min_sequence_id, for each query, a number is generated in [min_sequence_id, max_sequence_id) and attached to the end of the bind variables.")
-	Main.Flags().IntVar(&maxSeqID, "max_sequence_id", maxSeqID, "max sequence ID.")
-	Main.Flags().BoolVar(&useRandom, "use_random_sequence", useRandom, "use random sequence for generating [min_sequence_id, max_sequence_id)")
+	utils.SetFlagIntVar(Main.Flags(), &minSeqID, "min-sequence-id", minSeqID, "min sequence ID to generate. When max-sequence-id > min-sequence-id, for each query, a number is generated in [min-sequence-id, max-sequence-id) and attached to the end of the bind variables.")
+	utils.SetFlagIntVar(Main.Flags(), &maxSeqID, "max-sequence-id", maxSeqID, "max sequence ID.")
+	utils.SetFlagBoolVar(Main.Flags(), &useRandom, "use-random-sequence", useRandom, "use random sequence for generating [min-sequence-id, max-sequence-id)")
 	Main.Flags().IntVar(&qps, "qps", qps, "queries per second to throttle each thread at.")
 
 	acl.RegisterFlags(Main.Flags())
 	grpccommon.RegisterFlags(Main.Flags())
 	servenv.RegisterMySQLServerFlags(Main.Flags())
 
-	bindVariables = newBindvars(Main.Flags(), "bind_variables", "bind variables as a json list")
+	bindVariables = newBindvars(Main.Flags(), "bind-variables", "bind variables as a json list")
 }
 
 type bindvars []any
@@ -146,7 +147,7 @@ func (bv *bindvars) Type() string {
 
 func newBindvars(fs *pflag.FlagSet, name, usage string) *bindvars {
 	var bv bindvars
-	fs.Var(&bv, name, usage)
+	utils.SetFlagVar(fs, &bv, name, usage)
 	return &bv
 }
 

go/flags/endtoend/flags_analysis.json

@@ -74,95 +74,95 @@
     }
   },
   "unique_underscore_flags": [
-    "bind_variables",
-    "default_tablet_type",
     "statsd_sample_rate",
+    "shutdown_wait_time",
+    "action_timeout",
+    "mysql_ldap_auth_method",
+    "restart_before_backup",
     "topocustomrule_cell",
-    "min_number_serving_vttablets",
-    "cells_to_watch",
-    "binlog_player_grpc_crl",
-    "binlog_player_grpc_cert",
-    "statsd_address",
-    "mysql_auth_vault_role_secretidfile",
-    "mysql_auth_server_static_file",
+    "external_topo_global_server_address",
+    "mysql_timeout",
+    "binlog_player_grpc_server_name",
+    "max_sequence_id",
+    "external_topo_global_root",
+    "enable_online_ddl",
+    "transaction_mode",
+    "min_retention_time",
+    "bind_variables",
     "file_backup_storage_root",
+    "tablet_config",
+    "mysql_auth_vault_addr",
+    "unix_socket",
+    "use_random_sequence",
+    "binlog_player_grpc_crl",
+    "rng_seed",
+    "mysql_auth_vault_role_mountpoint",
+    "cells_to_watch",
+    "mysql_auth_vault_path",
+    "num_shards",
+    "binlog_player_grpc_key",
+    "vtgate_protocol",
+    "min_retention_count",
+    "rdonly_count",
     "mysql_ldap_auth_config_string",
-    "legacy_replication_lag_algorithm",
-    "max_sequence_id",
-    "snapshot_file",
-    "min_table_shard_size",
+    "discovery_high_replication_lag_minimum_serving",
+    "mysql_ldap_auth_config_file",
+    "extra_my_cnf",
+    "vschema_ddl_authorized_users",
+    "mysql_auth_vault_role_secretidfile",
+    "min_number_serving_vttablets",
     "enable_buffer",
-    "mysql_only",
-    "min_retention_count",
-    "mysql_auth_vault_role_mountpoint",
-    "persistent_mode",
+    "mysql_auth_server_static_file",
+    "mysql_auth_vault_tls_ca",
+    "filecustomrules_watch",
+    "external_topo_implementation",
+    "binlog_player_grpc_ca",
+    "mysql_clientcert_auth_method",
+    "mysql_bind_host",
+    "data_dir",
+    "null_probability",
     "gateway_initial_tablet_timeout",
-    "default_schema_dir",
-    "shutdown_wait_time",
-    "mysql_ldap_auth_method",
     "enable_direct_ddl",
-    "discovery_high_replication_lag_minimum_serving",
-    "data_dir",
-    "allow_first_backup",
-    "binlog_player_grpc_key",
     "min_sequence_id",
-    "incremental_from_pos",
-    "min_retention_time",
-    "min_backup_interval",
-    "clusters_to_watch",
-    "mysql_clientcert_auth_method",
-    "external_topo_implementation",
-    "mysql_timeout",
-    "mysql_auth_vault_tls_ca",
-    "num_shards",
-    "log_backtrace_at",
-    "external_topo_global_root",
-    "mysql_auth_vault_path",
-    "tablet_config",
-    "topocustomrule_path",
-    "restart_before_backup",
-    "log_dir",
-    "discovery_low_replication_lag",
-    "initial_backup",
-    "binlog_player_grpc_ca",
-    "mysql_auth_vault_roleid",
-    "mysql_auth_vault_timeout",
+    "max_table_shard_size",
+    "replica_count",
     "mysqlctl_client_protocol",
+    "log_link",
     "log_queries",
+    "log_backtrace_at",
+    "enable_system_settings",
     "mysql_auth_server_static_string",
-    "unix_socket",
-    "external_topo_global_server_address",
+    "default_schema_dir",
+    "initial_backup",
+    "persistent_mode",
+    "binlog_player_grpc_cert",
+    "mysql_auth_vault_timeout",
+    "discovery_low_replication_lag",
+    "min_table_shard_size",
     "mysql_auth_vault_tokenfile",
-    "rdonly_count",
-    "enable_system_settings",
-    "extra_my_cnf",
-    "mysql_bind_host",
-    "vschema_ddl_authorized_users",
-    "binlog_player_grpc_server_name",
-    "action_timeout",
-    "null_probability",
-    "filecustomrules_watch",
     "mysql_auth_static_reload_interval",
+    "min_backup_interval",
+    "default_tablet_type",
+    "topocustomrule_path",
+    "legacy_replication_lag_algorithm",
+    "mysql_auth_vault_roleid",
+    "log_dir",
+    "allow_first_backup",
     "mysql_auth_vault_ttl",
-    "use_random_sequence",
-    "mysql_ldap_auth_config_file",
-    "max_table_shard_size",
-    "replica_count",
-    "rng_seed",
-    "transaction_mode",
-    "mysql_auth_vault_addr",
-    "enable_online_ddl",
-    "vtgate_protocol",
-    "log_link"
+    "mysql_only",
+    "incremental_from_pos",
+    "clusters_to_watch",
+    "snapshot_file",
+    "statsd_address"
   ],
   "flag_to_binaries": {
     "allow_first_backup": [
       "vtbackup"
     ],
     "file_backup_storage_root": [
+      "vttablet",
       "vtctld",
-      "vtbackup",
-      "vttablet"
+      "vtbackup"
     ],
     "incremental_from_pos": [
       "vtbackup"
@@ -171,32 +171,32 @@
       "vtbackup"
     ],
     "log_backtrace_at": [
-      "vttestserver",
+      "vtcombo",
       "vtorc",
-      "vtbackup",
-      "mysqlctl",
-      "vtctldclient",
       "vtbench",
-      "mysqlctld",
+      "vtclient",
+      "vttablet",
+      "mysqlctl",
+      "vttestserver",
       "vtgate",
-      "vtcombo",
       "vtctld",
-      "vttablet",
-      "vtclient"
+      "mysqlctld",
+      "vtctldclient",
+      "vtbackup"
     ],
     "log_dir": [
-      "vttestserver",
+      "vtcombo",
       "vtorc",
-      "vtbackup",
-      "mysqlctl",
-      "vtctldclient",
       "vtbench",
-      "mysqlctld",
+      "vtclient",
+      "vttablet",
+      "mysqlctl",
+      "vttestserver",
       "vtgate",
-      "vtcombo",
       "vtctld",
-      "vttablet",
-      "vtclient"
+      "mysqlctld",
+      "vtctldclient",
+      "vtbackup"
     ],
     "min_backup_interval": [
       "vtbackup"
@@ -214,9 +214,9 @@
       "vtbackup"
     ],
     "action_timeout": [
-      "vtcombo",
+      "vtctldclient",
       "vtctld",
-      "vtctldclient"
+      "vtcombo"
     ],
     "log_link": [
       "vtctldclient"
@@ -242,18 +242,18 @@
       "vtgate"
     ],
     "enable_direct_ddl": [
-      "vtcombo",
       "vttestserver",
+      "vtcombo",
       "vtgate"
     ],
     "enable_online_ddl": [
-      "vtcombo",
       "vttestserver",
+      "vtcombo",
       "vtgate"
     ],
     "enable_system_settings": [
-      "vtcombo",
       "vttestserver",
+      "vtcombo",
       "vtgate"
     ],
     "gateway_initial_tablet_timeout": [
@@ -314,21 +314,21 @@
       "vtgate"
     ],
     "statsd_address": [
-      "vttablet",
-      "vtgate"
+      "vtgate",
+      "vttablet"
     ],
     "statsd_sample_rate": [
-      "vttablet",
-      "vtgate"
+      "vtgate",
+      "vttablet"
     ],
     "transaction_mode": [
-      "vtcombo",
       "vttestserver",
+      "vtcombo",
       "vtgate"
     ],
     "vschema_ddl_authorized_users": [
-      "vtcombo",
       "vttestserver",
+      "vtcombo",
       "vtgate"
     ],
     "clusters_to_watch": [

go/vt/vtgate/vtgateconn/vtgateconn.go

@@ -26,6 +26,7 @@ import (
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/servenv"
+	"vitess.io/vitess/go/vt/utils"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 	querypb "vitess.io/vitess/go/vt/proto/query"
@@ -37,7 +38,7 @@ import (
 var vtgateProtocol = "grpc"
 
 func registerFlags(fs *pflag.FlagSet) {
-	fs.StringVar(&vtgateProtocol, "vtgate_protocol", vtgateProtocol, "how to talk to vtgate")
+	utils.SetFlagStringVar(fs, &vtgateProtocol, "vtgate-protocol", vtgateProtocol, "how to talk to vtgate")
 }
 
 func init() {