changed labels format

Author: Benjosh95

internal/cmd/volume/backup/describe/describe.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"github.com/goccy/go-yaml"
 	"github.com/spf13/cobra"
@@ -127,7 +128,7 @@ func outputResult(p *print.Printer, outputFormat string, backup *iaas.Backup) er
 		table.AddSeparator()
 		table.AddRow("NAME", utils.PtrString(backup.Name))
 		table.AddSeparator()
-		table.AddRow("SIZE", utils.PtrByteSizeDefault((*int64)(backup.Size), ""))
+		table.AddRow("SIZE", utils.PtrByteSizeDefault(backup.Size, ""))
 		table.AddSeparator()
 		table.AddRow("STATUS", utils.PtrString(backup.Status))
 		table.AddSeparator()
@@ -137,8 +138,16 @@ func outputResult(p *print.Printer, outputFormat string, backup *iaas.Backup) er
 		table.AddSeparator()
 		table.AddRow("AVAILABILITY ZONE", utils.PtrString(backup.AvailabilityZone))
 		table.AddSeparator()
-		table.AddRow("LABELS", utils.PtrStringDefault(backup.Labels, ""))
-		table.AddSeparator()
+
+		if backup.Labels != nil && len(*backup.Labels) > 0 {
+			var labels []string
+			for key, value := range *backup.Labels {
+				labels = append(labels, fmt.Sprintf("%s: %s", key, value))
+			}
+			table.AddRow("LABELS", strings.Join(labels, "\n"))
+			table.AddSeparator()
+		}
+
 		table.AddRow("CREATED AT", utils.ConvertTimePToDateTimeString(backup.CreatedAt))
 		table.AddSeparator()
 		table.AddRow("UPDATED AT", utils.ConvertTimePToDateTimeString(backup.UpdatedAt))

internal/cmd/volume/backup/list/list.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"github.com/goccy/go-yaml"
 	"github.com/spf13/cobra"
@@ -171,15 +172,24 @@ func outputResult(p *print.Printer, outputFormat string, backups []iaas.Backup)
 		table.SetHeader("ID", "NAME", "SIZE", "STATUS", "SNAPSHOT ID", "VOLUME ID", "AVAILABILITY ZONE", "LABELS", "CREATED AT", "UPDATED AT")
 
 		for _, backup := range backups {
+			var labelsString string
+			if backup.Labels != nil {
+				var labels []string
+				for key, value := range *backup.Labels {
+					labels = append(labels, fmt.Sprintf("%s: %s", key, value))
+				}
+				labelsString = strings.Join(labels, ", ")
+			}
+
 			table.AddRow(
 				utils.PtrString(backup.Id),
 				utils.PtrString(backup.Name),
-				utils.PtrByteSizeDefault((*int64)(backup.Size), ""),
+				utils.PtrByteSizeDefault(backup.Size, ""),
 				utils.PtrString(backup.Status),
 				utils.PtrString(backup.SnapshotId),
 				utils.PtrString(backup.VolumeId),
 				utils.PtrString(backup.AvailabilityZone),
-				utils.PtrStringDefault(backup.Labels, ""),
+				labelsString,
 				utils.ConvertTimePToDateTimeString(backup.CreatedAt),
 				utils.ConvertTimePToDateTimeString(backup.UpdatedAt),
 			)