Merge branch 'origin/main' into 'next-release/main'

cli/admin/admin.go

@@ -17,14 +17,20 @@ package admin
 import (
 	"github.com/urfave/cli/v3"
 
+	"go.woodpecker-ci.org/woodpecker/v2/cli/admin/loglevel"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/admin/registry"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/admin/secret"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/admin/user"
 )
 
 // Command exports the admin command set.
 var Command = &cli.Command{
 	Name:  "admin",
-	Usage: "administer server settings",
+	Usage: "manage server settings",
 	Commands: []*cli.Command{
+		secret.Command,
 		registry.Command,
+		user.Command,
+		loglevel.Command,
 	},
 }

cli/admin/secret/secret.go

@@ -0,0 +1,32 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"github.com/urfave/cli/v3"
+)
+
+// Command exports the secret command.
+var Command = &cli.Command{
+	Name:  "secret",
+	Usage: "manage global secrets",
+	Commands: []*cli.Command{
+		secretCreateCmd,
+		secretDeleteCmd,
+		secretUpdateCmd,
+		secretInfoCmd,
+		secretListCmd,
+	},
+}

cli/admin/secret/secret_add.go

@@ -0,0 +1,82 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
+)
+
+var secretCreateCmd = &cli.Command{
+	Name:      "add",
+	Usage:     "adds a secret",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretCreate,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "value",
+			Usage: "secret value",
+		},
+		&cli.StringSliceFlag{
+			Name:  "event",
+			Usage: "secret limited to these events",
+		},
+		&cli.StringSliceFlag{
+			Name:  "image",
+			Usage: "secret limited to these images",
+		},
+	},
+}
+
+func secretCreate(ctx context.Context, c *cli.Command) error {
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	secret := &woodpecker.Secret{
+		Name:   strings.ToLower(c.String("name")),
+		Value:  c.String("value"),
+		Images: c.StringSlice("image"),
+		Events: c.StringSlice("event"),
+	}
+	if len(secret.Events) == 0 {
+		secret.Events = defaultSecretEvents
+	}
+	if strings.HasPrefix(secret.Value, "@") {
+		path := strings.TrimPrefix(secret.Value, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		secret.Value = string(out)
+	}
+
+	_, err = client.GlobalSecretCreate(secret)
+	return err
+}
+
+var defaultSecretEvents = []string{
+	woodpecker.EventPush,
+	woodpecker.EventTag,
+	woodpecker.EventRelease,
+	woodpecker.EventDeploy,
+}

cli/admin/secret/secret_info.go

@@ -0,0 +1,68 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"fmt"
+	"html/template"
+	"os"
+
+	"github.com/urfave/cli/v3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var secretInfoCmd = &cli.Command{
+	Name:      "info",
+	Usage:     "display secret info",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretInfo,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "name",
+			Usage: "secret name",
+		},
+		common.FormatFlag(tmplSecretList, true),
+	},
+}
+
+func secretInfo(ctx context.Context, c *cli.Command) error {
+	var (
+		secretName = c.String("name")
+		format     = c.String("format") + "\n"
+	)
+
+	if secretName == "" {
+		return fmt.Errorf("secret name is missing")
+	}
+
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	secret, err := client.GlobalSecret(secretName)
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Funcs(secretFuncMap).Parse(format)
+	if err != nil {
+		return err
+	}
+	return tmpl.Execute(os.Stdout, secret)
+}

cli/admin/secret/secret_list.go

@@ -33,12 +33,6 @@ var secretListCmd = &cli.Command{
 	ArgsUsage: "[repo-id|repo-full-name]",
 	Action:    secretList,
 	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "global",
-			Usage: "global secret",
-		},
-		common.OrgFlag,
-		common.RepoFlag,
 		common.FormatFlag(tmplSecretList, true),
 	},
 }
@@ -51,30 +45,11 @@ func secretList(ctx context.Context, c *cli.Command) error {
 		return err
 	}
 
