diff --git a/internal/cmd/branch/vtctld/move_tables.go b/internal/cmd/branch/vtctld/move_tables.go index 8c93a11a..6de459c9 100644 --- a/internal/cmd/branch/vtctld/move_tables.go +++ b/internal/cmd/branch/vtctld/move_tables.go @@ -448,8 +448,10 @@ func MoveTablesCancelCmd(ch *cmdutil.Helper) *cobra.Command { cmd.Flags().StringVar(&flags.targetKeyspace, "target-keyspace", "", "Target keyspace") cmd.Flags().BoolVar(&flags.keepData, "keep-data", false, "Keep the data in the target keyspace") cmd.Flags().BoolVar(&flags.keepRoutingRules, "keep-routing-rules", false, "Keep the routing rules") - cmd.MarkFlagRequired("workflow") // nolint:errcheck - cmd.MarkFlagRequired("target-keyspace") // nolint:errcheck + cmd.MarkFlagRequired("workflow") // nolint:errcheck + cmd.MarkFlagRequired("target-keyspace") // nolint:errcheck + cmd.MarkFlagRequired("keep-data") // nolint:errcheck + cmd.MarkFlagRequired("keep-routing-rules") // nolint:errcheck return cmd } @@ -524,8 +526,10 @@ func MoveTablesCompleteCmd(ch *cmdutil.Helper) *cobra.Command { cmd.Flags().BoolVar(&flags.keepRoutingRules, "keep-routing-rules", false, "Keep the routing rules") cmd.Flags().BoolVar(&flags.renameTables, "rename-tables", false, "Rename source tables instead of dropping them") cmd.Flags().BoolVar(&flags.dryRun, "dry-run", false, "Only show what would be done") - cmd.MarkFlagRequired("workflow") // nolint:errcheck - cmd.MarkFlagRequired("target-keyspace") // nolint:errcheck + cmd.MarkFlagRequired("workflow") // nolint:errcheck + cmd.MarkFlagRequired("target-keyspace") // nolint:errcheck + cmd.MarkFlagRequired("keep-data") // nolint:errcheck + cmd.MarkFlagRequired("keep-routing-rules") // nolint:errcheck return cmd } diff --git a/internal/cmd/branch/vtctld/move_tables_test.go b/internal/cmd/branch/vtctld/move_tables_test.go index 026a8b31..ad1bccb4 100644 --- a/internal/cmd/branch/vtctld/move_tables_test.go +++ b/internal/cmd/branch/vtctld/move_tables_test.go @@ -506,12 +506,15 @@ func TestMoveTablesCancelWithFlags(t *testing.T) { branch := "my-branch" keepData := false + keepRoutingRules := false svc := &mock.MoveTablesService{ CancelFn: func(ctx context.Context, req *ps.MoveTablesCancelRequest) (*ps.VtctldOperationReference, error) { c.Assert(req.Workflow, qt.Equals, "my-workflow") c.Assert(req.TargetKeyspace, qt.Equals, "target-ks") c.Assert(req.KeepData, qt.IsNotNil) c.Assert(*req.KeepData, qt.Equals, keepData) + c.Assert(req.KeepRoutingRules, qt.IsNotNil) + c.Assert(*req.KeepRoutingRules, qt.Equals, keepRoutingRules) return &ps.VtctldOperationReference{ID: "cancel-op"}, nil }, } @@ -539,6 +542,7 @@ func TestMoveTablesCancelWithFlags(t *testing.T) { "--workflow", "my-workflow", "--target-keyspace", "target-ks", "--keep-data=false", + "--keep-routing-rules=false", }) err := cmd.Execute() c.Assert(err, qt.IsNil)