Fix various tests

rohit-nayak-ps · rohit-nayak-ps · commit 25325bad3990 · 2025-09-06T06:26:06.000+02:00
Signed-off-by: Rohit Nayak &lt;rohit@planetscale.com&gt;
diff --git a/go/cmd/vtclient/cli/vtclient_test.go b/go/cmd/vtclient/cli/vtclient_test.go
@@ -91,7 +91,7 @@ func TestVtclient(t *testing.T) {
 			args: []string{"SELECT * FROM table1"},
 		},
 		{
-			args: []string{"--target", "@primary", "--bind_variables", `[ 1, 100 ]`,
+			args: []string{"--target", "@primary", "--bind-variables", `[ 1, 100 ]`,
 				"INSERT INTO table1 (id, i) VALUES (:v1, :v2)"},
 			rowsAffected: 1,
 		},
@@ -106,7 +106,7 @@ func TestVtclient(t *testing.T) {
 			rowsAffected: 1,
 		},
 		{
-			args: []string{"--target", "@primary", "--bind_variables", `[ 1 ]`,
+			args: []string{"--target", "@primary", "--bind-variables", `[ 1 ]`,
 				"DELETE FROM table1 WHERE id = :v1"},
 			rowsAffected: 1,
 		},
diff --git a/go/cmd/vttestserver/cli/main_test.go b/go/cmd/vttestserver/cli/main_test.go
@@ -137,7 +137,7 @@ func TestForeignKeysAndDDLModes(t *testing.T) {
 	conf := config
 	defer resetConfig(conf)
 
-	cluster, err := startCluster("--foreign-key-mode=allow", "--enable_online_ddl=true", "--enable_direct_ddl=true")
+	cluster, err := startCluster("--foreign-key-mode=allow", "--enable-online-ddl=true", "--enable-direct-ddl=true")
 	require.NoError(t, err)
 	defer cluster.TearDown()
 
@@ -163,7 +163,7 @@ func TestForeignKeysAndDDLModes(t *testing.T) {
 	assert.NoError(t, err)
 
 	cluster.TearDown()
-	cluster, err = startCluster("--foreign-key-mode=disallow", "--enable_online_ddl=false", "--enable_direct_ddl=false")
+	cluster, err = startCluster("--foreign-key-mode=disallow", "--enable-online-ddl=false", "--enable-direct-ddl=false")
 	require.NoError(t, err)
 	defer cluster.TearDown()
 
@@ -271,8 +271,8 @@ func TestExternalTopoServerConsul(t *testing.T) {
 		}
 	}()
 
-	cluster, err := startCluster("--external_topo_implementation=consul",
-		fmt.Sprintf("--external_topo_global_server_address=%s", serverAddr), "--external_topo_global_root=consul_test/global")
+	cluster, err := startCluster("--external-topo-implementation=consul",
+		fmt.Sprintf("--external-topo-global-server-address=%s", serverAddr), "--external-topo-global-root=consul_test/global")
 	require.NoError(t, err)
 	defer cluster.TearDown()
 
@@ -361,10 +361,10 @@ func TestMtlsAuthUnauthorizedFails(t *testing.T) {
 
 func startPersistentCluster(dir string, flags ...string) (vttest.LocalCluster, error) {
 	flags = append(flags, []string{
-		"--persistent_mode",
+		"--persistent-mode",
 		// FIXME: if port is not provided, data_dir is not respected
 		fmt.Sprintf("--port=%d", randomPort()),
-		fmt.Sprintf("--data_dir=%s", dir),
+		fmt.Sprintf("--data-dir=%s", dir),
 	}...)
 	return startCluster(flags...)
 }
@@ -379,8 +379,8 @@ func startCluster(flags ...string) (cluster vttest.LocalCluster, err error) {
 	schemaDirArg := utils.GetFlagVariantForTests("--schema-dir") + "=data/schema"
 	tabletHostname := fmt.Sprintf("%s=localhost", utils.GetFlagVariantForTests("--tablet-hostname"))
 	keyspaceArg := "--keyspaces=" + strings.Join(clusterKeyspaces, ",")
-	numShardsArg := "--num_shards=2,2"
-	vschemaDDLAuthorizedUsers := "--vschema_ddl_authorized_users=%"
+	numShardsArg := "--num-shards=2,2"
+	vschemaDDLAuthorizedUsers := "--vschema-ddl-authorized-users=%"
 	alsoLogToStderr := "--alsologtostderr" // better debugging
 	args = append(args, []string{schemaDirArg, keyspaceArg, numShardsArg, tabletHostname, vschemaDDLAuthorizedUsers, alsoLogToStderr}...)
 	args = append(args, flags...)
diff --git a/go/flags/endtoend/topo2topo.txt b/go/flags/endtoend/topo2topo.txt
@@ -18,9 +18,9 @@ Flags:
       --do-shard-replications                                       copies the shard replication information
       --do-shards                                                   copies the shard information
       --do-tablets                                                  copies the tablet information
-      --from_implementation string                                  topology implementation to copy data from
-      --from_root string                                            topology server root to copy data from
-      --from_server string                                          topology server address to copy data from
+      --from-implementation string                                  topology implementation to copy data from
+      --from-root string                                            topology server root to copy data from
+      --from-server string                                          topology server address to copy data from
       --grpc-enable-tracing                                         Enable gRPC tracing.
       --grpc-max-message-size int                                   Maximum allowed RPC message size. Larger messages will be rejected by gRPC with the error 'exceeding the max size'. (default 16777216)
       --grpc-prometheus                                             Enable gRPC monitoring with Prometheus.
@@ -37,9 +37,9 @@ Flags:
       --purge-logs-interval duration                                how often try to remove old logs (default 1h0m0s)
       --security-policy string                                      the name of a registered security policy to use for controlling access to URLs - empty means allow all for anyone (built-in policies: deny-all, read-only)
       --stderrthreshold severityFlag                                logs at or above this threshold go to stderr (default 1)
-      --to_implementation string                                    topology implementation to copy data to
-      --to_root string                                              topology server root to copy data to
-      --to_server string                                            topology server address to copy data to
+      --to-implementation string                                    topology implementation to copy data to
+      --to-root string                                              topology server root to copy data to
+      --to-server string                                            topology server address to copy data to
       --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
diff --git a/go/test/endtoend/mysqlserver/main_test.go b/go/test/endtoend/mysqlserver/main_test.go
@@ -109,10 +109,10 @@ func TestMain(m *testing.M) {
 		}
 
 		clusterInstance.VtGateExtraArgs = []string{
-			"--vschema_ddl_authorized_users=%",
+			"--vschema-ddl-authorized-users=%",
 			utils.GetFlagVariantForTests("--mysql-server-query-timeout"), "1s",
 			utils.GetFlagVariantForTests("--mysql-auth-server-impl"), "static",
-			"--mysql_auth_server_static_file", clusterInstance.TmpDirectory + mysqlAuthServerStatic,
+			"--mysql-auth-server-static-file", clusterInstance.TmpDirectory + mysqlAuthServerStatic,
 			utils.GetFlagVariantForTests("--mysql-server-version"), "8.0.16-7",
 			utils.GetFlagVariantForTests("--warn-sharded-only") + "=true",
 		}
diff --git a/go/test/endtoend/preparestmt/main_test.go b/go/test/endtoend/preparestmt/main_test.go
@@ -163,7 +163,7 @@ func TestMain(m *testing.M) {
 		// add extra arguments
 		vtgateInstance.ExtraArgs = []string{
 			utils.GetFlagVariantForTests("--mysql-server-query-timeout"), "1s",
-			"--mysql_auth_server_static_file", clusterInstance.TmpDirectory + "/" + mysqlAuthServerStatic,
+			"--mysql-auth-server-static-file", clusterInstance.TmpDirectory + "/" + mysqlAuthServerStatic,
 			"--pprof-http",
 			utils.GetFlagVariantForTests("--schema-change-signal") + "=false",
 		}
diff --git a/go/test/endtoend/tabletmanager/main_test.go b/go/test/endtoend/tabletmanager/main_test.go
@@ -94,9 +94,9 @@ func TestMain(m *testing.M) {
 
 		// List of users authorized to execute vschema ddl operations
 		clusterInstance.VtGateExtraArgs = []string{
-			"--vschema_ddl_authorized_users=%",
+			"--vschema-ddl-authorized-users=%",
 			"--enable-views",
-			"--discovery_low_replication_lag", tabletUnhealthyThreshold.String(),
+			"--discovery-low-replication-lag", tabletUnhealthyThreshold.String(),
 		}
 		// Set extra tablet args for lock timeout
 		clusterInstance.VtTabletExtraArgs = []string{
diff --git a/go/test/endtoend/tabletmanager/tablet_health_test.go b/go/test/endtoend/tabletmanager/tablet_health_test.go
@@ -148,7 +148,7 @@ func TestHealthCheck(t *testing.T) {
 
 	// stop the replica's source mysqld instance to break replication
 	// and test that the replica tablet becomes unhealthy and non-serving after crossing
-	// the tablet's --unhealthy-threshold and the gateway's --discovery_low_replication_lag
+	// the tablet's --unhealthy-threshold and the gateway's --discovery-low-replication-lag
 	err = primaryTablet.MysqlctlProcess.Stop()
 	require.NoError(t, err)
 
diff --git a/go/test/endtoend/transaction/single/main_test.go b/go/test/endtoend/transaction/single/main_test.go
@@ -71,7 +71,7 @@ func TestMain(m *testing.M) {
 
 		// Start vtgate
 		clusterInstance.VtGatePlannerVersion = planbuilder.Gen4
-		clusterInstance.VtGateExtraArgs = []string{"--transaction_mode", "SINGLE"}
+		clusterInstance.VtGateExtraArgs = []string{"--transaction-mode", "SINGLE"}
 		err = clusterInstance.StartVtgate()
 		if err != nil {
 			return 1
diff --git a/go/test/endtoend/transaction/twopc/fuzz/main_test.go b/go/test/endtoend/transaction/twopc/fuzz/main_test.go
@@ -66,7 +66,7 @@ func TestMain(m *testing.M) {
 
 		// Set extra args for twopc
 		clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs,
-			"--transaction_mode", "TWOPC",
+			"--transaction-mode", "TWOPC",
 			vtutils.GetFlagVariantForTests("--grpc-use-effective-callerid"),
 			vtutils.GetFlagVariantForTests("--tablet-refresh-interval"), "2s",
 		)
diff --git a/go/test/endtoend/transaction/twopc/metric/main_test.go b/go/test/endtoend/transaction/twopc/metric/main_test.go
@@ -66,7 +66,7 @@ func TestMain(m *testing.M) {
 
 		// Set extra args for twopc
 		clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs,
-			"--transaction_mode", "TWOPC",
+			"--transaction-mode", "TWOPC",
 			utils.GetFlagVariantForTests("--grpc-use-effective-callerid"),
 		)
 		clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs,
diff --git a/go/test/endtoend/transaction/twopc/stress/main_test.go b/go/test/endtoend/transaction/twopc/stress/main_test.go
@@ -66,7 +66,7 @@ func TestMain(m *testing.M) {
 
 		// Set extra args for twopc
 		clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs,
-			"--transaction_mode", "TWOPC",
+			"--transaction-mode", "TWOPC",
 			vtutils.GetFlagVariantForTests("--grpc-use-effective-callerid"),
 			vtutils.GetFlagVariantForTests("--tablet-refresh-interval"), "2s",
 		)
diff --git a/go/test/endtoend/vault/vault_test.go b/go/test/endtoend/vault/vault_test.go
@@ -81,18 +81,18 @@ var (
 		"--db-credentials-vault-ttl", "21s"}
 	vaultVTGateArg = []string{
 		vtutils.GetFlagVariantForTests("--mysql-auth-server-impl"), "vault",
-		"--mysql_auth_vault_timeout", "3s",
-		"--mysql_auth_vault_path", "kv/prod/vtgatecreds",
+		"--mysql-auth-vault-timeout", "3s",
+		"--mysql-auth-vault-path", "kv/prod/vtgatecreds",
 		// This is overriden by our env VAULT_ADDR
-		"--mysql_auth_vault_addr", "https://127.0.0.1:8200",
+		"--mysql-auth-vault-addr", "https://127.0.0.1:8200",
 		// This is overriden by our env VAULT_CACERT
-		"--mysql_auth_vault_tls_ca", "/path/to/ca.pem",
+		"--mysql-auth-vault-tls-ca", "/path/to/ca.pem",
 		// This is provided by our env VAULT_ROLEID
-		//"--mysql_auth_vault_roleid", "34644576-9ffc-8bb5-d046-4a0e41194e15",
+		//"--mysql-auth-vault-roleid", "34644576-9ffc-8bb5-d046-4a0e41194e15",
 		// Contents of this file provided by our env VAULT_SECRETID
-		//"--mysql_auth_vault_role_secretidfile", "/path/to/file/containing/secret_id",
+		//"--mysql-auth-vault-role-secretidfile", "/path/to/file/containing/secret_id",
 		// Make this small, so we can get a renewal
-		"--mysql_auth_vault_ttl", "21s"}
+		"--mysql-auth-vault-ttl", "21s"}
 	mysqlctlArg = []string{
 		vtutils.GetFlagVariantForTests("--db-dba-password"), mysqlPassword}
 	vttabletLogFileName = "vttablet.INFO"
diff --git a/go/test/endtoend/vtgate/keyspace_watches/keyspace_watch_test.go b/go/test/endtoend/vtgate/keyspace_watches/keyspace_watch_test.go
@@ -96,7 +96,7 @@ func createCluster(extraVTGateArgs []string) (*cluster.LocalProcessCluster, int)
 	}
 
 	vtGateArgs := []string{
-		"--mysql_auth_server_static_file", clusterInstance.TmpDirectory + "/" + mysqlAuthServerStatic,
+		"--mysql-auth-server-static-file", clusterInstance.TmpDirectory + "/" + mysqlAuthServerStatic,
 		utils.GetFlagVariantForTests("--keyspaces-to-watch"), keyspaceUnshardedName,
 	}
 
@@ -142,7 +142,7 @@ func TestRoutingWithKeyspacesToWatch(t *testing.T) {
 func TestVSchemaDDLWithKeyspacesToWatch(t *testing.T) {
 
 	extraVTGateArgs := []string{
-		"--vschema_ddl_authorized_users", "%",
+		"--vschema-ddl-authorized-users", "%",
 	}
 	clusterInstance, exitCode := createCluster(extraVTGateArgs)
 	defer clusterInstance.Teardown()
diff --git a/go/test/endtoend/vtgate/main_test.go b/go/test/endtoend/vtgate/main_test.go
@@ -90,7 +90,7 @@ func TestMain(m *testing.M) {
 		}
 
 		clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs,
-			"--vschema_ddl_authorized_users", "%")
+			"--vschema-ddl-authorized-users", "%")
 		// Start vtgate
 		err = clusterInstance.StartVtgate()
 		if err != nil {
diff --git a/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go b/go/test/endtoend/vtgate/schematracker/sharded/st_sharded_test.go
@@ -85,7 +85,7 @@ func TestMain(m *testing.M) {
 		}
 		clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs,
 			vtutils.GetFlagVariantForTestsByVersion("--schema-change-signal", vtgateVer),
-			"--vschema_ddl_authorized_users", "%")
+			"--vschema-ddl-authorized-users", "%")
 		clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, "--queryserver-config-schema-change-signal")
 
 		if vtgateVer >= 16 && vttabletVer >= 16 {
diff --git a/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go b/go/test/endtoend/vtgate/schematracker/unsharded/st_unsharded_test.go
@@ -91,7 +91,7 @@ func TestMain(m *testing.M) {
 
 		// Start vtgate
 		clusterInstance.VtGateExtraArgs = []string{vtutils.GetFlagVariantForTestsByVersion("--schema-change-signal", vtgateVer),
-			"--vschema_ddl_authorized_users", "%"}
+			"--vschema-ddl-authorized-users", "%"}
 		err = clusterInstance.StartVtgate()
 		if err != nil {
 			return 1
diff --git a/go/test/endtoend/vtgate/vschema/vschema_test.go b/go/test/endtoend/vtgate/vschema/vschema_test.go
@@ -93,7 +93,7 @@ func TestMain(m *testing.M) {
 
 			clusterInstance.VtGateExtraArgs = []string{fmt.Sprintf("--config-file=%s", configFile), vtutils.GetFlagVariantForTestsByVersion("--schema-change-signal", vtgateVer) + "=false"}
 		} else {
-			clusterInstance.VtGateExtraArgs = []string{"--vschema_ddl_authorized_users=%", "--schema_change_signal=false"}
+			clusterInstance.VtGateExtraArgs = []string{"--vschema-ddl-authorized-users=%", "--schema-change-signal=false"}
 		}
 
 		// Start keyspace
diff --git a/go/vt/vttest/vtprocess.go b/go/vt/vttest/vtprocess.go
@@ -232,22 +232,22 @@ func VtcomboProcess(environment Environment, args *Config, mysql MySQLManager) (
 	protoTopo, _ := prototext.Marshal(args.Topology)
 	vt.ExtraArgs = append(vt.ExtraArgs, []string{
 		//TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
-		"--db_charset", charset,
-		"--db_app_user", user,
-		"--db_app_password", pass,
-		"--db_dba_user", user,
-		"--db_dba_password", pass,
-		"--proto_topo", string(protoTopo),
+		"--db-charset", charset,
+		"--db-app-user", user,
+		"--db-app-password", pass,
+		"--db-dba-user", user,
+		"--db-dba-password", pass,
+		"--proto-topo", string(protoTopo),
 		"--mycnf-server-id", "1",
 		"--mycnf-socket-file", socket,
-		"--normalize_queries",
-		"--dbddl_plugin", "vttest",
-		"--foreign_key_mode", args.ForeignKeyMode,
+		"--normalize-queries",
+		"--dbddl-plugin", "vttest",
+		"--foreign-key-mode", args.ForeignKeyMode,
 		"--planner-version", args.PlannerVersion,
-		fmt.Sprintf("--enable_online_ddl=%t", args.EnableOnlineDDL),
-		fmt.Sprintf("--enable_direct_ddl=%t", args.EnableDirectDDL),
-		fmt.Sprintf("--enable_system_settings=%t", args.EnableSystemSettings),
-		fmt.Sprintf("--no_scatter=%t", args.NoScatter),
+		fmt.Sprintf("--enable-online-ddl=%t", args.EnableOnlineDDL),
+		fmt.Sprintf("--enable-direct-ddl=%t", args.EnableDirectDDL),
+		fmt.Sprintf("--enable-system-settings=%t", args.EnableSystemSettings),
+		fmt.Sprintf("--no-scatter=%t", args.NoScatter),
 	}...)
 
 	// If topo tablet refresh interval is not defined then we will give it value of 10s. Please note
@@ -264,13 +264,13 @@ func VtcomboProcess(environment Environment, args *Config, mysql MySQLManager) (
 
 	//TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
 	if args.SchemaDir != "" {
-		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--schema_dir", args.SchemaDir}...)
+		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--schema-dir", args.SchemaDir}...)
 	}
 	if args.PersistentMode && args.DataDir != "" {
 		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--vschema-persistence-dir", path.Join(args.DataDir, "vschema_data")}...)
 	}
 	if args.TransactionMode != "" {
-		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--transaction_mode", args.TransactionMode}...)
+		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--transaction-mode", args.TransactionMode}...)
 	}
 	if args.TransactionTimeout != 0 {
 		vt.ExtraArgs = append(vt.ExtraArgs, "--queryserver-config-transaction-timeout", fmt.Sprintf("%v", args.TransactionTimeout))
@@ -282,7 +282,7 @@ func VtcomboProcess(environment Environment, args *Config, mysql MySQLManager) (
 		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--grpc-auth-mode", servenv.GRPCAuth(), "--grpc-key", servenv.GRPCKey(), "--grpc-cert", servenv.GRPCCert(), "--grpc-ca", servenv.GRPCCertificateAuthority(), "--grpc-auth-mtls-allowed-substrings", servenv.ClientCertSubstrings()}...)
 	}
 	if args.VSchemaDDLAuthorizedUsers != "" {
-		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--vschema_ddl_authorized_users", args.VSchemaDDLAuthorizedUsers}...)
+		vt.ExtraArgs = append(vt.ExtraArgs, []string{"--vschema-ddl-authorized-users", args.VSchemaDDLAuthorizedUsers}...)
 	}
 	vt.ExtraArgs = append(vt.ExtraArgs, "--mysql-server-version", servenv.MySQLServerVersion())
 	if socket != "" {

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,10 @@ func TestMain(m *testing.M) {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`clusterInstance.VtGateExtraArgs = []string{`
`112`		`- "--vschema_ddl_authorized_users=%",`
	`112`	`+ "--vschema-ddl-authorized-users=%",`
`113`	`113`	`utils.GetFlagVariantForTests("--mysql-server-query-timeout"), "1s",`
`114`	`114`	`utils.GetFlagVariantForTests("--mysql-auth-server-impl"), "static",`
`115`		`- "--mysql_auth_server_static_file", clusterInstance.TmpDirectory + mysqlAuthServerStatic,`
	`115`	`+ "--mysql-auth-server-static-file", clusterInstance.TmpDirectory + mysqlAuthServerStatic,`
`116`	`116`	`utils.GetFlagVariantForTests("--mysql-server-version"), "8.0.16-7",`
`117`	`117`	`utils.GetFlagVariantForTests("--warn-sharded-only") + "=true",`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func TestMain(m *testing.M) {`
`163`	`163`	`// add extra arguments`
`164`	`164`	`vtgateInstance.ExtraArgs = []string{`
`165`	`165`	`utils.GetFlagVariantForTests("--mysql-server-query-timeout"), "1s",`
`166`		`- "--mysql_auth_server_static_file", clusterInstance.TmpDirectory + "/" + mysqlAuthServerStatic,`
	`166`	`+ "--mysql-auth-server-static-file", clusterInstance.TmpDirectory + "/" + mysqlAuthServerStatic,`
`167`	`167`	`"--pprof-http",`
`168`	`168`	`utils.GetFlagVariantForTests("--schema-change-signal") + "=false",`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func TestMain(m *testing.M) {`
`66`	`66`
`67`	`67`	`// Set extra args for twopc`
`68`	`68`	`clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs,`
`69`		`- "--transaction_mode", "TWOPC",`
	`69`	`+ "--transaction-mode", "TWOPC",`
`70`	`70`	`vtutils.GetFlagVariantForTests("--grpc-use-effective-callerid"),`
`71`	`71`	`vtutils.GetFlagVariantForTests("--tablet-refresh-interval"), "2s",`
`72`	`72`	`)`