Keep mongo/redis backup-list output exactly the same

wal-g · Sep 5, 2023 · 4a97ed2 · 4a97ed2
1 parent 1b36239
commit 4a97ed2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 30 deletions.
diff --git a/internal/databases/mongo/backup_list_handler.go b/internal/databases/mongo/backup_list_handler.go
@@ -20,15 +20,18 @@ type BackupDetail struct {
 }
 
 func (bd *BackupDetail) PrintableFields() []printlist.TableField {
-	prettyModifyTime := internal.PrettyFormatTime(bd.ModifyTime)
-	return append(bd.Backup.PrintableFields(),
-		printlist.TableField{
-			Name:        "modify_time",
-			PrettyName:  "Modify time",
-			Value:       internal.FormatTime(bd.ModifyTime),
-			PrettyValue: &prettyModifyTime,
-		},
-	)
+	lastModifiedField := printlist.TableField{
+		Name:       "last_modified",
+		PrettyName: "Last modified",
+		Value:      internal.FormatTime(bd.ModifyTime),
+	}
+	insertAfterColumn := 3
+
+	baseFields := bd.Backup.PrintableFields()
+	fields := baseFields[:insertAfterColumn]
+	fields = append(fields, lastModifiedField)
+	fields = append(fields, baseFields[insertAfterColumn:]...)
+	return fields
 }
 
 func NewBackupDetail(backupTime internal.BackupTime, sentinel *models.Backup) *BackupDetail {

diff --git a/internal/databases/mongo/models/backup.go b/internal/databases/mongo/models/backup.go
@@ -39,8 +39,6 @@ func (b *Backup) IsPermanent() bool {
 }
 
 func (b *Backup) PrintableFields() []printlist.TableField {
-	prettyStartTime := internal.PrettyFormatTime(b.StartLocalTime)
-	prettyFinishTime := internal.PrettyFormatTime(b.FinishLocalTime)
 	return []printlist.TableField{
 		{
 			Name:       "name",
@@ -58,16 +56,14 @@ func (b *Backup) PrintableFields() []printlist.TableField {
 			Value:      b.MongoMeta.Version,
 		},
 		{
-			Name:        "start_time",
-			PrettyName:  "Start time",
-			Value:       internal.FormatTime(b.StartLocalTime),
-			PrettyValue: &prettyStartTime,
+			Name:       "start_time",
+			PrettyName: "Start time",
+			Value:      internal.FormatTime(b.StartLocalTime),
 		},
 		{
-			Name:        "finish_time",
-			PrettyName:  "Finish time",
-			Value:       internal.FormatTime(b.FinishLocalTime),
-			PrettyValue: &prettyFinishTime,
+			Name:       "finish_time",
+			PrettyName: "Finish time",
+			Value:      internal.FormatTime(b.FinishLocalTime),
 		},
 		{
 			Name:       "hostname",

diff --git a/internal/databases/mongo/models/backup_test.go b/internal/databases/mongo/models/backup_test.go
@@ -337,8 +337,6 @@ func TestBackup_PrintableFields(t *testing.T) {
 		UserData:         []string{"a", "b", "c"},
 	}
 	got := b.PrintableFields()
-	prettyStartTime := "Wednesday, 23-Aug-23 17:18:31 UTC"
-	prettyFinishTime := "Wednesday, 23-Aug-23 20:23:42 UTC"
 	want := []printlist.TableField{
 		{
 			Name:        "name",
@@ -359,16 +357,14 @@ func TestBackup_PrintableFields(t *testing.T) {
 			PrettyValue: nil,
 		},
 		{
-			Name:        "start_time",
-			PrettyName:  "Start time",
-			Value:       "2023-08-23T17:18:31Z",
-			PrettyValue: &prettyStartTime,
+			Name:       "start_time",
+			PrettyName: "Start time",
+			Value:      "2023-08-23T17:18:31Z",
 		},
 		{
-			Name:        "finish_time",
-			PrettyName:  "Finish time",
-			Value:       "2023-08-23T20:23:42Z",
-			PrettyValue: &prettyFinishTime,
+			Name:       "finish_time",
+			PrettyName: "Finish time",
+			Value:      "2023-08-23T20:23:42Z",
 		},
 		{
 			Name:        "hostname",

diff --git a/internal/databases/redis/archive/backup.go b/internal/databases/redis/archive/backup.go
@@ -60,7 +60,7 @@ func (b Backup) PrintableFields() []printlist.TableField {
 		},
 		{
 			Name:       "user_data",
-			PrettyName: "User data",
+			PrettyName: "UserData",
 			Value:      marshalUserData(b.UserData),
 		},
 		{