Global and organization registries (#1672)

Co-authored-by: Anbraten <6918444+anbraten@users.noreply.github.com>

cli/admin/admin.go

@@ -0,0 +1,30 @@
+// Copyright 2024 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 admin
+
+import (
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/admin/registry"
+)
+
+// Command exports the admin command set.
+var Command = &cli.Command{
+	Name:  "admin",
+	Usage: "administer server settings",
+	Subcommands: []*cli.Command{
+		registry.Command,
+	},
+}

cli/admin/registry/registry.go

@@ -1,4 +1,4 @@
-// Copyright 2023 Woodpecker Authors
+// Copyright 2024 Woodpecker Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import (
 // Command exports the registry command set.
 var Command = &cli.Command{
 	Name:  "registry",
-	Usage: "manage registries",
+	Usage: "manage global registries",
 	Subcommands: []*cli.Command{
 		registryCreateCmd,
 		registryDeleteCmd,

cli/admin/registry/registry_add.go

@@ -0,0 +1,75 @@
+// Copyright 2024 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 registry
+
+import (
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
+)
+
+var registryCreateCmd = &cli.Command{
+	Name:   "add",
+	Usage:  "adds a registry",
+	Action: registryCreate,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+		&cli.StringFlag{
+			Name:  "username",
+			Usage: "registry username",
+		},
+		&cli.StringFlag{
+			Name:  "password",
+			Usage: "registry password",
+		},
+	},
+}
+
+func registryCreate(c *cli.Context) error {
+	var (
+		hostname = c.String("hostname")
+		username = c.String("username")
+		password = c.String("password")
+	)
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+	registry := &woodpecker.Registry{
+		Address:  hostname,
+		Username: username,
+		Password: password,
+	}
+	if strings.HasPrefix(registry.Password, "@") {
+		path := strings.TrimPrefix(registry.Password, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		registry.Password = string(out)
+	}
+
+	_, err = client.GlobalRegistryCreate(registry)
+	return err
+}

cli/admin/registry/registry_info.go

@@ -0,0 +1,62 @@
+// Copyright 2024 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 registry
+
+import (
+	"html/template"
+	"os"
+
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var registryInfoCmd = &cli.Command{
+	Name:   "info",
+	Usage:  "display registry info",
+	Action: registryInfo,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+		common.FormatFlag(tmplRegistryList, true),
+	},
+}
+
+func registryInfo(c *cli.Context) error {
+	var (
+		hostname = c.String("hostname")
+		format   = c.String("format") + "\n"
+	)
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	registry, err := client.GlobalRegistry(hostname)
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Parse(format)
+	if err != nil {
+		return err
+	}
+	return tmpl.Execute(os.Stdout, registry)
+}

cli/admin/registry/registry_list.go

@@ -0,0 +1,65 @@
+// Copyright 2024 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 registry
+
+import (
+	"html/template"
+	"os"
+
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var registryListCmd = &cli.Command{
+	Name:   "ls",
+	Usage:  "list registries",
+	Action: registryList,
+	Flags: []cli.Flag{
+		common.FormatFlag(tmplRegistryList, true),
+	},
+}
+
+func registryList(c *cli.Context) error {
+	format := c.String("format") + "\n"
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	list, err := client.GlobalRegistryList()
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Parse(format)
+	if err != nil {
+		return err
+	}
+	for _, registry := range list {
+		if err := tmpl.Execute(os.Stdout, registry); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// Template for registry list information.
+var tmplRegistryList = "\x1b[33m{{ .Address }} \x1b[0m" + `
+Username: {{ .Username }}
+Email: {{ .Email }}
+`

cli/admin/registry/registry_rm.go

@@ -0,0 +1,45 @@
+// Copyright 2024 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 registry
+
+import (
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var registryDeleteCmd = &cli.Command{
+	Name:   "rm",
+	Usage:  "remove a registry",
+	Action: registryDelete,
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+	},
+}
+
+func registryDelete(c *cli.Context) error {
+	hostname := c.String("hostname")
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	return client.GlobalRegistryDelete(hostname)
+}

cli/admin/registry/registry_set.go

@@ -0,0 +1,78 @@
+// Copyright 2024 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 registry
+
+import (
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v2"
+
+	"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 registryUpdateCmd = &cli.Command{
+	Name:   "update",
+	Usage:  "update a registry",
+	Action: registryUpdate,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+		&cli.StringFlag{
+			Name:  "username",
+			Usage: "registry username",
+		},
+		&cli.StringFlag{
+			Name:  "password",
+			Usage: "registry password",
+		},
+	},
+}
+
+func registryUpdate(c *cli.Context) error {
+	var (
+		hostname = c.String("hostname")
+		username = c.String("username")
+		password = c.String("password")
+	)
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	registry := &woodpecker.Registry{
+		Address:  hostname,
+		Username: username,
+		Password: password,
+	}
+	if strings.HasPrefix(registry.Password, "@") {
+		path := strings.TrimPrefix(registry.Password, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		registry.Password = string(out)
+	}
+
+	_, err = client.GlobalRegistryUpdate(registry)
+	return err
+}

cli/org/org.go

@@ -0,0 +1,30 @@
+// Copyright 2024 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 org
+
+import (
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/org/registry"
+)
+
+// Command exports the org command set.
+var Command = &cli.Command{
+	Name:  "org",
+	Usage: "manage organizations",
+	Subcommands: []*cli.Command{
+		registry.Command,
+	},
+}

cli/org/registry/registry.go

@@ -0,0 +1,60 @@
+// Copyright 2024 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 registry
+
+import (
+	"strconv"
+
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
+)
+
+// Command exports the registry command set.
+var Command = &cli.Command{
+	Name:  "registry",
+	Usage: "manage organization registries",
+	Subcommands: []*cli.Command{
+		registryCreateCmd,
+		registryDeleteCmd,
+		registryUpdateCmd,
+		registryInfoCmd,
+		registryListCmd,
+	},
+}
+
+func parseTargetArgs(client woodpecker.Client, c *cli.Context) (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/registry/registry_add.go

@@ -0,0 +1,83 @@
+// Copyright 2024 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 registry
+
+import (
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v2"
+
+	"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 registryCreateCmd = &cli.Command{
+	Name:      "add",
+	Usage:     "adds a registry",
+	ArgsUsage: "[org-id|org-full-name]",
+	Action:    registryCreate,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+		&cli.StringFlag{
+			Name:  "username",
+			Usage: "registry username",
+		},
+		&cli.StringFlag{
+			Name:  "password",
+			Usage: "registry password",
+		},
+	},
+}
+
+func registryCreate(c *cli.Context) error {
+	var (
+		hostname = c.String("hostname")
+		username = c.String("username")
+		password = c.String("password")
+	)
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+	registry := &woodpecker.Registry{
+		Address:  hostname,
+		Username: username,
+		Password: password,
+	}
+	if strings.HasPrefix(registry.Password, "@") {
+		path := strings.TrimPrefix(registry.Password, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		registry.Password = string(out)
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	_, err = client.OrgRegistryCreate(orgID, registry)
+	return err
+}

cli/org/registry/registry_info.go

@@ -0,0 +1,69 @@
+// Copyright 2024 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 registry
+
+import (
+	"html/template"
+	"os"
+
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var registryInfoCmd = &cli.Command{
+	Name:      "info",
+	Usage:     "display registry info",
+	ArgsUsage: "[org-id|org-full-name]",
+	Action:    registryInfo,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+		common.FormatFlag(tmplRegistryList, true),
+	},
+}
+
+func registryInfo(c *cli.Context) error {
+	var (
+		hostname = c.String("hostname")
+		format   = c.String("format") + "\n"
+	)
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	registry, err := client.OrgRegistry(orgID, hostname)
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Parse(format)
+	if err != nil {
+		return err
+	}
+	return tmpl.Execute(os.Stdout, registry)
+}

cli/org/registry/registry_list.go

@@ -0,0 +1,72 @@
+// Copyright 2024 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 registry
+
+import (
+	"html/template"
+	"os"
+
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var registryListCmd = &cli.Command{
+	Name:      "ls",
+	Usage:     "list registries",
+	ArgsUsage: "[org-id|org-full-name]",
+	Action:    registryList,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		common.FormatFlag(tmplRegistryList, true),
+	},
+}
+
+func registryList(c *cli.Context) error {
+	format := c.String("format") + "\n"
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	list, err := client.OrgRegistryList(orgID)
+	if err != nil {
+		return err
+	}
+
+	tmpl, err := template.New("_").Parse(format)
+	if err != nil {
+		return err
+	}
+	for _, registry := range list {
+		if err := tmpl.Execute(os.Stdout, registry); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// Template for registry list information.
+var tmplRegistryList = "\x1b[33m{{ .Address }} \x1b[0m" + `
+Username: {{ .Username }}
+Email: {{ .Email }}
+`

cli/org/registry/registry_rm.go

@@ -0,0 +1,53 @@
+// Copyright 2024 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 registry
+
+import (
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+)
+
+var registryDeleteCmd = &cli.Command{
+	Name:      "rm",
+	Usage:     "remove a registry",
+	ArgsUsage: "[org-id|org-full-name]",
+	Action:    registryDelete,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+	},
+}
+
+func registryDelete(c *cli.Context) error {
+	hostname := c.String("hostname")
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	return client.OrgRegistryDelete(orgID, hostname)
+}

cli/org/registry/registry_set.go

@@ -0,0 +1,84 @@
+// Copyright 2024 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 registry
+
+import (
+	"os"
+	"strings"
+
+	"github.com/urfave/cli/v2"
+
+	"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 registryUpdateCmd = &cli.Command{
+	Name:      "update",
+	Usage:     "update a registry",
+	ArgsUsage: "[org-id|org-full-name]",
+	Action:    registryUpdate,
+	Flags: []cli.Flag{
+		common.OrgFlag,
+		&cli.StringFlag{
+			Name:  "hostname",
+			Usage: "registry hostname",
+			Value: "docker.io",
+		},
+		&cli.StringFlag{
+			Name:  "username",
+			Usage: "registry username",
+		},
+		&cli.StringFlag{
+			Name:  "password",
+			Usage: "registry password",
+		},
+	},
+}
+
+func registryUpdate(c *cli.Context) error {
+	var (
+		hostname = c.String("hostname")
+		username = c.String("username")
+		password = c.String("password")
+	)
+
+	client, err := internal.NewClient(c)
+	if err != nil {
+		return err
+	}
+
+	registry := &woodpecker.Registry{
+		Address:  hostname,
+		Username: username,
+		Password: password,
+	}
+	if strings.HasPrefix(registry.Password, "@") {
+		path := strings.TrimPrefix(registry.Password, "@")
+		out, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		registry.Password = string(out)
+	}
+
+	orgID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
+	_, err = client.OrgRegistryUpdate(orgID, registry)
+	return err
+}

cli/repo/registry/registry.go

@@ -0,0 +1,44 @@
+// 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 registry
+
+import (
+	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
+)
+
+// Command exports the registry command set.
+var Command = &cli.Command{
+	Name:  "registry",
+	Usage: "manage registries",
+	Subcommands: []*cli.Command{
+		registryCreateCmd,
+		registryDeleteCmd,
+		registryUpdateCmd,
+		registryInfoCmd,
+		registryListCmd,
+	},
+}
+
+func parseTargetArgs(client woodpecker.Client, c *cli.Context) (repoID int64, err error) {
+	repoIDOrFullName := c.String("repository")
+	if repoIDOrFullName == "" {
+		repoIDOrFullName = c.Args().First()
+	}
+
+	return internal.ParseRepo(client, repoIDOrFullName)
+}

cli/repo/registry/registry_add.go

@@ -50,22 +50,15 @@ var registryCreateCmd = &cli.Command{
 
 func registryCreate(c *cli.Context) error {
 	var (
-		hostname         = c.String("hostname")
-		username         = c.String("username")
-		password         = c.String("password")
-		repoIDOrFullName = c.String("repository")
+		hostname = c.String("hostname")
+		username = c.String("username")
+		password = c.String("password")
 	)
-	if repoIDOrFullName == "" {
-		repoIDOrFullName = c.Args().First()
-	}
+
 	client, err := internal.NewClient(c)
 	if err != nil {
 		return err
 	}
-	repoID, err := internal.ParseRepo(client, repoIDOrFullName)
-	if err != nil {
-		return err
-	}
 	registry := &woodpecker.Registry{
 		Address:  hostname,
 		Username: username,
@@ -79,8 +72,12 @@ func registryCreate(c *cli.Context) error {
 		}
 		registry.Password = string(out)
 	}
-	if _, err := client.RegistryCreate(repoID, registry); err != nil {
+
+	repoID, err := parseTargetArgs(client, c)
+	if err != nil {
 		return err
 	}
-	return nil
+
+	_, err = client.RegistryCreate(repoID, registry)
+	return err
 }

cli/repo/registry/registry_info.go

@@ -42,25 +42,25 @@ var registryInfoCmd = &cli.Command{
 
 func registryInfo(c *cli.Context) error {
 	var (
-		hostname         = c.String("hostname")
-		repoIDOrFullName = c.String("repository")
-		format           = c.String("format") + "\n"
+		hostname = c.String("hostname")
+		format   = c.String("format") + "\n"
 	)
-	if repoIDOrFullName == "" {
-		repoIDOrFullName = c.Args().First()
-	}
+
 	client, err := internal.NewClient(c)
 	if err != nil {
 		return err
 	}
-	repoID, err := internal.ParseRepo(client, repoIDOrFullName)
+
+	repoID, err := parseTargetArgs(client, c)
 	if err != nil {
 		return err
 	}
+
 	registry, err := client.Registry(repoID, hostname)
 	if err != nil {
 		return err
 	}
+
 	tmpl, err := template.New("_").Parse(format)
 	if err != nil {
 		return err

cli/repo/registry/registry_list.go

@@ -36,25 +36,23 @@ var registryListCmd = &cli.Command{
 }
 
 func registryList(c *cli.Context) error {
-	var (
-		format           = c.String("format") + "\n"
-		repoIDOrFullName = c.String("repository")
-	)
-	if repoIDOrFullName == "" {
-		repoIDOrFullName = c.Args().First()
-	}
+	format := c.String("format") + "\n"
+
 	client, err := internal.NewClient(c)
 	if err != nil {
 		return err
 	}
-	repoID, err := internal.ParseRepo(client, repoIDOrFullName)
+
+	repoID, err := parseTargetArgs(client, c)
 	if err != nil {
 		return err
 	}
+
 	list, err := client.RegistryList(repoID)
 	if err != nil {
 		return err
 	}
+
 	tmpl, err := template.New("_").Parse(format)
 	if err != nil {
 		return err

cli/repo/registry/registry_rm.go

@@ -37,20 +37,17 @@ var registryDeleteCmd = &cli.Command{
 }
 
 func registryDelete(c *cli.Context) error {
-	var (
-		hostname         = c.String("hostname")
-		repoIDOrFullName = c.String("repository")
-	)
-	if repoIDOrFullName == "" {
-		repoIDOrFullName = c.Args().First()
-	}
+	hostname := c.String("hostname")
+
 	client, err := internal.NewClient(c)
 	if err != nil {
 		return err
 	}
-	repoID, err := internal.ParseRepo(client, repoIDOrFullName)
+
+	repoID, err := parseTargetArgs(client, c)
 	if err != nil {
 		return err
 	}
+
 	return client.RegistryDelete(repoID, hostname)
 }

cli/repo/registry/registry_set.go

@@ -50,22 +50,16 @@ var registryUpdateCmd = &cli.Command{
 
 func registryUpdate(c *cli.Context) error {
 	var (
-		hostname         = c.String("hostname")
-		username         = c.String("username")
-		password         = c.String("password")
-		repoIDOrFullName = c.String("repository")
+		hostname = c.String("hostname")
+		username = c.String("username")
+		password = c.String("password")
 	)
-	if repoIDOrFullName == "" {
-		repoIDOrFullName = c.Args().First()
-	}
+
 	client, err := internal.NewClient(c)
 	if err != nil {
 		return err
 	}
-	repoID, err := internal.ParseRepo(client, repoIDOrFullName)
-	if err != nil {
-		return err
-	}
+
 	registry := &woodpecker.Registry{
 		Address:  hostname,
 		Username: username,
@@ -79,6 +73,12 @@ func registryUpdate(c *cli.Context) error {
 		}
 		registry.Password = string(out)
 	}
+
+	repoID, err := parseTargetArgs(client, c)
+	if err != nil {
+		return err
+	}
+
 	_, err = client.RegistryUpdate(repoID, registry)
 	return err
 }

cli/repo/repo.go

@@ -16,6 +16,8 @@ package repo
 
 import (
 	"github.com/urfave/cli/v2"
+
+	"go.woodpecker-ci.org/woodpecker/v2/cli/repo/registry"
 )
 
 // Command exports the repository command.
@@ -31,5 +33,6 @@ var Command = &cli.Command{
 		repoRepairCmd,
 		repoChownCmd,
 		repoSyncCmd,
+		registry.Command,
 	},
 }