[cli] [vtctl] Migrate all vtctl commands to pflag (#11320)

* [cli] [vtctl] Migrate all vtctl commands to `pflag` Closes #11304. Signed-off-by: Andrew Mason <[email protected]> * fix test flags Signed-off-by: Andrew Mason <[email protected]> * Handle subflag argument parsing without fully moving to cobra (yet!) Signed-off-by: Andrew Mason <[email protected]> * update examples Signed-off-by: Andrew Mason <[email protected]> * strip off double-dash Signed-off-by: Andrew Mason <[email protected]> * Fix pflag getting tripped on shard 0 bounded shard names Signed-off-by: Andrew Mason <[email protected]> * remove commented-out code Signed-off-by: Andrew Mason <[email protected]> * update release notes Signed-off-by: Andrew Mason <[email protected]> * fix ExecuteHook, which takes no flags Signed-off-by: Andrew Mason <[email protected]> * add deprecation notice around interspersal Signed-off-by: Andrew Mason <[email protected]> * fix flags for vtctld2 web calls Signed-off-by: Andrew Mason <[email protected]> * Run make web_build Signed-off-by: notfelineit <[email protected]> * test: fix vtctld_web_test Signed-off-by: deepthi <[email protected]> * update test assertions Signed-off-by: Andrew Mason <[email protected]> * just double-dash everything Signed-off-by: Andrew Mason <[email protected]> * Run make web_build Signed-off-by: notfelineit <[email protected]> Signed-off-by: Andrew Mason <[email protected]> Signed-off-by: notfelineit <[email protected]> Signed-off-by: deepthi <[email protected]> Co-authored-by: notfelineit <[email protected]> Co-authored-by: deepthi <[email protected]>
vitessio · Oct 3, 2022 · 68e5398 · 68e5398
1 parent 31fb403
commit 68e5398
Show file tree

Hide file tree

Showing 31 changed files with 265 additions and 208 deletions.
diff --git a/doc/releasenotes/15_0_0_summary.md b/doc/releasenotes/15_0_0_summary.md
@@ -24,6 +24,7 @@
 - The deprecated `--mutex-profile-fraction` flag has been removed. Please use `--pprof=mutex` instead.
 - The deprecated vtgate/vtexplain/vtcombo flag `--planner_version` has been removed. Please use `--planner-version` instead.
 - The deprecated flag `--master_connect_retry` has been removed. Please use `--replication_connect_retry` instead.
+- `vtctl` commands that take shard names and ranges as positional arguments (e.g. `vtctl Reshard ks.workflow -80 -40,40-80`) need to have their positional arguments separated from their flag arguments by a double-dash separator to avoid the new parsing library from mistaking them as flags (e.g. `vtctl Reshard ks.workflow -- -80 -40,40-80`).
 
 #### Vindex Interface
 
@@ -85,10 +86,10 @@ connections, similar to the way pooling happens for write buffers. Defaults to o
 
 We introduced the ability to resume a VDiff2 workflow:
 ```
-$ vtctlclient --server=localhost:15999 VDiff -- --v2 customer.commerce2customer resume 4c664dc2-eba9-11ec-9ef7-920702940ee0
+$ vtctlclient --server=localhost:15999 VDiff --v2 customer.commerce2customer resume 4c664dc2-eba9-11ec-9ef7-920702940ee0
 VDiff 4c664dc2-eba9-11ec-9ef7-920702940ee0 resumed on target shards, use show to view progress
 
-$ vtctlclient --server=localhost:15999 VDiff -- --v2 customer.commerce2customer show last
+$ vtctlclient --server=localhost:15999 VDiff --v2 customer.commerce2customer show last
 
 VDiff Summary for customer.commerce2customer (4c664dc2-eba9-11ec-9ef7-920702940ee0)
 State:        completed
@@ -99,7 +100,7 @@ CompletedAt:  2022-06-26 22:44:31
 
 Use "--format=json" for more detailed output.
 
-$ vtctlclient --server=localhost:15999 VDiff -- --v2 --format=json customer.commerce2customer show last
+$ vtctlclient --server=localhost:15999 VDiff --v2 --format=json customer.commerce2customer show last
 {
 	"Workflow": "commerce2customer",
 	"Keyspace": "customer",

diff --git a/examples/local/scripts/consul-up.sh b/examples/local/scripts/consul-up.sh
@@ -43,7 +43,7 @@ sleep 5
 echo "add $cell CellInfo"
 set +e
 # shellcheck disable=SC2086
-vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo -- \
+vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo \
   --root "vitess/$cell" \
   --server-address "${CONSUL_SERVER}:${consul_http_port}" \
   "$cell"

diff --git a/examples/local/scripts/etcd-up.sh b/examples/local/scripts/etcd-up.sh
@@ -40,7 +40,7 @@ etcdctl --endpoints "http://${ETCD_SERVER}" mkdir /vitess/$cell &
 echo "add $cell CellInfo"
 set +e
 # shellcheck disable=SC2086
-vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo -- \
+vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo \
   --root /vitess/$cell \
   --server-address "${ETCD_SERVER}" \
   $cell

diff --git a/examples/local/scripts/k3s-up.sh b/examples/local/scripts/k3s-up.sh
@@ -52,7 +52,7 @@ $KUBECTL create -f ../../go/vt/topo/k8stopo/VitessTopoNodes-crd.yaml
 # Add the CellInfo description for the cell
 set +e
 echo "add $cell CellInfo"
-vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo -- \
+vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo \
   --root /vitess/$cell \
   $cell
 set -e

diff --git a/examples/local/scripts/zk-up.sh b/examples/local/scripts/zk-up.sh
@@ -53,7 +53,7 @@ echo "Started zk servers."
 # If the node already exists, it's fine, means we used existing data.
 set +e
 # shellcheck disable=SC2086
-vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo -- \
+vtctl $TOPOLOGY_FLAGS VtctldCommand AddCellInfo \
   --root /vitess/$cell \
   --server-address $ZK_SERVER \
   $cell

diff --git a/go/cmd/vtctl/vtctl.go b/go/cmd/vtctl/vtctl.go
@@ -52,6 +52,29 @@ var (
 
 func init() {
 	servenv.OnParse(func(fs *pflag.FlagSet) {
+		// N.B. This is necessary for subcommand pflag parsing when not using
+		// cobra (cobra is where we're headed, but for `vtctl` it's a big lift
+		// before the RC cut).
+		//
+		// Essentially, the situation we have here is that commands look like:
+		//
+		//	`vtctl [global flags] <command> [subcommand flags]`
+		//
+		// Since the default behavior of pflag is to allow "interspersed" flag
+		// and positional arguments, this means that the initial servenv parse
+		// will complain if _any_ subocmmand's flag is provided; for example, if
+		// you were to invoke
+		//
+		//	`vtctl AddCellInfo --root /vitess/global --server_address "1.2.3.4" global
+		//
+		// then you would get the error "unknown flag --root", even though that
+		// is a valid flag for the AddCellInfo flag.
+		//
+		// By disabling interspersal on the top-level parse, anything after the
+		// command name ("AddCellInfo", in this example) will be forwarded to
+		// the subcommand's flag set for further parsing.
+		fs.SetInterspersed(false)
+
 		logger := logutil.NewConsoleLogger()
 		fs.SetOutput(logutil.NewLoggerWriter(logger))
 		fs.Usage = func() {
@@ -156,12 +179,14 @@ func main() {
 	default:
 		log.Warningf("WARNING: vtctl should only be used for VDiff workflows. Consider using vtctldclient for all other commands.")
 
+		wr := wrangler.New(logutil.NewConsoleLogger(), ts, tmclient.NewTabletManagerClient())
+
 		if args[0] == "--" {
+			vtctl.PrintDoubleDashDeprecationNotice(wr)
 			args = args[1:]
 		}
 
 		action = args[0]
-		wr := wrangler.New(logutil.NewConsoleLogger(), ts, tmclient.NewTabletManagerClient())
 		err := vtctl.RunCommand(ctx, wr, args)
 		cancel()
 		switch err {

diff --git a/go/test/endtoend/recovery/pitr/shardedpitr_test.go b/go/test/endtoend/recovery/pitr/shardedpitr_test.go
@@ -299,7 +299,7 @@ func performResharding(t *testing.T) {
 		require.NoError(t, err)
 	}
 
-	err = clusterInstance.VtctlclientProcess.ExecuteCommand("Reshard", "--", "--v1", "ks.reshardWorkflow", "0", "-80,80-")
+	err = clusterInstance.VtctlclientProcess.ExecuteCommand("Reshard", "--", "--v1", "ks.reshardWorkflow", "0", "--", "-80,80-")
 	require.NoError(t, err)
 
 	err = clusterInstance.VtctlclientProcess.ExecuteCommand("SwitchReads", "--", "--tablet_types=rdonly", "ks.reshardWorkflow")

diff --git a/go/test/endtoend/recovery/pitrtls/shardedpitr_tls_test.go b/go/test/endtoend/recovery/pitrtls/shardedpitr_tls_test.go
@@ -418,7 +418,7 @@ func tlsPerformResharding(t *testing.T) {
 		require.NoError(t, err)
 	}
 
-	err = clusterInstance.VtctlclientProcess.ExecuteCommand("Reshard", "ks.reshardWorkflow", "0", "-80,80-")
+	err = clusterInstance.VtctlclientProcess.ExecuteCommand("Reshard", "ks.reshardWorkflow", "0", "--", "-80,80-")
 	require.NoError(t, err)
 
 	err = clusterInstance.VtctlclientProcess.ExecuteCommand("SwitchReads", "--", "--tablet_type=rdonly", "ks.reshardWorkflow")

diff --git a/go/test/endtoend/vreplication/vreplication_test.go b/go/test/endtoend/vreplication/vreplication_test.go
@@ -841,7 +841,7 @@ func reshard(t *testing.T, ksName string, tableName string, workflow string, sou
 				t.Fatal(err)
 			}
 		}
-		if err := vc.VtctlClient.ExecuteCommand("Reshard", "--", "--v1", "--cells="+sourceCellOrAlias, "--tablet_types=replica,primary", ksWorkflow, sourceShards, targetShards); err != nil {
+		if err := vc.VtctlClient.ExecuteCommand("Reshard", "--", "--v1", "--cells="+sourceCellOrAlias, "--tablet_types=replica,primary", ksWorkflow, "--", sourceShards, targetShards); err != nil {
 			t.Fatalf("Reshard command failed with %+v\n", err)
 		}
 		tablets := vc.getVttabletsInKeyspace(t, defaultCell, ksName, "primary")

diff --git a/go/test/endtoend/vtctldweb/vtctld_web_test.go b/go/test/endtoend/vtctldweb/vtctld_web_test.go
@@ -120,11 +120,11 @@ func TestCreateKs(t *testing.T) {
 		case 0:
 			err := ele.SendKeys("test_keyspace3")
 			require.Nil(t, err)
-			assertDialogCommand(t, dialog, []string{"CreateKeyspace", "-force=false", "test_keyspace3"})
+			assertDialogCommand(t, dialog, []string{"CreateKeyspace", "--force=false", "test_keyspace3"})
 		}
 	}
 
-	assertDialogCommand(t, dialog, []string{"CreateKeyspace", "-force=false", "test_keyspace3"})
+	assertDialogCommand(t, dialog, []string{"CreateKeyspace", "--force=false", "test_keyspace3"})
 
 	create, err := dialog.FindElement(selenium.ByID, "vt-action")
 	require.Nil(t, err)
@@ -195,14 +195,14 @@ func TestDashboardValidate(t *testing.T) {
 	dialog, err := dashboardContent.FindElement(selenium.ByTagName, "vt-dialog")
 	require.Nil(t, err)
 
-	assertDialogCommand(t, dialog, []string{"Validate", "-ping-tablets=false"})
+	assertDialogCommand(t, dialog, []string{"Validate", "--ping-tablets=false"})
 
 	checkBoxes, err := dialog.FindElements(selenium.ByClassName, "md-checkbox-inner-container")
 	require.Nil(t, err)
 
 	click(t, checkBoxes[0])
 
-	assertDialogCommand(t, dialog, []string{"Validate", "-ping-tablets"})
+	assertDialogCommand(t, dialog, []string{"Validate", "--ping-tablets"})
 
 	validate, err := dialog.FindElement(selenium.ByID, "vt-action")
 	require.Nil(t, err)

diff --git a/go/test/endtoend/vtgate/schema/schema_test.go b/go/test/endtoend/vtgate/schema/schema_test.go
@@ -230,7 +230,7 @@ func testDropNonExistentTables(t *testing.T) {
 func testCreateInvalidView(t *testing.T) {
 	for _, ddlStrategy := range []string{"direct", "direct -allow-zero-in-date"} {
 		createInvalidView := "CREATE OR REPLACE VIEW invalid_view AS SELECT * FROM nonexistent_table;"
-		output, err := clusterInstance.VtctlclientProcess.ExecuteCommandWithOutput("ApplySchema", "--", "-skip_preflight", "-ddl_strategy", ddlStrategy, "--sql", createInvalidView, keyspaceName)
+		output, err := clusterInstance.VtctlclientProcess.ExecuteCommandWithOutput("ApplySchema", "--", "--skip_preflight", "--ddl_strategy", ddlStrategy, "--sql", createInvalidView, keyspaceName)
 		require.Error(t, err)
 		assert.Contains(t, output, "doesn't exist (errno 1146)")
 	}

diff --git a/go/vt/vtctl/backup.go b/go/vt/vtctl/backup.go
@@ -18,10 +18,10 @@ package vtctl
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"time"
 
+	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 
 	"vitess.io/vitess/go/protoutil"
@@ -70,7 +70,7 @@ func init() {
 	})
 }
 
-func commandBackup(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandBackup(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	concurrency := subFlags.Int("concurrency", 4, "Specifies the number of compression/checksum jobs to run simultaneously")
 	allowPrimary := subFlags.Bool("allow_primary", false, "Allows backups to be taken on primary. Warning!! If you are using the builtin backup engine, this will shutdown your primary mysql for as long as it takes to create a backup.")
 
@@ -108,7 +108,7 @@ func (b *backupEventStreamLogger) Send(resp *vtctldatapb.BackupResponse) error {
 	return nil
 }
 
-func commandBackupShard(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandBackupShard(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	concurrency := subFlags.Int("concurrency", 4, "Specifies the number of compression/checksum jobs to run simultaneously")
 	allowPrimary := subFlags.Bool("allow_primary", false, "Whether to use primary tablet for backup. Warning!! If you are using the builtin backup engine, this will shutdown your primary mysql for as long as it takes to create a backup.")
 
@@ -132,7 +132,7 @@ func commandBackupShard(ctx context.Context, wr *wrangler.Wrangler, subFlags *fl
 	}, &backupEventStreamLogger{logger: wr.Logger(), ctx: ctx})
 }
 
-func commandListBackups(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandListBackups(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}
@@ -161,7 +161,7 @@ func commandListBackups(ctx context.Context, wr *wrangler.Wrangler, subFlags *fl
 	return nil
 }
 
-func commandRemoveBackup(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandRemoveBackup(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}
@@ -198,7 +198,7 @@ func (b *backupRestoreEventStreamLogger) Send(resp *vtctldatapb.RestoreFromBacku
 	return nil
 }
 
-func commandRestoreFromBackup(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandRestoreFromBackup(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	backupTimestampStr := subFlags.String("backup_timestamp", "", "Use the backup taken at or before this timestamp rather than using the latest backup.")
 	if err := subFlags.Parse(args); err != nil {
 		return err

diff --git a/go/vt/vtctl/cell_info.go b/go/vt/vtctl/cell_info.go
@@ -18,10 +18,11 @@ package vtctl
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"strings"
 
+	"github.com/spf13/pflag"
+
 	"vitess.io/vitess/go/vt/wrangler"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
@@ -71,7 +72,7 @@ func init() {
 	})
 }
 
-func commandAddCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandAddCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	serverAddress := subFlags.String("server_address", "", "The address the topology server is using for that cell.")
 	root := subFlags.String("root", "", "The root path the topology server is using for that cell.")
 	if err := subFlags.Parse(args); err != nil {
@@ -92,7 +93,7 @@ func commandAddCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *fl
 	return err
 }
 
-func commandUpdateCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandUpdateCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	serverAddress := subFlags.String("server_address", "", "The address the topology server is using for that cell.")
 	root := subFlags.String("root", "", "The root path the topology server is using for that cell.")
 	if err := subFlags.Parse(args); err != nil {
@@ -113,7 +114,7 @@ func commandUpdateCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags
 	return err
 }
 
-func commandDeleteCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandDeleteCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	force := subFlags.Bool("force", false, "Proceeds even if the cell's topology server cannot be reached. The assumption is that you turned down the entire cell, and just need to update the global topo data.")
 	if err := subFlags.Parse(args); err != nil {
 		return err
@@ -130,7 +131,7 @@ func commandDeleteCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags
 	return err
 }
 
-func commandGetCellInfoNames(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandGetCellInfoNames(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}
@@ -145,7 +146,7 @@ func commandGetCellInfoNames(ctx context.Context, wr *wrangler.Wrangler, subFlag
 	return nil
 }
 
-func commandGetCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandGetCellInfo(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}

diff --git a/go/vt/vtctl/cells_aliases.go b/go/vt/vtctl/cells_aliases.go
@@ -18,10 +18,11 @@ package vtctl
 
 import (
 	"context"
-	"flag"
 	"fmt"
 	"strings"
 
+	"github.com/spf13/pflag"
+
 	"vitess.io/vitess/go/vt/wrangler"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
@@ -64,53 +65,51 @@ func init() {
 	})
 }
 
-func commandAddCellsAlias(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
-	cellsString := subFlags.String("cells", "", "The list of cell names that are members of this alias.")
+func commandAddCellsAlias(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
+	cells := subFlags.StringSlice("cells", nil, "The list of cell names that are members of this alias.")
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}
 	if subFlags.NArg() != 1 {
 		return fmt.Errorf("the <alias> argument is required for the AddCellsAlias command")
 	}
 
-	cells := strings.Split(*cellsString, ",")
-	for i, cell := range cells {
-		cells[i] = strings.TrimSpace(cell)
+	for i, cell := range *cells {
+		(*cells)[i] = strings.TrimSpace(cell)
 	}
 
 	alias := subFlags.Arg(0)
 	_, err := wr.VtctldServer().AddCellsAlias(ctx, &vtctldatapb.AddCellsAliasRequest{
 		Name:  alias,
-		Cells: cells,
+		Cells: *cells,
 	})
 	return err
 }
 
-func commandUpdateCellsAlias(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
-	cellsString := subFlags.String("cells", "", "The list of cell names that are members of this alias.")
+func commandUpdateCellsAlias(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
+	cells := subFlags.StringSlice("cells", nil, "The list of cell names that are members of this alias.")
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}
 	if subFlags.NArg() != 1 {
 		return fmt.Errorf("the <alias> argument is required for the UpdateCellsAlias command")
 	}
 
-	cells := strings.Split(*cellsString, ",")
-	for i, cell := range cells {
-		cells[i] = strings.TrimSpace(cell)
+	for i, cell := range *cells {
+		(*cells)[i] = strings.TrimSpace(cell)
 	}
 
 	alias := subFlags.Arg(0)
 	_, err := wr.VtctldServer().UpdateCellsAlias(ctx, &vtctldatapb.UpdateCellsAliasRequest{
 		Name: alias,
 		CellsAlias: &topodatapb.CellsAlias{
-			Cells: cells,
+			Cells: *cells,
 		},
 	})
 	return err
 }
 
-func commandDeleteCellsAlias(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandDeleteCellsAlias(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}
@@ -125,7 +124,7 @@ func commandDeleteCellsAlias(ctx context.Context, wr *wrangler.Wrangler, subFlag
 	return err
 }
 
-func commandGetCellsAliases(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {
+func commandGetCellsAliases(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
 	if err := subFlags.Parse(args); err != nil {
 		return err
 	}

diff --git a/go/vt/vtctl/endtoend/get_schema_test.go b/go/vt/vtctl/endtoend/get_schema_test.go
@@ -177,7 +177,7 @@ func TestGetSchema(t *testing.T) {
 	utils.MustMatch(t, sd, actual)
 
 	// reset for the next invocation, where we verify that passing
-	// -table_sizes_only does not include the create table statement or columns.
+	// --table_sizes_only does not include the create table statement or columns.
 	logger.Events = nil
 	sd = &tabletmanagerdatapb.SchemaDefinition{
 		TableDefinitions: []*tabletmanagerdatapb.TableDefinition{
@@ -202,7 +202,7 @@ func TestGetSchema(t *testing.T) {
 
 	err = vtctl.RunCommand(ctx, wrangler.New(logger, topo, &tmc), []string{
 		"GetSchema",
-		"-table_sizes_only",
+		"--table_sizes_only",
 		topoproto.TabletAliasString(tablet.Alias),
 	})
 	require.NoError(t, err)