Skip to content

feat: add default location column to server type table #1340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jooola wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −3
Open

feat: add default location column to server type table #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1142f5
feat: add location column to server type table
jooola Feb 24, 2026
578190a
feat: remove `storage_type` from default server types table columns
jooola Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/reference/manual/hcloud_server-type_list.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion internal/cmd/servertype/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ import (
"github.com/hetznercloud/cli/internal/hcapi2"
"github.com/hetznercloud/cli/internal/state"
"github.com/hetznercloud/hcloud-go/v2/hcloud"
"github.com/hetznercloud/hcloud-go/v2/hcloud/exp/kit/sliceutil"
"github.com/hetznercloud/hcloud-go/v2/hcloud/schema"
)

var ListCmd = &base.ListCmd[*hcloud.ServerType, schema.ServerType]{
ResourceNamePlural: "Server Types",
JSONKeyGetByName: "server_types",
DefaultColumns: []string{"id", "name", "cores", "cpu_type", "architecture", "memory", "disk", "storage_type"},
DefaultColumns: []string{"id", "name", "cores", "cpu_type", "architecture", "memory", "disk", "location"},
SortOption: nil, // Server Types do not support sorting

Fetch: func(s state.State, _ *pflag.FlagSet, listOpts hcloud.ListOpts, sorts []string) ([]*hcloud.ServerType, error) {
Expand All @@ -32,6 +33,13 @@ var ListCmd = &base.ListCmd[*hcloud.ServerType, schema.ServerType]{
OutputTable: func(t *output.Table[*hcloud.ServerType], _ hcapi2.Client) {
t.
AddAllowedFields(&hcloud.ServerType{}).
AddFieldFn("location", func(serverType *hcloud.ServerType) string {
locationNames := sliceutil.Transform(
serverType.Locations,
func(l hcloud.ServerTypeLocation) string { return l.Location.Name },
)
return strings.Join(locationNames, ",")
}).
AddFieldAlias("storagetype", "storage type").
AddFieldFn("memory", func(serverType *hcloud.ServerType) string {
return fmt.Sprintf("%.1f GB", serverType.Memory)
Expand Down
9 changes: 7 additions & 2 deletions internal/cmd/servertype/list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,18 @@ func TestList(t *testing.T) {
Memory: 8.0,
Disk: 80,
StorageType: hcloud.StorageTypeLocal,
Locations: []hcloud.ServerTypeLocation{
{Location: &hcloud.Location{ID: 1, Name: "fsn1"}},
{Location: &hcloud.Location{ID: 2, Name: "nbg1"}},
{Location: &hcloud.Location{ID: 3, Name: "hel1"}},
},
},
}, nil)

out, errOut, err := fx.Run(cmd, []string{})

expOut := `ID NAME CORES CPU TYPE ARCHITECTURE MEMORY DISK STORAGE TYPE
123 test 2 shared arm 8.0 GB 80 GB local
expOut := `ID NAME CORES CPU TYPE ARCHITECTURE MEMORY DISK LOCATION
123 test 2 shared arm 8.0 GB 80 GB fsn1,nbg1,hel1
`

require.NoError(t, err)
Expand Down
Loading