Skip to content
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

Jump to bottom

feat(server): allow to filter list by server status #629

Merged
merged 3 commits into from
Dec 12, 2023
Merged

feat(server): allow to filter list by server status #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
857c88c
feat(server): allow to filter list by server status
phm07 Dec 12, 2023
f88a7b1
Add test
phm07 Dec 12, 2023
d863461
Add auto completion suggestions
phm07 Dec 12, 2023
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
33 changes: 32 additions & 1 deletion internal/cmd/server/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,63 @@ package server
import (
"context"
"fmt"
"slices"
"strconv"
"strings"
"time"

humanize "github.com/dustin/go-humanize"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/hetznercloud/cli/internal/cmd/base"
"github.com/hetznercloud/cli/internal/cmd/cmpl"
"github.com/hetznercloud/cli/internal/cmd/output"
"github.com/hetznercloud/cli/internal/cmd/util"
"github.com/hetznercloud/cli/internal/hcapi2"
"github.com/hetznercloud/hcloud-go/v2/hcloud"
"github.com/hetznercloud/hcloud-go/v2/hcloud/schema"
)

var serverStatusStrings = []string{
string(hcloud.ServerStatusInitializing),
string(hcloud.ServerStatusOff),
string(hcloud.ServerStatusRunning),
string(hcloud.ServerStatusStarting),
string(hcloud.ServerStatusStopping),
string(hcloud.ServerStatusMigrating),
string(hcloud.ServerStatusRebuilding),
string(hcloud.ServerStatusDeleting),
string(hcloud.ServerStatusUnknown),
}

var ListCmd = base.ListCmd{
ResourceNamePlural: "Servers",
JSONKeyGetByName: "servers",

DefaultColumns: []string{"id", "name", "status", "ipv4", "ipv6", "private_net", "datacenter", "age"},

Fetch: func(ctx context.Context, client hcapi2.Client, _ *pflag.FlagSet, listOpts hcloud.ListOpts, sorts []string) ([]interface{}, error) {
AdditionalFlags: func(cmd *cobra.Command) {
cmd.Flags().StringSlice("status", nil, "Only servers with one of these statuses are displayed")
apricote marked this conversation as resolved.
Show resolved Hide resolved
_ = cmd.RegisterFlagCompletionFunc("status", cmpl.SuggestCandidates(serverStatusStrings...))
},

Fetch: func(ctx context.Context, client hcapi2.Client, flags *pflag.FlagSet, listOpts hcloud.ListOpts, sorts []string) ([]interface{}, error) {
statuses, _ := flags.GetStringSlice("status")

opts := hcloud.ServerListOpts{ListOpts: listOpts}
if len(sorts) > 0 {
opts.Sort = sorts
}
if len(statuses) > 0 {
for _, status := range statuses {
if slices.Contains(serverStatusStrings, status) {
opts.Status = append(opts.Status, hcloud.ServerStatus(status))
} else {
return nil, fmt.Errorf("invalid status: %s", status)
}
}
}
servers, err := client.Server().AllWithOpts(ctx, opts)

var resources []interface{}
Expand Down
3 changes: 2 additions & 1 deletion internal/cmd/server/list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ func TestList(t *testing.T) {
hcloud.ServerListOpts{
ListOpts: hcloud.ListOpts{PerPage: 50},
Sort: []string{"id:asc"},
Status: []hcloud.ServerStatus{hcloud.ServerStatusRunning},
},
).
Return([]*hcloud.Server{
Expand All @@ -45,7 +46,7 @@ func TestList(t *testing.T) {
},
}, nil)

out, _, err := fx.Run(cmd, []string{})
out, _, err := fx.Run(cmd, []string{"--status", "running"})

expOut := `ID NAME STATUS IPV4 IPV6 PRIVATE NET DATACENTER AGE
123 test running 192.168.2.1 - - fsn1-dc14 20s
Expand Down
Loading