Skip to content

Commit b3b4c69

Browse files
committed
refactoring using new util func PtrGigaByteSizeDefault
1 parent 67b8a50 commit b3b4c69

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func outputResult(p *print.Printer, outputFormat string, backup *iaas.Backup) er
128128
table.AddSeparator()
129129
table.AddRow("NAME", utils.PtrString(backup.Name))
130130
table.AddSeparator()
131-
table.AddRow("SIZE", utils.PtrByteSizeDefault(backup.Size, ""))
131+
table.AddRow("SIZE", utils.PtrGigaByteSizeDefault(backup.Size, "n/a"))
132132
table.AddSeparator()
133133
table.AddRow("STATUS", utils.PtrString(backup.Status))
134134
table.AddSeparator()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func outputResult(p *print.Printer, outputFormat string, backups []iaas.Backup)
184184
table.AddRow(
185185
utils.PtrString(backup.Id),
186186
utils.PtrString(backup.Name),
187-
utils.PtrByteSizeDefault(backup.Size, ""),
187+
utils.PtrGigaByteSizeDefault(backup.Size, "n/a"),
188188
utils.PtrString(backup.Status),
189189
utils.PtrString(backup.SnapshotId),
190190
utils.PtrString(backup.VolumeId),

internal/cmd/volume/snapshot/describe/describe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func outputResult(p *print.Printer, outputFormat string, snapshot *iaas.Snapshot
127127
table.AddSeparator()
128128
table.AddRow("NAME", utils.PtrString(snapshot.Name))
129129
table.AddSeparator()
130-
table.AddRow("SIZE", utils.PtrByteSizeDefault(snapshot.Size, ""))
130+
table.AddRow("SIZE", utils.PtrGigaByteSizeDefault(snapshot.Size, "n/a"))
131131
table.AddSeparator()
132132
table.AddRow("STATUS", utils.PtrString(snapshot.Status))
133133
table.AddSeparator()

internal/cmd/volume/snapshot/list/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func outputResult(p *print.Printer, outputFormat string, snapshots []iaas.Snapsh
182182
table.AddRow(
183183
utils.PtrString(snapshot.Id),
184184
utils.PtrString(snapshot.Name),
185-
utils.PtrByteSizeDefault(snapshot.Size, ""),
185+
utils.PtrGigaByteSizeDefault(snapshot.Size, "n/a"),
186186
utils.PtrString(snapshot.Status),
187187
utils.PtrString(snapshot.VolumeId),
188188
labelsString,

internal/pkg/utils/utils.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ func PtrByteSizeDefault(size *int64, defaultValue string) string {
119119
return bytesize.New(float64(*size)).String()
120120
}
121121

122+
// PtrGigaByteSizeDefault return the value of an int64 pointer to a string representation of gigabytes. If the pointer is nil,
123+
// it returns the [defaultValue].
124+
func PtrGigaByteSizeDefault(size *int64, defaultValue string) string {
125+
if size == nil {
126+
return defaultValue
127+
}
128+
return (bytesize.New(float64(*size)) * bytesize.GB).String()
129+
}
130+
122131
// Base64Encode encodes a []byte to a base64 representation as string
123132
func Base64Encode(message []byte) string {
124133
b := make([]byte, base64.StdEncoding.EncodedLen(len(message)))

0 commit comments

Comments
 (0)