add errors and logs

kutluhanmetin · Sep 6, 2023 · f79befd · f79befd
1 parent 2f281d6
commit f79befd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/base/commands/migration/start_stages.go b/base/commands/migration/start_stages.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	clcerrors "github.com/hazelcast/hazelcast-commandline-client/errors"
@@ -127,13 +128,16 @@ func (st *Stages) startStage(ctx context.Context, ec plug.ExecContext) func(stag
 			}
 			ec.PrintlnUnnecessary(msg.Message)
 			ec.PrintlnUnnecessary(ms.Report)
+			for _, l := range ms.Logs {
+				ec.Logger().Info(l)
+			}
 			switch ms.Status {
 			case StatusComplete:
 				return nil
 			case statusCanceled:
 				return clcerrors.ErrUserCancelled
 			case StatusFailed:
-				return errors.New("migration failed")
+				return fmt.Errorf("migration failed with following error(s): %s", strings.Join(ms.Errors, "\n"))
 			}
 		} else {
 			ec.PrintlnUnnecessary(msg.Message)
@@ -155,13 +159,16 @@ func (st *Stages) migrateStage(ctx context.Context, ec plug.ExecContext) func(st
 					}
 					ec.PrintlnUnnecessary(msg.Message)
 					ec.PrintlnUnnecessary(ms.Report)
+					for _, l := range ms.Logs {
+						ec.Logger().Info(l)
+					}
 					switch ms.Status {
 					case StatusComplete:
 						return nil
 					case statusCanceled:
 						return clcerrors.ErrUserCancelled
 					case StatusFailed:
-						return errors.New("migration failed")
+						return fmt.Errorf("migration failed with following error(s): %s", strings.Join(ms.Errors, "\n"))
 					}
 				} else {
 					ec.PrintlnUnnecessary(msg.Message)

diff --git a/base/commands/migration/start_stages_it_test.go b/base/commands/migration/start_stages_it_test.go
@@ -51,7 +51,7 @@ func startTest_Failure(t *testing.T) {
 			tcx.CLC().Execute(ctx, "start", "dmt-config", "--yes")
 		})
 		failureRunner(tcx, ctx)
-		for _, m := range []string{"first message", "second message", "fail status report"} {
+		for _, m := range []string{"first message", "second message", "error1", "error2", "fail status report"} {
 			tcx.AssertStdoutContains(m)
 		}
 	})
@@ -68,6 +68,7 @@ func successfulRunner(tcx it.TestContext, ctx context.Context) {
 	b := MustValue(json.Marshal(migration.MigrationStatus{
 		Status: migration.StatusComplete,
 		Report: "status report",
+		Logs:   []string{"log1", "log2"},
 	}))
 	Must(statusMap.Set(ctx, migration.StatusMapEntryName, serialization.JSON(b)))
 	Must(topic.Publish(ctx, migration.UpdateMessage{Status: migration.StatusComplete, Message: "last message"}))
@@ -83,6 +84,7 @@ func failureRunner(tcx it.TestContext, ctx context.Context) {
 	b := MustValue(json.Marshal(migration.MigrationStatus{
 		Status: migration.StatusFailed,
 		Report: "fail status report",
+		Errors: []string{"error1", "error2"},
 	}))
 	Must(statusMap.Set(ctx, migration.StatusMapEntryName, serialization.JSON(b)))
 	Must(topic.Publish(ctx, migration.UpdateMessage{Status: migration.StatusFailed, Message: "second message"}))