rename to delete

Author: xuanyu66

internal/cli/serverless/migration/cancel.go

@@ -105,7 +105,7 @@ func CreateCmd(h *internal.Helper) *cobra.Command {
 				Mode:        mode,
 			}
 
-			resp, err := d.CreateMigrationTask(ctx, clusterID, createBody)
+			resp, err := d.CreateMigration(ctx, clusterID, createBody)
 			if err != nil {
 				return errors.Trace(err)
 			}
@@ -117,7 +117,7 @@ func CreateCmd(h *internal.Helper) *cobra.Command {
 	}
 
 	cmd.Flags().StringP(flag.ClusterID, flag.ClusterIDShort, "", "The ID of the target cluster.")
-	cmd.Flags().String(flag.DisplayName, "", "Display name for the migration.")
+	cmd.Flags().StringP(flag.DisplayName, flag.DisplayNameShort, "", "Display name for the migration.")
 	cmd.Flags().String(flag.MigrationConfigFile, "", "Path to a migration config JSON file. Use \"ticloud serverless migration template --modetype <mode>\" to print templates.")
 	cmd.Flags().Bool(flag.MigrationDryRun, false, "Run a migration precheck (dry run) with the provided inputs without creating a task.")
 
@@ -153,7 +153,7 @@ func runMigrationPrecheck(ctx context.Context, client cloud.TiDBCloudClient, clu
 	defer ticker.Stop()
 	pollCtx, cancel := context.WithTimeout(ctx, precheckPollTimeout)
 	defer cancel()
-	
+
 	for {
 		select {
 		case <-pollCtx.Done():
@@ -301,4 +301,4 @@ func taskModeValues() []string {
 		values = append(values, string(mode))
 	}
 	return values
-}
+}

internal/cli/serverless/migration/create.go

@@ -65,14 +65,14 @@ func DeleteCmd(h *internal.Helper) *cobra.Command {
 
 	var cmd = &cobra.Command{
 		Use:     "delete",
-		Short:   "Cancel a migration task",
+		Short:   "Delete a migration task",
 		Aliases: []string{"rm"},
 		Args:    cobra.NoArgs,
-		Example: fmt.Sprintf(`  Cancel a migration task in interactive mode:
-  $ %[1]s serverless migration delete
+		Example: fmt.Sprintf(`  Delete a migration task in interactive mode:
+	  $ %[1]s serverless migration delete
 
-  Cancel a migration task in non-interactive mode:
-  $ %[1]s serverless migration delete -c <cluster-id> --migration-id <task-id>`, config.CliName),
+	  Delete a migration task in non-interactive mode:
+	  $ %[1]s serverless migration delete -c <cluster-id> --migration-id <task-id>`, config.CliName),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			return opts.MarkInteractive(cmd)
 		},
@@ -116,7 +116,7 @@ func DeleteCmd(h *internal.Helper) *cobra.Command {
 
 			if !force {
 				if !h.IOStreams.CanPrompt {
-					return errors.New("The terminal doesn't support prompt, please run with --force to cancel the migration task")
+					return errors.New("The terminal doesn't support prompt, please run with --force to delete the migration task")
 				}
 				prompt := &survey.Input{
 					Message: fmt.Sprintf("%s %s %s", color.BlueString("Please type"), color.HiBlueString("yes"), color.BlueString("to confirm:")),
@@ -129,21 +129,21 @@ func DeleteCmd(h *internal.Helper) *cobra.Command {
 					return err
 				}
 				if confirmation != "yes" {
-					return errors.New("Incorrect confirm string entered, skipping migration task cancellation")
+					return errors.New("Incorrect confirm string entered, skipping migration task deletion")
 				}
 			}
 
-			if _, err := d.CancelMigrationTask(ctx, clusterID, taskID); err != nil {
+			if _, err := d.DeleteMigration(ctx, clusterID, taskID); err != nil {
 				return errors.Trace(err)
 			}
 
-			fmt.Fprintln(h.IOStreams.Out, color.GreenString("migration task %s canceled", taskID))
+			fmt.Fprintln(h.IOStreams.Out, color.GreenString("migration task %s deleted", taskID))
 			return nil
 		},
 	}
 
-	cmd.Flags().BoolVar(&force, flag.Force, false, "Cancel without confirmation.")
+	cmd.Flags().BoolVar(&force, flag.Force, false, "Delete without confirmation.")
 	cmd.Flags().StringP(flag.ClusterID, flag.ClusterIDShort, "", "Cluster ID that owns the migration task.")
-	cmd.Flags().StringP(flag.MigrationTaskID, flag.MigrationTaskIDShort, "", "ID of the migration task to cancel.")
+	cmd.Flags().StringP(flag.MigrationTaskID, flag.MigrationTaskIDShort, "", "ID of the migration task to delete.")
 	return cmd
 }

internal/cli/serverless/migration/delete.go

@@ -111,7 +111,7 @@ func DescribeCmd(h *internal.Helper) *cobra.Command {
 				}
 			}
 
-			resp, err := d.GetMigrationTask(ctx, clusterID, taskID)
+			resp, err := d.GetMigration(ctx, clusterID, taskID)
 			if err != nil {
 				return errors.Trace(err)
 			}

internal/cli/serverless/migration/describe.go

@@ -100,7 +100,7 @@ func ListCmd(h *internal.Helper) *cobra.Command {
 			}
 
 			pageSize := int32(h.QueryPageSize)
-			resp, err := d.ListMigrationTasks(ctx, clusterID, &pageSize, nil, nil)
+			resp, err := d.ListMigrations(ctx, clusterID, &pageSize, nil, nil)
 			if err != nil {
 				return errors.Trace(err)
 			}

internal/cli/serverless/migration/list.go

@@ -30,7 +30,7 @@ func MigrationCmd(h *internal.Helper) *cobra.Command {
 	cmd.AddCommand(CreateCmd(h))
 	cmd.AddCommand(DescribeCmd(h))
 	cmd.AddCommand(ListCmd(h))
-	cmd.AddCommand(CancelCmd(h))
+	cmd.AddCommand(DeleteCmd(h))
 	cmd.AddCommand(TemplateCmd(h))
 	cmd.AddCommand(PauseCmd(h))
 	cmd.AddCommand(ResumeCmd(h))

internal/cli/serverless/migration/migration.go

@@ -109,7 +109,7 @@ func PauseCmd(h *internal.Helper) *cobra.Command {
 			}
 
 			emptyBody := map[string]interface{}{}
-			if _, err := d.PauseMigrationTask(ctx, clusterID, taskID, &emptyBody); err != nil {
+			if _, err := d.PauseMigration(ctx, clusterID, taskID, &emptyBody); err != nil {
 				return errors.Trace(err)
 			}
 

internal/cli/serverless/migration/pause.go

@@ -109,7 +109,7 @@ func ResumeCmd(h *internal.Helper) *cobra.Command {
 			}
 
 			emptyBody := map[string]interface{}{}
-			if _, err := d.ResumeMigrationTask(ctx, clusterID, taskID, &emptyBody); err != nil {
+			if _, err := d.ResumeMigration(ctx, clusterID, taskID, &emptyBody); err != nil {
 				return errors.Trace(err)
 			}