-	global, orgID, repoID, err := parseTargetArgs(client, c)
-	if err != nil {
-		return err
-	}
-
 	opt := woodpecker.SecretListOptions{}
 
-	var list []*woodpecker.Secret
+	list, err := client.GlobalSecretList(opt)
-	switch {
+	if err != nil {
-	case global:
+		return err
-		list, err = client.GlobalSecretList(opt)
-		if err != nil {
-			return err
-		}
-	case orgID != -1:
-		list, err = client.OrgSecretList(orgID, opt)
-		if err != nil {
-			return err
-		}
-	default:
-		list, err = client.SecretList(repoID, opt)
-		if err != nil {
-			return err
-		}
 	}
 
 	tmpl, err := template.New("_").Funcs(secretFuncMap).Parse(format)

cli/admin/secret/secret_rm.go

@@ -0,0 +1,47 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+
+	"github.com/urfave/cli/v3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var secretDeleteCmd = &cli.Command{
+	Name:      "rm",
+	Usage:     "remove a secret",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretDelete,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "name",
+			Usage: "secret name",
+		},
+	},
+}
+
+func secretDelete(ctx context.Context, c *cli.Command) error {
+	secretName := c.String("name")
+
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	return client.GlobalSecretDelete(secretName)
+}

cli/admin/secret/secret_set.go

@@ -0,0 +1,76 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
+)
+
+var secretUpdateCmd = &cli.Command{
+	Name:      "update",
+	Usage:     "update a secret",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretUpdate,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "name",
+			Usage: "secret name",
+		},
+		&cli.StringFlag{
+			Name:  "value",
+			Usage: "secret value",
+		},
+		&cli.StringSliceFlag{
+			Name:  "event",
+			Usage: "secret limited to these events",
+		},
+		&cli.StringSliceFlag{
+			Name:  "image",
+			Usage: "secret limited to these images",
+		},
+	},
+}
+
+func secretUpdate(ctx context.Context, c *cli.Command) error {
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	secret := &woodpecker.Secret{
+		Name:   strings.ToLower(c.String("name")),
+		Value:  c.String("value"),
+		Images: c.StringSlice("image"),
+		Events: c.StringSlice("event"),
+	}
+	if strings.HasPrefix(secret.Value, "@") {
+		path := strings.TrimPrefix(secret.Value, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		secret.Value = string(out)
+	}
+
+	_, err = client.GlobalSecretUpdate(secret)
+	return err
+}

cli/org/org.go

@@ -18,6 +18,7 @@ import (
 	"github.com/urfave/cli/v3"
 
 	"go.woodpecker-ci.org/woodpecker/v2/cli/org/registry"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/org/secret"
 )
 
 // Command exports the org command set.
@@ -26,5 +27,6 @@ var Command = &cli.Command{
 	Usage: "manage organizations",
 	Commands: []*cli.Command{
 		registry.Command,
+		secret.Command,
 	},
 }

cli/org/secret/secret.go

@@ -0,0 +1,60 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"strconv"
+
+	"github.com/urfave/cli/v3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
+)
+
+// Command exports the secret command.
+var Command = &cli.Command{
+	Name:  "secret",
+	Usage: "manage secrets",
+	Commands: []*cli.Command{
+		secretCreateCmd,
+		secretDeleteCmd,
+		secretUpdateCmd,
+		secretInfoCmd,
+		secretListCmd,
+	},
+}
+
+func parseTargetArgs(client woodpecker.Client, c *cli.Command) (orgID int64, err error) {
+	orgIDOrName := c.String("organization")
+	if orgIDOrName == "" {
+		orgIDOrName = c.Args().First()
+	}
+
+	if orgIDOrName == "" {
+		if err := cli.ShowSubcommandHelp(c); err != nil {
+			return -1, err
+		}
+	}
+
+	if orgID, err := strconv.ParseInt(orgIDOrName, 10, 64); err == nil {
+		return orgID, nil
+	}
+
+	org, err := client.OrgLookup(orgIDOrName)
+	if err != nil {
+		return -1, err
+	}
+
+	return org.ID, nil
+}

