From 784160c77131b59bc89b089c93f14e88f5150c50 Mon Sep 17 00:00:00 2001 From: Deepti-yb Date: Thu, 19 Sep 2024 05:09:06 +0000 Subject: [PATCH] [PLAT-15370][YBA CLI]backup list table output contains base_backup_uuid and backup_uuid Summary: Since only full backups are displayed in the `./yba backup list` command, remove base backup uuid from table output format Test Plan: Manually tested the code Reviewers: skurapati Reviewed By: skurapati Subscribers: yugaware Differential Revision: https://phorge.dev.yugabyte.com/D38198 --- managed/yba-cli/internal/formatter/backup/backup.go | 2 +- managed/yba-cli/internal/formatter/backup/backup_full.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/managed/yba-cli/internal/formatter/backup/backup.go b/managed/yba-cli/internal/formatter/backup/backup.go index 5b0971bd2815..24199701a37b 100644 --- a/managed/yba-cli/internal/formatter/backup/backup.go +++ b/managed/yba-cli/internal/formatter/backup/backup.go @@ -17,7 +17,7 @@ import ( ) const ( - defaultBackupListing = "table {{.BackupUUID}}\t{{.BaseBackupUUID}}\t{{.Universe}}" + + defaultBackupListing = "table {{.BackupUUID}}\t{{.Universe}}" + "\t{{.StorageConfig}}\t{{.StorageConfigType}}\t{{.BackupType}}" + "\t{{.State}}\t{{.CompletionTime}}" diff --git a/managed/yba-cli/internal/formatter/backup/backup_full.go b/managed/yba-cli/internal/formatter/backup/backup_full.go index e38346294364..d9ec63a8136a 100644 --- a/managed/yba-cli/internal/formatter/backup/backup_full.go +++ b/managed/yba-cli/internal/formatter/backup/backup_full.go @@ -19,8 +19,7 @@ import ( const ( // Backup details defaultFullBackupGeneral = "table {{.BackupUUID}}\t{{.BackupType}}\t{{.State}}" - backupDetails1 = "table {{.Universe}}\t{{.ScheduleName}}" + - "\t{{.BaseBackupUUID}}\t{{.HasIncrementalBackups}}" + backupDetails1 = "table {{.Universe}}\t{{.ScheduleName}}\t{{.HasIncrementalBackups}}" backupDetails2 = "table {{.StorageConfig}}\t{{.StorageConfigType}}" backupDetails3 = "table {{.CreateTime}}\t{{.CompletionTime}}\t{{.ExpiryTime}}" )