From 8f6f1c0b8f13f18d7826028d9ab86954a708f66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl> Date: Wed, 26 Jun 2024 16:47:01 +0200 Subject: [PATCH] fix(managerclient): don't print outdated follow-up actions --- pkg/managerclient/model.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkg/managerclient/model.go b/pkg/managerclient/model.go index d25c56e34..cb0d8feb0 100644 --- a/pkg/managerclient/model.go +++ b/pkg/managerclient/model.go @@ -492,18 +492,12 @@ type TaskListItems struct { // Render renders TaskListItems in a tabular format. func (li TaskListItems) Render(w io.Writer) error { - var doneRestoreTask bool - columns := []any{"Task", "Schedule", "Window", "Timezone", "Success", "Error", "Last Success", "Last Error", "Status", "Next"} if li.ShowProps { columns = append(columns, "Properties") } p := table.New(columns...) for _, t := range li.TaskListItemSlice { - if t.Type == RestoreTask && t.Status == TaskStatusDone { - doneRestoreTask = true - } - var id string if t.Name != "" && !li.ShowIDs { id = taskJoin(t.Type, t.Name) @@ -573,10 +567,6 @@ func (li TaskListItems) Render(w io.Writer) error { } fmt.Fprint(w, p) - if doneRestoreTask { - fmt.Fprint(w, " NOTE: all completed restore tasks require specific follow-up action - see docs for more information\n") - } - return nil } @@ -1042,11 +1032,6 @@ func (rp RestoreProgress) status() string { if rp.Progress == nil { return s } - if s == TaskStatusDone { - if len(rp.Progress.Keyspaces) == 1 && rp.Progress.Keyspaces[0].Keyspace == "system_schema" { - return "DONE - restart required (see restore docs)" - } - } stage := RestoreStageName(rp.Progress.Stage) if s != TaskStatusNew && s != TaskStatusDone && stage != "" { s += " (" + stage + ")"