Skip to content

Commit

Permalink
sizes: Output the description field. (#1181)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewsomething committed Jun 8, 2022
1 parent 92bfbc3 commit dfb2a1d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
8 changes: 5 additions & 3 deletions commands/displayers/size.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ func (si *Size) JSON(out io.Writer) error {

func (si *Size) Cols() []string {
return []string{
"Slug", "Memory", "VCPUs", "Disk", "PriceMonthly", "PriceHourly",
"Slug", "Description", "Memory", "VCPUs", "Disk", "PriceMonthly", "PriceHourly",
}
}

func (si *Size) ColMap() map[string]string {
return map[string]string{
"Slug": "Slug", "Memory": "Memory", "VCPUs": "VCPUs",
"Slug": "Slug", "Description": "Description",
"Memory": "Memory", "VCPUs": "VCPUs",
"Disk": "Disk", "PriceMonthly": "Price Monthly",
"PriceHourly": "Price Hourly",
}
Expand All @@ -49,7 +50,8 @@ func (si *Size) KV() []map[string]interface{} {

for _, s := range si.Sizes {
o := map[string]interface{}{
"Slug": s.Slug, "Memory": s.Memory, "VCPUs": s.Vcpus,
"Slug": s.Slug, "Description": s.Description,
"Memory": s.Memory, "VCPUs": s.Vcpus,
"Disk": s.Disk, "PriceMonthly": fmt.Sprintf("%0.2f", s.PriceMonthly),
"PriceHourly": s.PriceHourly,
}
Expand Down
12 changes: 7 additions & 5 deletions integration/size_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ const (
{
"slug": "512mb",
"memory": 512,
"description": "Basic",
"vcpus": 1,
"disk": 20,
"transfer": 1,
Expand All @@ -119,6 +120,7 @@ const (
{
"slug": "s-1vcpu-1gb",
"memory": 1024,
"description": "Basic",
"vcpus": 1,
"disk": 25,
"transfer": 1,
Expand All @@ -137,9 +139,9 @@ const (
}
`
sizeListOutput = `
Slug Memory VCPUs Disk Price Monthly Price Hourly
512mb 512 1 20 5.00 0.007440
s-1vcpu-1gb 1024 1 25 5.00 0.007440
Slug Description Memory VCPUs Disk Price Monthly Price Hourly
512mb Basic 512 1 20 5.00 0.007440
s-1vcpu-1gb Basic 1024 1 25 5.00 0.007440
`
sizeListFormatOutput = `
Slug Price Monthly
Expand All @@ -148,7 +150,7 @@ s-1vcpu-1gb 5.00
`
sizeListNoHeaderOutput = `
512mb 512 1 20 5.00 0.007440
s-1vcpu-1gb 1024 1 25 5.00 0.007440
512mb Basic 512 1 20 5.00 0.007440
s-1vcpu-1gb Basic 1024 1 25 5.00 0.007440
`
)

0 comments on commit dfb2a1d

Please sign in to comment.