Flags Refactor - Part 5

go/cmd/vtcombo/cli/main.go

@@ -108,15 +108,15 @@ func init() {
 	Main.Flags().StringVar(&schemaDir, "schema_dir", schemaDir, "Schema base directory. Should contain one directory per keyspace, with a vschema.json file if necessary.")
 	Main.Flags().BoolVar(&startMysql, "start_mysql", startMysql, "Should vtcombo also start mysql")
 	utils.SetFlagIntVar(Main.Flags(), &mysqlPort, "mysql-port", mysqlPort, "mysql port")
-	Main.Flags().BoolVar(&externalTopoServer, "external_topo_server", externalTopoServer, "Should vtcombo use an external topology server instead of starting its own in-memory topology server. "+
+	utils.SetFlagBoolVar(Main.Flags(), &externalTopoServer, "external-topo-server", externalTopoServer, "Should vtcombo use an external topology server instead of starting its own in-memory topology server. "+
 		"If true, vtcombo will use the flags defined in topo/server.go to open topo server")
 	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")
 	Main.Flags().StringVar(&vschemaPersistenceDir, "vschema-persistence-dir", vschemaPersistenceDir, "If set, per-keyspace vschema will be persisted in this directory "+
 		"and reloaded into the in-memory topology server across restarts. Bookkeeping is performed using a simple watcher goroutine. "+
 		"This is useful when running vtcombo as an application development container (e.g. vttestserver) where you want to keep the same "+
 		"vschema even if developer's machine reboots. This works in tandem with vttestserver's --persistent_mode flag. Needless to say, "+
-		"this is neither a perfect nor a production solution for vschema persistence. Consider using the --external_topo_server flag if "+
-		"you require a more complete solution. This flag is ignored if --external_topo_server is set.")
+		"this is neither a perfect nor a production solution for vschema persistence. Consider using the --external-topo-server flag if "+
+		"you require a more complete solution. This flag is ignored if --external-topo-server is set.")
 
 	Main.Flags().Var(vttest.TextTopoData(&tpb), "proto_topo", "vttest proto definition of the topology, encoded in compact text format. See vttest.proto for more information.")
 	Main.Flags().Var(vttest.JSONTopoData(&tpb), "json_topo", "vttest proto definition of the topology, encoded in json format. See vttest.proto for more information.")

go/cmd/vttestserver/cli/main_test.go

@@ -307,9 +307,9 @@ func TestMtlsAuth(t *testing.T) {
 		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("--vtctld_grpc_key=%s", clientKey),
-		fmt.Sprintf("--vtctld_grpc_cert=%s", clientCert),
-		fmt.Sprintf("--vtctld_grpc_ca=%s", 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"))
 	require.NoError(t, err)
 	defer func() {
@@ -349,9 +349,9 @@ func TestMtlsAuthUnauthorizedFails(t *testing.T) {
 		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("--vtctld_grpc_key=%s", clientKey),
-		fmt.Sprintf("--vtctld_grpc_cert=%s", clientCert),
-		fmt.Sprintf("--vtctld_grpc_ca=%s", 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("--grpc-auth-mtls-allowed-substrings=%s", "CN=ClientApp"))
 	defer cluster.TearDown()
 

go/flags/endtoend/mysqlctl.txt

@@ -58,8 +58,8 @@ Flags:
       --db-ssl-key string                                           connection ssl key
       --db-ssl-mode SslMode                                         SSL mode to connect with. One of disabled, preferred, required, verify_ca & verify_identity.
       --db-tls-min-version string                                   Configures the minimal TLS version negotiated when SSL is enabled. Defaults to TLSv1.2. Options: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3.
-      --dba_idle_timeout duration                                   Idle timeout for dba connections (default 1m0s)
-      --dba_pool_size int                                           Size of the connection pool for dba connections (default 20)
+      --dba-idle-timeout duration                                   Idle timeout for dba connections (default 1m0s)
+      --dba-pool-size int                                           Size of the connection pool for dba connections (default 20)
   -h, --help                                                        help for mysqlctl
       --keep-logs duration                                          keep logs for this long (using ctime) (zero to keep forever)
       --keep-logs-by-mtime duration                                 keep logs for this long (using mtime) (zero to keep forever)

go/flags/endtoend/mysqlctld.txt

@@ -59,8 +59,8 @@ Flags:
       --db-ssl-key string                                                connection ssl key
       --db-ssl-mode SslMode                                              SSL mode to connect with. One of disabled, preferred, required, verify_ca & verify_identity.
       --db-tls-min-version string                                        Configures the minimal TLS version negotiated when SSL is enabled. Defaults to TLSv1.2. Options: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3.
-      --dba_idle_timeout duration                                        Idle timeout for dba connections (default 1m0s)
-      --dba_pool_size int                                                Size of the connection pool for dba connections (default 20)
+      --dba-idle-timeout duration                                        Idle timeout for dba connections (default 1m0s)
+      --dba-pool-size int                                                Size of the connection pool for dba connections (default 20)
       --grpc-auth-mode string                                            Which auth plugin implementation to use (eg: static)
       --grpc-auth-mtls-allowed-substrings string                         List of substrings of at least one of the client certificate names (separated by colon).
       --grpc-auth-static-client-creds string                             When using grpc_static_auth in the server, this file provides the credentials to use to authenticate with server.

go/flags/endtoend/vtbackup.txt

@@ -67,7 +67,7 @@ Flags:
       --builtinbackup-incremental-restore-path string               the directory where incremental restore files, namely binlog files, are extracted to. In k8s environments, this should be set to a directory that is shared between the vttablet and mysqld pods. The path should exist. When empty, the default OS temp dir is assumed.
       --builtinbackup-mysqld-timeout duration                       how long to wait for mysqld to shutdown at the start of the backup. (default 10m0s)
       --builtinbackup-progress duration                             how often to send progress updates when backing up large files. (default 5s)
-      --ceph_backup_storage_config string                           Path to JSON config file for ceph backup storage. (default "ceph_backup_config.json")
+      --ceph-backup-storage-config string                           Path to JSON config file for ceph backup storage. (default "ceph_backup_config.json")
       --compression-engine-name string                              compressor engine used for compression. (default "pargzip")
       --compression-level int                                       what level to pass to the compressor. (default 1)
       --concurrency int                                             (init restore parameter) how many concurrent files to restore at once (default 4)

go/flags/endtoend/vtbench.txt

@@ -92,8 +92,8 @@ Flags:
       --v Level                                                     log level for V logs
   -v, --version                                                     print binary version
       --vmodule vModuleFlag                                         comma-separated list of pattern=N settings for file-filtered logging
-      --vtgate_grpc_ca string                                       the server ca to use to validate servers when connecting
-      --vtgate_grpc_cert string                                     the cert to use to connect
-      --vtgate_grpc_crl string                                      the server crl to use to validate server certificates when connecting
-      --vtgate_grpc_key string                                      the key to use to connect
-      --vtgate_grpc_server_name string                              the server name to use to validate server certificate
+      --vtgate-grpc-ca string                                       the server ca to use to validate servers when connecting
+      --vtgate-grpc-cert string                                     the cert to use to connect
+      --vtgate-grpc-crl string                                      the server crl to use to validate server certificates when connecting
+      --vtgate-grpc-key string                                      the key to use to connect
+      --vtgate-grpc-server-name string                              the server name to use to validate server certificate

go/flags/endtoend/vtclient.txt

@@ -65,9 +65,9 @@ Flags:
       --v Level                                                     log level for V logs
   -v, --version                                                     print binary version
       --vmodule vModuleFlag                                         comma-separated list of pattern=N settings for file-filtered logging
-      --vtgate_grpc_ca string                                       the server ca to use to validate servers when connecting
-      --vtgate_grpc_cert string                                     the cert to use to connect
-      --vtgate_grpc_crl string                                      the server crl to use to validate server certificates when connecting
-      --vtgate_grpc_key string                                      the key to use to connect
-      --vtgate_grpc_server_name string                              the server name to use to validate server certificate
+      --vtgate-grpc-ca string                                       the server ca to use to validate servers when connecting
+      --vtgate-grpc-cert string                                     the cert to use to connect
+      --vtgate-grpc-crl string                                      the server crl to use to validate server certificates when connecting
+      --vtgate-grpc-key string                                      the key to use to connect
+      --vtgate-grpc-server-name string                              the server name to use to validate server certificate
       --vtgate_protocol string                                      how to talk to vtgate (default "grpc")