cli/org/secret/secret_add.go

@@ -0,0 +1,93 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v3"
+
+	"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 secretCreateCmd = &cli.Command{
+	Name:      "add",
+	Usage:     "adds a secret",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretCreate,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "name",
+			Usage: "secret name",
+		},
+		&cli.StringFlag{
+			Name:  "value",
+			Usage: "secret value",
+		},
+		&cli.StringSliceFlag{
+			Name:  "event",
+			Usage: "secret limited to these events",
+		},
+		&cli.StringSliceFlag{
+			Name:  "image",
+			Usage: "secret limited to these images",
+		},
+	},
+}
+
+func secretCreate(ctx context.Context, c *cli.Command) error {
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	secret := &woodpecker.Secret{
+		Name:   strings.ToLower(c.String("name")),
+		Value:  c.String("value"),
+		Images: c.StringSlice("image"),
+		Events: c.StringSlice("event"),
+	}
+	if len(secret.Events) == 0 {
+		secret.Events = defaultSecretEvents
+	}
+	if strings.HasPrefix(secret.Value, "@") {
+		path := strings.TrimPrefix(secret.Value, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		secret.Value = string(out)
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	_, err = client.OrgSecretCreate(orgID, secret)
+	return err
+}
+
+var defaultSecretEvents = []string{
+	woodpecker.EventPush,
+	woodpecker.EventTag,
+	woodpecker.EventRelease,
+	woodpecker.EventDeploy,
+}

cli/org/secret/secret_info.go

@@ -0,0 +1,74 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"fmt"
+	"html/template"
+	"os"
+
+	"github.com/urfave/cli/v3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var secretInfoCmd = &cli.Command{
+	Name:      "info",
+	Usage:     "display secret info",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretInfo,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "name",
+			Usage: "secret name",
+		},
+		common.FormatFlag(tmplSecretList, true),
+	},
+}
+
+func secretInfo(ctx context.Context, c *cli.Command) error {
+	var (
+		secretName = c.String("name")
+		format     = c.String("format") + "\n"
+	)
+
+	if secretName == "" {
+		return fmt.Errorf("secret name is missing")
+	}
+
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	secret, err := client.OrgSecret(orgID, secretName)
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Funcs(secretFuncMap).Parse(format)
+	if err != nil {
+		return err
+	}
+	return tmpl.Execute(os.Stdout, secret)
+}

cli/org/secret/secret_list.go

@@ -0,0 +1,87 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"html/template"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v3"
+
+	"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 secretListCmd = &cli.Command{
+	Name:      "ls",
+	Usage:     "list secrets",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretList,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		common.FormatFlag(tmplSecretList, true),
+	},
+}
+
+func secretList(ctx context.Context, c *cli.Command) error {
+	format := c.String("format") + "\n"
+
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	opt := woodpecker.SecretListOptions{}
+
+	list, err := client.OrgSecretList(orgID, opt)
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Funcs(secretFuncMap).Parse(format)
+	if err != nil {
+		return err
+	}
+	for _, secret := range list {
+		if err := tmpl.Execute(os.Stdout, secret); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// Template for secret list items.
+var tmplSecretList = "\x1b[33m{{ .Name }} \x1b[0m" + `
+Events: {{ list .Events }}
+{{- if .Images }}
+Images: {{ list .Images }}
+{{- else }}
+Images: <any>
+{{- end }}
+`
+
+var secretFuncMap = template.FuncMap{
+	"list": func(s []string) string {
+		return strings.Join(s, ", ")
+	},
+}

cli/org/secret/secret_rm.go

@@ -0,0 +1,54 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+
+	"github.com/urfave/cli/v3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var secretDeleteCmd = &cli.Command{
+	Name:      "rm",
+	Usage:     "remove a secret",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretDelete,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "name",
+			Usage: "secret name",
+		},
+	},
+}
+
+func secretDelete(ctx context.Context, c *cli.Command) error {
+	secretName := c.String("name")
+
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	return client.OrgSecretDelete(orgID, secretName)
+}

