From b422b9a48e6b175f5aa117c04311731b5a3d3e67 Mon Sep 17 00:00:00 2001
From: kmetin <kutluhan.metin@hazelcast.com>
Date: Tue, 19 Sep 2023 15:41:10 +0300
Subject: [PATCH] merge

---
 base/commands/migration/cancel_stages.go | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/base/commands/migration/cancel_stages.go b/base/commands/migration/cancel_stages.go
index 79189a21..92bfaac8 100644
--- a/base/commands/migration/cancel_stages.go
+++ b/base/commands/migration/cancel_stages.go
@@ -22,62 +22,62 @@ func NewCancelStages() *CancelStages {
 	return &CancelStages{}
 }
 
-func (st *CancelStages) Build(ctx context.Context, ec plug.ExecContext) []stage.Stage {
-	return []stage.Stage{
+func (st *CancelStages) Build(ctx context.Context, ec plug.ExecContext) []stage.Stage[any] {
+	return []stage.Stage[any]{
 		{
 			ProgressMsg: "Connecting to the migration cluster",
 			SuccessMsg:  "Connected to the migration cluster",
 			FailureMsg:  "Could not connect to the migration cluster",
-			Func:        st.connectStage(ctx, ec),
+			Func:        st.connectStage(ec),
 		},
 		{
 			ProgressMsg: "Canceling the migration",
 			SuccessMsg:  "Canceled the migration",
 			FailureMsg:  "Could not cancel the migration",
-			Func:        st.cancelStage(ctx),
+			Func:        st.cancelStage(),
 		},
 	}
 }
 
-func (st *CancelStages) connectStage(ctx context.Context, ec plug.ExecContext) func(stage.Statuser) error {
-	return func(status stage.Statuser) error {
+func (st *CancelStages) connectStage(ec plug.ExecContext) func(context.Context, stage.Statuser[any]) (any, error) {
+	return func(ctx context.Context, status stage.Statuser[any]) (any, error) {
 		var err error
 		st.ci, err = ec.ClientInternal(ctx)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		st.migrationsInProgressList, err = st.ci.Client().GetList(ctx, MigrationsInProgressList)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		all, err := st.migrationsInProgressList.GetAll(ctx)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		if len(all) == 0 {
-			return fmt.Errorf("there are no migrations are in progress on migration cluster")
+			return nil, fmt.Errorf("there are no migrations are in progress on migration cluster")
 		}
 		var mip MigrationInProgress
 		m := all[0].(serialization.JSON)
 		err = json.Unmarshal(m, &mip)
 		if err != nil {
-			return fmt.Errorf("parsing migration in progress: %w", err)
+			return nil, fmt.Errorf("parsing migration in progress: %w", err)
 		}
 		st.migrationID = mip.MigrationID
 		st.cancelQueue, err = st.ci.Client().GetQueue(ctx, CancelQueue)
-		return err
+		return nil, err
 	}
 }
 
-func (st *CancelStages) cancelStage(ctx context.Context) func(stage.Statuser) error {
-	return func(statuser stage.Statuser) error {
+func (st *CancelStages) cancelStage() func(context.Context, stage.Statuser[any]) (any, error) {
+	return func(ctx context.Context, status stage.Statuser[any]) (any, error) {
 		c := CancelItem{ID: st.migrationID}
 		b, err := json.Marshal(c)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		st.cancelQueue.Put(ctx, serialization.JSON(b))
-		return err
+		return nil, err
 	}
 }