Skip to content

feat: make server commands respect workspace context #256

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

Merged
leechenghsiu merged 1 commit into from
Jun 17, 2026
Merged

feat: make server commands respect workspace context #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/cmd/server/get/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func runGet(f *cmdutil.Factory, opts *Options) error {

func runGetInteractive(f *cmdutil.Factory, opts *Options) error {
if opts.id == "" {
servers, err := f.ApiClient.ListServers(context.Background())
servers, err := f.ApiClient.ListServers(context.Background(), f.CurrentOwnerID())
if err != nil {
return fmt.Errorf("list servers failed: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/server/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func NewCmdList(f *cmdutil.Factory) *cobra.Command {
}

func runList(f *cmdutil.Factory) error {
servers, err := f.ApiClient.ListServers(context.Background())
servers, err := f.ApiClient.ListServers(context.Background(), f.CurrentOwnerID())
if err != nil {
return fmt.Errorf("list servers failed: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/server/reboot/reboot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func runReboot(f *cmdutil.Factory, opts *Options) error {

func runRebootInteractive(f *cmdutil.Factory, opts *Options) error {
if opts.id == "" {
servers, err := f.ApiClient.ListServers(context.Background())
servers, err := f.ApiClient.ListServers(context.Background(), f.CurrentOwnerID())
if err != nil {
return fmt.Errorf("list servers failed: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/server/rename/rename.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func runRename(f *cmdutil.Factory, opts *Options) error {

func runRenameInteractive(f *cmdutil.Factory, opts *Options) error {
if opts.id == "" {
servers, err := f.ApiClient.ListServers(context.Background())
servers, err := f.ApiClient.ListServers(context.Background(), f.CurrentOwnerID())
if err != nil {
return fmt.Errorf("list servers failed: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/server/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func runSSH(f *cmdutil.Factory, opts *Options) error {

func runSSHInteractive(f *cmdutil.Factory, opts *Options) error {
if opts.id == "" {
servers, err := f.ApiClient.ListServers(context.Background())
servers, err := f.ApiClient.ListServers(context.Background(), f.CurrentOwnerID())
if err != nil {
return fmt.Errorf("list servers failed: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/server/sshinfo/sshinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func runSSHInfo(f *cmdutil.Factory, opts *Options) error {
}

func runSSHInfoInteractive(f *cmdutil.Factory, opts *Options) error {
servers, err := f.ApiClient.ListServers(context.Background())
servers, err := f.ApiClient.ListServers(context.Background(), f.CurrentOwnerID())
if err != nil {
return fmt.Errorf("list servers failed: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type (
}

ServerAPI interface {
ListServers(ctx context.Context) (model.ServerListItems, error)
ListServers(ctx context.Context, ownerID string) (model.ServerListItems, error)
GetServer(ctx context.Context, id string) (*model.ServerDetail, error)
RebootServer(ctx context.Context, id string) error
RenameServer(ctx context.Context, id, name string) error
Expand Down
21 changes: 15 additions & 6 deletions pkg/api/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,25 @@ import (
"github.com/zeabur/cli/pkg/model"
)

func (c *client) ListServers(ctx context.Context) (model.ServerListItems, error) {
var query struct {
Servers model.ServerListItems `graphql:"servers"`
func (c *client) ListServers(ctx context.Context, ownerID string) (model.ServerListItems, error) {
if ownerID == "" {
var query struct {
Servers model.ServerListItems `graphql:"servers"`
}
if err := c.Query(ctx, &query, nil); err != nil {
return nil, err
}
return query.Servers, nil
}

err := c.Query(ctx, &query, nil)
if err != nil {
var query struct {
Servers model.ServerListItems `graphql:"servers(ownerID: $ownerID)"`
}
if err := c.Query(ctx, &query, V{
"ownerID": ObjectID(ownerID),
}); err != nil {
return nil, err
}

return query.Servers, nil
}

Expand Down