Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions cli/admin/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/urfave/cli/v3"

"go.woodpecker-ci.org/woodpecker/v3/cli/admin/loglevel"
"go.woodpecker-ci.org/woodpecker/v3/cli/admin/org"
"go.woodpecker-ci.org/woodpecker/v3/cli/admin/registry"
"go.woodpecker-ci.org/woodpecker/v3/cli/admin/secret"
"go.woodpecker-ci.org/woodpecker/v3/cli/admin/user"
Expand All @@ -29,6 +30,7 @@ var Command = &cli.Command{
Usage: "manage server settings",
Commands: []*cli.Command{
loglevel.Command,
org.Command,
registry.Command,
secret.Command,
user.Command,
Expand Down
71 changes: 71 additions & 0 deletions cli/admin/org/org_list.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package org

import (
"context"
"os"
"strings"
"text/template"

"github.com/urfave/cli/v3"

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

var Command = &cli.Command{
Name: "org",
Usage: "manage organizations",
Commands: []*cli.Command{
orgListCmd,
},
}

var orgListCmd = &cli.Command{
Name: "ls",
Usage: "list organizations",
ArgsUsage: "",
Action: orgList,
Flags: []cli.Flag{
common.FormatFlag(tmplOrgList, true),
},
}

func orgList(ctx context.Context, c *cli.Command) error {
format := c.String("format") + "\n"

client, err := internal.NewClient(ctx, c)
if err != nil {
return err
}

opt := woodpecker.ListOptions{}

list, err := client.OrgList(opt)
if err != nil {
return err
}

tmpl, err := template.New("_").Funcs(orgFuncMap).Parse(format)
if err != nil {
return err
}

for _, org := range list {
if err := tmpl.Execute(os.Stdout, org); err != nil {
return err
}
}
return nil
}

// Template for org list items.
var tmplOrgList = "\x1b[33m{{ .Name }} \x1b[0m" + `
Organization ID: {{ .ID }}
`

var orgFuncMap = template.FuncMap{
"list": func(s []string) string {
return strings.Join(s, ", ")
},
}
3 changes: 3 additions & 0 deletions woodpecker-go/woodpecker/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ type Client interface {
// OrgLookup returns an organization id by name.
OrgLookup(orgName string) (*Org, error)

// OrgList returns a list of all organizations.
OrgList(opt ListOptions) ([]*Org, error)

// OrgSecret returns an organization secret by name.
OrgSecret(orgID int64, secret string) (*Secret, error)

Expand Down
30 changes: 30 additions & 0 deletions woodpecker-go/woodpecker/mocks/client.go

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

9 changes: 9 additions & 0 deletions woodpecker-go/woodpecker/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
const (
pathOrg = "%s/api/orgs/%d"
pathOrgLookup = "%s/api/orgs/lookup/%s"
pathOrgList = "%s/api/orgs"
pathOrgSecrets = "%s/api/orgs/%d/secrets"
pathOrgSecret = "%s/api/orgs/%d/secrets/%s"
pathOrgRegistries = "%s/api/orgs/%d/registries"
Expand All @@ -30,6 +31,14 @@ func (c *client) OrgLookup(name string) (*Org, error) {
return out, err
}

func (c *client) OrgList(opt ListOptions) ([]*Org, error) {
var out []*Org
uri, _ := url.Parse(fmt.Sprintf(pathOrgList, c.addr))
uri.RawQuery = opt.getURLQuery().Encode()
err := c.get(uri.String(), &out)
return out, err
}

// OrgSecret returns an organization secret by name.
func (c *client) OrgSecret(orgID int64, secret string) (*Secret, error) {
out := new(Secret)
Expand Down