cli/org/secret/secret_set.go

@@ -0,0 +1,83 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v3"
+
+	"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 secretUpdateCmd = &cli.Command{
+	Name:      "update",
+	Usage:     "update a secret",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretUpdate,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "name",
+			Usage: "secret name",
+		},
+		&cli.StringFlag{
+			Name:  "value",
+			Usage: "secret value",
+		},
+		&cli.StringSliceFlag{
+			Name:  "event",
+			Usage: "secret limited to these events",
+		},
+		&cli.StringSliceFlag{
+			Name:  "image",
+			Usage: "secret limited to these images",
+		},
+	},
+}
+
+func secretUpdate(ctx context.Context, c *cli.Command) error {
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	secret := &woodpecker.Secret{
+		Name:   strings.ToLower(c.String("name")),
+		Value:  c.String("value"),
+		Images: c.StringSlice("image"),
+		Events: c.StringSlice("event"),
+	}
+	if strings.HasPrefix(secret.Value, "@") {
+		path := strings.TrimPrefix(secret.Value, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		secret.Value = string(out)
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	_, err = client.OrgSecretUpdate(orgID, secret)
+	return err
+}

cli/pipeline/pipeline.go

@@ -23,6 +23,8 @@ import (
 	"github.com/urfave/cli/v3"
 
 	"go.woodpecker-ci.org/woodpecker/v2/cli/output"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/pipeline/deploy"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/pipeline/log"
 	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
 )
 
@@ -43,6 +45,8 @@ var Command = &cli.Command{
 		pipelineKillCmd,
 		pipelinePsCmd,
 		pipelineCreateCmd,
+		log.Command,
+		deploy.Command,
 	},
 }
 

cli/repo/repo.go

@@ -17,7 +17,9 @@ package repo
 import (
 	"github.com/urfave/cli/v3"
 
+	"go.woodpecker-ci.org/woodpecker/v2/cli/repo/cron"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/repo/registry"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/repo/secret"
 )
 
 // Command exports the repository command.
@@ -34,5 +36,7 @@ var Command = &cli.Command{
 		repoChownCmd,
 		repoSyncCmd,
 		registry.Command,
+		secret.Command,
+		cron.Command,
 	},
 }

cli/repo/secret/secret.go

@@ -15,10 +15,6 @@
 package secret
 
 import (
-	"fmt"
-	"strconv"
-	"strings"
-
 	"github.com/urfave/cli/v3"
 
 	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
@@ -38,46 +34,11 @@ var Command = &cli.Command{
 	},
 }
 
