cli/command/plugin: remove DCT

Plugins are not widely used, and there's no known plugins that use
content-trust. We're working on updating the authentication stack
in the CLI, and the trust implementation hinders us in making
changes, so removing parts that are not high-priority (ahead of
full deprecation of DCT).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

cli/command/plugin/install.go

@@ -8,7 +8,6 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/command/image"
 	"github.com/docker/cli/internal/jsonstream"
 	"github.com/docker/cli/internal/prompt"
 	"github.com/docker/cli/internal/registry"
@@ -17,7 +16,6 @@ import (
 	"github.com/moby/moby/client"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )
 
 type pluginOptions struct {
@@ -27,12 +25,6 @@ type pluginOptions struct {
 	disable         bool
 	args            []string
 	skipRemoteCheck bool
-	untrusted       bool
-}
-
-func loadPullFlags(dockerCli command.Cli, opts *pluginOptions, flags *pflag.FlagSet) {
-	flags.BoolVar(&opts.grantPerms, "grant-all-permissions", false, "Grant all permissions necessary to run the plugin")
-	command.AddTrustVerificationFlags(flags, &opts.untrusted, dockerCli.ContentTrustEnabled())
 }
 
 func newInstallCommand(dockerCli command.Cli) *cobra.Command {
@@ -51,9 +43,11 @@ func newInstallCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	loadPullFlags(dockerCli, &options, flags)
+	flags.BoolVar(&options.grantPerms, "grant-all-permissions", false, "Grant all permissions necessary to run the plugin")
 	flags.BoolVar(&options.disable, "disable", false, "Do not enable the plugin on install")
 	flags.StringVar(&options.localName, "alias", "", "Local name for plugin")
+	flags.Bool("disable-content-trust", dockerCli.ContentTrustEnabled(), "Skip image verification (deprecated)")
+	_ = flags.MarkHidden("disable-content-trust")
 	return cmd
 }
 
@@ -69,37 +63,21 @@ func buildPullConfig(ctx context.Context, dockerCli command.Cli, opts pluginOpti
 	repoInfo := registry.ParseRepositoryInfo(ref)
 	remote := ref.String()
 
-	_, isCanonical := ref.(reference.Canonical)
-	if !opts.untrusted && !isCanonical {
-		ref = reference.TagNameOnly(ref)
-		nt, ok := ref.(reference.NamedTagged)
-		if !ok {
-			return client.PluginInstallOptions{}, errors.Errorf("invalid name: %s", ref.String())
-		}
-
-		trusted, err := image.TrustedReference(ctx, dockerCli, nt)
-		if err != nil {
-			return client.PluginInstallOptions{}, err
-		}
-		remote = reference.FamiliarString(trusted)
-	}
-
 	authConfig := command.ResolveAuthConfig(dockerCli.ConfigFile(), repoInfo.Index)
 	encodedAuth, err := registrytypes.EncodeAuthConfig(authConfig)
 	if err != nil {
 		return client.PluginInstallOptions{}, err
 	}
 
-	options := client.PluginInstallOptions{
+	return client.PluginInstallOptions{
 		RegistryAuth:          encodedAuth,
 		RemoteRef:             remote,
 		Disabled:              opts.disable,
 		AcceptAllPermissions:  opts.grantPerms,
 		AcceptPermissionsFunc: acceptPrivileges(dockerCli, opts.remote),
 		PrivilegeFunc:         nil,
 		Args:                  opts.args,
-	}
-	return options, nil
+	}, nil
 }
 
 func runInstall(ctx context.Context, dockerCLI command.Cli, opts pluginOptions) error {

cli/command/plugin/push.go

@@ -2,49 +2,41 @@ package plugin
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/distribution/reference"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/trust"
 	"github.com/docker/cli/internal/jsonstream"
 	"github.com/docker/cli/internal/registry"
 	registrytypes "github.com/moby/moby/api/types/registry"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
-type pushOptions struct {
-	name      string
-	untrusted bool
-}
-
-func newPushCommand(dockerCli command.Cli) *cobra.Command {
-	var opts pushOptions
+func newPushCommand(dockerCLI command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "push [OPTIONS] PLUGIN[:TAG]",
 		Short: "Push a plugin to a registry",
 		Args:  cli.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.name = args[0]
-			return runPush(cmd.Context(), dockerCli, opts)
+			name := args[0]
+			return runPush(cmd.Context(), dockerCLI, name)
 		},
 	}
 
 	flags := cmd.Flags()
-
-	command.AddTrustSigningFlags(flags, &opts.untrusted, dockerCli.ContentTrustEnabled())
-
+	flags.Bool("disable-content-trust", dockerCLI.ContentTrustEnabled(), "Skip image verification (deprecated)")
+	_ = flags.MarkHidden("disable-content-trust")
 	return cmd
 }
 
-func runPush(ctx context.Context, dockerCli command.Cli, opts pushOptions) error {
-	named, err := reference.ParseNormalizedNamed(opts.name)
+func runPush(ctx context.Context, dockerCli command.Cli, name string) error {
+	named, err := reference.ParseNormalizedNamed(name)
 	if err != nil {
 		return err
 	}
 	if _, ok := named.(reference.Canonical); ok {
-		return errors.Errorf("invalid name: %s", opts.name)
+		return fmt.Errorf("invalid name: %s", name)
 	}
 
 	named = reference.TagNameOnly(named)
@@ -63,10 +55,5 @@ func runPush(ctx context.Context, dockerCli command.Cli, opts pushOptions) error
 	defer func() {
 		_ = responseBody.Close()
 	}()
-
-	if !opts.untrusted {
-		return trust.PushTrustedReference(ctx, dockerCli, repoInfo, named, authConfig, responseBody, command.UserAgent())
-	}
-
 	return jsonstream.Display(ctx, responseBody, dockerCli.Out())
 }

cli/command/plugin/upgrade.go

@@ -31,7 +31,9 @@ func newUpgradeCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	loadPullFlags(dockerCli, &options, flags)
+	flags.BoolVar(&options.grantPerms, "grant-all-permissions", false, "Grant all permissions necessary to run the plugin")
+	flags.Bool("disable-content-trust", dockerCli.ContentTrustEnabled(), "Skip image verification (deprecated)")
+	_ = flags.MarkHidden("disable-content-trust")
 	flags.BoolVar(&options.skipRemoteCheck, "skip-remote-check", false, "Do not check if specified remote plugin matches existing plugin image")
 	return cmd
 }