Merge pull request #1232 from jcechace/PBM-1663-profile-ux-01

PBM-1663: Rename StorageName to Profile and always Include it

Author: jcechace

cmd/pbm/backup.go

@@ -320,6 +320,8 @@ func waitForBcpStatus(ctx context.Context, conn connect.Client, bcpName string,
 
 type bcpDesc struct {
 	Name               string          `json:"name" yaml:"name"`
+	Profile            string          `json:"profile,omitempty" yaml:"profile,omitempty"`
+	StorageType        storage.Type    `json:"storage_type,omitempty" yaml:"storage_type,omitempty"`
 	OPID               string          `json:"opid" yaml:"opid"`
 	Type               defs.BackupType `json:"type" yaml:"type"`
 	LastWriteTS        int64           `json:"last_write_ts" yaml:"-"`
@@ -335,7 +337,6 @@ type bcpDesc struct {
 	SizeUncompressed   int64           `json:"size_uncompressed" yaml:"-"`
 	HSize              string          `json:"size_h" yaml:"size_h"`
 	HSizeUncompressed  string          `json:"size_uncompressed_h" yaml:"size_uncompressed_h"`
-	StorageName        string          `json:"storage_name,omitempty" yaml:"storage_name,omitempty"`
 	Err                *string         `json:"error,omitempty" yaml:"error,omitempty"`
 	Replsets           []bcpReplDesc   `json:"replsets" yaml:"replsets"`
 }
@@ -413,6 +414,8 @@ func describeBackup(
 
 	rv := &bcpDesc{
 		Name:               bcp.Name,
+		Profile:            bcp.Store.Name,
+		StorageType:        bcp.Store.Type,
 		OPID:               bcp.OPID,
 		Type:               bcp.Type,
 		Namespaces:         bcp.Namespaces,
@@ -428,7 +431,6 @@ func describeBackup(
 		HSize:              byteCountIEC(bcp.Size),
 		SizeUncompressed:   bcp.SizeUncompressed,
 		HSizeUncompressed:  byteCountIEC(bcp.SizeUncompressed),
-		StorageName:        bcp.Store.Name,
 	}
 	if bcp.SizeUncompressed > 0 {
 		rv.HSizeUncompressed = byteCountIEC(bcp.SizeUncompressed)

cmd/pbm/list.go

@@ -213,8 +213,8 @@ func (bl backupListOut) String() string {
 		} else if b.Type == defs.IncrementalBackup && b.SrcBackup == "" {
 			t += ", base"
 		}
-		if b.StoreName != "" {
-			t += ", *"
+		if b.Profile != "" {
+			t += ", " + b.Profile
 		}
 		s += fmt.Sprintf("  %s <%s> [restore_to_time: %s]\n", b.Name, t, fmtTS(int64(b.RestoreTS)))
 	}
@@ -322,7 +322,7 @@ func getSnapshotList(
 			PBMVersion:  b.PBMVersion,
 			Type:        b.Type,
 			SrcBackup:   b.SrcBackup,
-			StoreName:   b.Store.Name,
+			Profile:     b.Store.Name,
 		})
 	}
 

cmd/pbm/main.go

@@ -1143,6 +1143,7 @@ func tsUTC(ts int64) string {
 
 type snapshotStat struct {
 	Name        string           `json:"name"`
+	Profile     string           `json:"profile,omitempty"`
 	Namespaces  []string         `json:"nss,omitempty"`
 	Size        int64            `json:"size,omitempty"`
 	Status      defs.Status      `json:"status"`
@@ -1153,7 +1154,6 @@ type snapshotStat struct {
 	PBMVersion  string           `json:"pbmVersion"`
 	Type        defs.BackupType  `json:"type"`
 	SrcBackup   string           `json:"src"`
-	StoreName   string           `json:"storage,omitempty"`
 }
 
 type pitrRange struct {

cmd/pbm/status.go

@@ -494,8 +494,8 @@ func (s storageStat) String() string {
 		} else if ss.Type == defs.IncrementalBackup && ss.SrcBackup == "" {
 			t += ", base"
 		}
-		if ss.StoreName != "" {
-			t += ", *"
+		if ss.Profile != "" {
+			t += ", " + ss.Profile
 		}
 		ret += fmt.Sprintf("    %s %s <%s> %s %s\n", ss.Name, storage.PrettySize(ss.Size), t, ss.PrintStatus, status)
 	}
@@ -590,7 +590,7 @@ func getStorageStat(
 			PBMVersion: bcp.PBMVersion,
 			Type:       bcp.Type,
 			SrcBackup:  bcp.SrcBackup,
-			StoreName:  bcp.Store.Name,
+			Profile:    bcp.Store.Name,
 		}
 		if err := bcp.Error(); err != nil {
 			snpsht.Err = err