-func parseTargetArgs(client woodpecker.Client, c *cli.Command) (global bool, orgID, repoID int64, err error) {
+func parseTargetArgs(client woodpecker.Client, c *cli.Command) (repoID int64, err error) {
-	if c.Bool("global") {
-		return true, -1, -1, nil
-	}
-
 	repoIDOrFullName := c.String("repository")
 	if repoIDOrFullName == "" {
 		repoIDOrFullName = c.Args().First()
 	}
 
-	orgIDOrName := c.String("organization")
+	return internal.ParseRepo(client, repoIDOrFullName)
-	if orgIDOrName == "" && repoIDOrFullName == "" {
-		if err := cli.ShowSubcommandHelp(c); err != nil {
-			return false, -1, -1, err
-		}
-
-		return false, -1, -1, fmt.Errorf("missing arguments")
-	}
-
-	if orgIDOrName != "" && repoIDOrFullName == "" {
-		if orgID, err := strconv.ParseInt(orgIDOrName, 10, 64); err == nil {
-			return false, orgID, -1, nil
-		}
-
-		org, err := client.OrgLookup(orgIDOrName)
-		if err != nil {
-			return false, -1, -1, err
-		}
-
-		return false, org.ID, -1, nil
-	}
-
-	if orgIDOrName != "" && !strings.Contains(repoIDOrFullName, "/") {
-		repoIDOrFullName = orgIDOrName + "/" + repoIDOrFullName
-	}
-
-	repoID, err = internal.ParseRepo(client, repoIDOrFullName)
-	if err != nil {
-		return false, -1, -1, err
-	}
-
-	return false, -1, repoID, nil
 }

cli/repo/secret/secret_add.go

@@ -32,11 +32,6 @@ var secretCreateCmd = &cli.Command{
 	ArgsUsage: "[repo-id|repo-full-name]",
 	Action:    secretCreate,
 	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "global",
-			Usage: "global secret",
-		},
-		common.OrgFlag,
 		common.RepoFlag,
 		&cli.StringFlag{
 			Name:  "name",
@@ -81,21 +76,11 @@ func secretCreate(ctx context.Context, c *cli.Command) error {
 		secret.Value = string(out)
 	}
 
-	global, orgID, repoID, err := parseTargetArgs(client, c)
+	repoID, err := parseTargetArgs(client, c)
 	if err != nil {
 		return err
 	}
 
-	if global {
-		_, err = client.GlobalSecretCreate(secret)
-		return err
-	}
-
-	if orgID != -1 {
-		_, err = client.OrgSecretCreate(orgID, secret)
-		return err
-	}
-
 	_, err = client.SecretCreate(repoID, secret)
 	return err
 }

cli/repo/secret/secret_info.go

@@ -24,7 +24,6 @@ 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 secretInfoCmd = &cli.Command{
@@ -33,11 +32,6 @@ var secretInfoCmd = &cli.Command{
 	ArgsUsage: "[repo-id|repo-full-name]",
 	Action:    secretInfo,
 	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "global",
-			Usage: "global secret",
-		},
-		common.OrgFlag,
 		common.RepoFlag,
 		&cli.StringFlag{
 			Name:  "name",
@@ -62,28 +56,14 @@ func secretInfo(ctx context.Context, c *cli.Command) error {
 		return err
 	}
 
-	global, orgID, repoID, err := parseTargetArgs(client, c)
+	repoID, err := parseTargetArgs(client, c)
 	if err != nil {
 		return err
 	}
 
-	var secret *woodpecker.Secret
+	secret, err := client.Secret(repoID, secretName)
-	switch {
+	if err != nil {
-	case global:
+		return err
-		secret, err = client.GlobalSecret(secretName)
-		if err != nil {
-			return err
-		}
-	case orgID != -1:
-		secret, err = client.OrgSecret(orgID, secretName)
-		if err != nil {
-			return err
-		}
-	default:
-		secret, err = client.Secret(repoID, secretName)
-		if err != nil {
-			return err
-		}
 	}
 
 	tmpl, err := template.New("_").Funcs(secretFuncMap).Parse(format)

cli/repo/secret/secret_list.go

@@ -0,0 +1,87 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package secret
+
+import (
+	"context"
+	"html/template"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v3"
+
+	"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 secretListCmd = &cli.Command{
+	Name:      "ls",
+	Usage:     "list secrets",
+	ArgsUsage: "[repo-id|repo-full-name]",
+	Action:    secretList,
+	Flags: []cli.Flag{
+		common.RepoFlag,
+		common.FormatFlag(tmplSecretList, true),
+	},
+}
+
+func secretList(ctx context.Context, c *cli.Command) error {
+	format := c.String("format") + "\n"
+
+	client, err := internal.NewClient(ctx, c)
+	if err != nil {
+		return err
+	}
+
+	repoID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	opt := woodpecker.SecretListOptions{}
+
+	list, err := client.SecretList(repoID, opt)
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Funcs(secretFuncMap).Parse(format)
+	if err != nil {
+		return err
+	}
+	for _, secret := range list {
+		if err := tmpl.Execute(os.Stdout, secret); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// Template for secret list items.
+var tmplSecretList = "\x1b[33m{{ .Name }} \x1b[0m" + `
+Events: {{ list .Events }}
+{{- if .Images }}
+Images: {{ list .Images }}
+{{- else }}
+Images: <any>
+{{- end }}
+`
+
+var secretFuncMap = template.FuncMap{
+	"list": func(s []string) string {
+		return strings.Join(s, ", ")
+	},
+}

cli/repo/secret/secret_rm.go

@@ -29,11 +29,6 @@ var secretDeleteCmd = &cli.Command{
 	ArgsUsage: "[repo-id|repo-full-name]",
 	Action:    secretDelete,
 	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "global",
-			Usage: "global secret",
-		},
-		common.OrgFlag,
 		common.RepoFlag,
 		&cli.StringFlag{
 			Name:  "name",
@@ -50,16 +45,10 @@ func secretDelete(ctx context.Context, c *cli.Command) error {
 		return err
 	}
 
-	global, orgID, repoID, err := parseTargetArgs(client, c)
+	repoID, err := parseTargetArgs(client, c)
 	if err != nil {
 		return err
 	}
 
-	if global {
-		return client.GlobalSecretDelete(secretName)
-	}
-	if orgID != -1 {
-		return client.OrgSecretDelete(orgID, secretName)
-	}
 	return client.SecretDelete(repoID, secretName)
 }

cli/repo/secret/secret_set.go

@@ -32,11 +32,6 @@ var secretUpdateCmd = &cli.Command{
 	ArgsUsage: "[repo-id|repo-full-name]",
 	Action:    secretUpdate,
 	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "global",
-			Usage: "global secret",
-		},
-		common.OrgFlag,
 		common.RepoFlag,
 		&cli.StringFlag{
 			Name:  "name",
@@ -78,19 +73,11 @@ func secretUpdate(ctx context.Context, c *cli.Command) error {
 		secret.Value = string(out)
 	}
 
-	global, orgID, repoID, err := parseTargetArgs(client, c)
+	repoID, err := parseTargetArgs(client, c)
 	if err != nil {
 		return err
 	}
 
-	if global {
-		_, err = client.GlobalSecretUpdate(secret)
-		return err
-	}
-	if orgID != -1 {
-		_, err = client.OrgSecretUpdate(orgID, secret)
-		return err
-	}
 	_, err = client.SecretUpdate(repoID, secret)
 	return err
 }

cmd/cli/app.go

@@ -19,20 +19,14 @@ import (
 
 	"go.woodpecker-ci.org/woodpecker/v2/cli/admin"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
-	"go.woodpecker-ci.org/woodpecker/v2/cli/cron"
-	"go.woodpecker-ci.org/woodpecker/v2/cli/deploy"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/exec"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/info"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/lint"
-	"go.woodpecker-ci.org/woodpecker/v2/cli/log"
-	"go.woodpecker-ci.org/woodpecker/v2/cli/loglevel"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/org"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/pipeline"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/repo"
-	"go.woodpecker-ci.org/woodpecker/v2/cli/secret"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/setup"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/update"
-	"go.woodpecker-ci.org/woodpecker/v2/cli/user"
 	"go.woodpecker-ci.org/woodpecker/v2/version"
 )
 
@@ -52,15 +46,9 @@ func newApp() *cli.Command {
 		org.Command,
 		repo.Command,
 		pipeline.Command,
-		log.Command,
-		deploy.Command,
 		exec.Command,
 		info.Command,
-		secret.Command,
-		user.Command,
 		lint.Command,
-		loglevel.Command,
-		cron.Command,
 		setup.Command,
 		update.Command,
 	}