opts: implement PlatformSlice option

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

cli/command/image/remove.go

@@ -6,18 +6,19 @@ import (
 	"fmt"
 
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/containerd/platforms"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/completion"
+	"github.com/docker/cli/opts"
 	"github.com/docker/docker/api/types/image"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
 )
 
 type removeOptions struct {
 	force     bool
 	noPrune   bool
-	platforms []string
+	platforms []ocispec.Platform
 }
 
 // NewRemoveCommand creates a new `docker remove` command
@@ -42,8 +43,7 @@ func NewRemoveCommand(dockerCLI command.Cli) *cobra.Command {
 	flags.BoolVarP(&options.force, "force", "f", false, "Force removal of the image")
 	flags.BoolVar(&options.noPrune, "no-prune", false, "Do not delete untagged parents")
 
-	// TODO(thaJeztah): create a "platforms" option for this (including validation / parsing).
-	flags.StringSliceVar(&options.platforms, "platform", nil, `Remove only the given platform variant. Formatted as "os[/arch[/variant]]" (e.g., "linux/amd64")`)
+	flags.Var(opts.NewPlatformSlice(&options.platforms), "platform", `Remove only the given platform variant. Formatted as "os[/arch[/variant]]" (e.g., "linux/amd64")`)
 	_ = flags.SetAnnotation("platform", "version", []string{"1.50"})
 
 	_ = cmd.RegisterFlagCompletionFunc("platform", completion.Platforms)
@@ -63,14 +63,7 @@ func runRemove(ctx context.Context, dockerCLI command.Cli, opts removeOptions, i
 	options := image.RemoveOptions{
 		Force:         opts.force,
 		PruneChildren: !opts.noPrune,
-	}
-
-	for _, v := range opts.platforms {
-		p, err := platforms.Parse(v)
-		if err != nil {
-			return err
-		}
-		options.Platforms = append(options.Platforms, p)
+		Platforms:     opts.platforms,
 	}
 
 	// TODO(thaJeztah): this logic can likely be simplified: do we want to print "not found" errors at all when using "force"?

opts/platforms.go

@@ -0,0 +1,53 @@
+package opts
+
+import (
+	"strings"
+
+	"github.com/containerd/platforms"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+)
+
+func NewPlatformSlice(val *[]ocispec.Platform) *PlatformSlice {
+	return &PlatformSlice{values: val}
+}
+
+// PlatformSlice is a Value type for passing multiple platforms.
+type PlatformSlice struct {
+	values *[]ocispec.Platform
+}
+
+func (m *PlatformSlice) Set(value string) error {
+	vals := strings.Split(value, ",")
+	for _, val := range vals {
+		p, err := platforms.Parse(val)
+		if err != nil {
+			return err
+		}
+		*m.values = append(*m.values, p)
+	}
+	return nil
+}
+
+// Type returns the type of this option
+func (*PlatformSlice) Type() string {
+	return "platforms"
+}
+
+// String returns a string representation of this option.
+func (m *PlatformSlice) String() string {
+	return strings.Join(m.GetSlice(), ", ")
+}
+
+// GetSlice returns the platforms as a string-slice.
+func (m *PlatformSlice) GetSlice() []string {
+	var values []string
+	for _, v := range *m.values {
+		values = append(values, platforms.FormatAll(v))
+	}
+	return values
+}
+
+// Value returns the platforms
+func (m *PlatformSlice) Value() []ocispec.Platform {
+	return *m.values
+}