Skip to content

Commit

Permalink
Add pagination options to all supported endpoints in sdk (#4463)
Browse files Browse the repository at this point in the history
  • Loading branch information
xoxys authored Nov 27, 2024
1 parent b23c724 commit 08bd52a
Show file tree
Hide file tree
Showing 16 changed files with 286 additions and 512 deletions.
5 changes: 4 additions & 1 deletion cli/admin/registry/registry_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"go.woodpecker-ci.org/woodpecker/v2/cli/common"
"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
)

var registryListCmd = &cli.Command{
Expand All @@ -42,7 +43,9 @@ func registryList(ctx context.Context, c *cli.Command) error {
return err
}

list, err := client.GlobalRegistryList()
opt := woodpecker.RegistryListOptions{}

list, err := client.GlobalRegistryList(opt)
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion cli/cron/cron_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"go.woodpecker-ci.org/woodpecker/v2/cli/common"
"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
)

var cronListCmd = &cli.Command{
Expand Down Expand Up @@ -52,7 +53,8 @@ func cronList(ctx context.Context, c *cli.Command) error {
if err != nil {
return err
}
list, err := client.CronList(repoID)
opt := woodpecker.CronListOptions{}
list, err := client.CronList(repoID, opt)
if err != nil {
return err
}
Expand Down
5 changes: 4 additions & 1 deletion cli/org/registry/registry_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"go.woodpecker-ci.org/woodpecker/v2/cli/common"
"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
)

var registryListCmd = &cli.Command{
Expand All @@ -49,7 +50,9 @@ func registryList(ctx context.Context, c *cli.Command) error {
return err
}

list, err := client.OrgRegistryList(orgID)
opt := woodpecker.RegistryListOptions{}

list, err := client.OrgRegistryList(orgID, opt)
if err != nil {
return err
}
Expand Down
5 changes: 4 additions & 1 deletion cli/repo/registry/registry_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"go.woodpecker-ci.org/woodpecker/v2/cli/common"
"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
)

var registryListCmd = &cli.Command{
Expand All @@ -49,7 +50,9 @@ func registryList(ctx context.Context, c *cli.Command) error {
return err
}

list, err := client.RegistryList(repoID)
opt := woodpecker.RegistryListOptions{}

list, err := client.RegistryList(repoID, opt)
if err != nil {
return err
}
Expand Down
8 changes: 5 additions & 3 deletions cli/secret/secret_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,22 @@ func secretList(ctx context.Context, c *cli.Command) error {
return err
}

opt := woodpecker.SecretListOptions{}

var list []*woodpecker.Secret
switch {
case global:
list, err = client.GlobalSecretList()
list, err = client.GlobalSecretList(opt)
if err != nil {
return err
}
case orgID != -1:
list, err = client.OrgSecretList(orgID)
list, err = client.OrgSecretList(orgID, opt)
if err != nil {
return err
}
default:
list, err = client.SecretList(repoID)
list, err = client.SecretList(repoID, opt)
if err != nil {
return err
}
Expand Down
5 changes: 4 additions & 1 deletion cli/user/user_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"go.woodpecker-ci.org/woodpecker/v2/cli/common"
"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
)

var userListCmd = &cli.Command{
Expand All @@ -39,7 +40,9 @@ func userList(ctx context.Context, c *cli.Command) error {
return err
}

users, err := client.UserList()
opt := woodpecker.UserListOptions{}

users, err := client.UserList(opt)
if err != nil || len(users) == 0 {
return err
}
Expand Down
Loading

0 comments on commit 08bd52a

Please sign in to comment.