From 026ef0df2da69f72433b50097684a0af73502209 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 25 Sep 2025 10:46:07 +0200 Subject: [PATCH] [28.x] remove remaining uses of DockerCli.ContentTrustEnabled These were already replaced for stubs in master. Signed-off-by: Sebastiaan van Stijn --- cli/command/image/build.go | 2 +- cli/command/plugin/install.go | 7 ++++--- cli/command/plugin/install_test.go | 3 ++- cli/command/plugin/push.go | 2 +- cli/command/plugin/upgrade.go | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cli/command/image/build.go b/cli/command/image/build.go index 4d54cae2f7..a8d2c4ae2e 100644 --- a/cli/command/image/build.go +++ b/cli/command/image/build.go @@ -151,7 +151,7 @@ func newBuildCommand(dockerCli command.Cli) *cobra.Command { flags.SetAnnotation("target", annotation.ExternalURL, []string{"https://docs.docker.com/reference/cli/docker/buildx/build/#target"}) flags.StringVar(&options.imageIDFile, "iidfile", "", "Write the image ID to the file") - flags.BoolVar(&options.untrusted, "disable-content-trust", !dockerCli.ContentTrustEnabled(), "Skip image verification") + flags.BoolVar(&options.untrusted, "disable-content-trust", !trust.Enabled(), "Skip image verification") flags.StringVar(&options.platform, "platform", os.Getenv("DOCKER_DEFAULT_PLATFORM"), "Set platform if server is multi-platform capable") flags.SetAnnotation("platform", "version", []string{"1.38"}) diff --git a/cli/command/plugin/install.go b/cli/command/plugin/install.go index 715ae76ae1..21bbf63aeb 100644 --- a/cli/command/plugin/install.go +++ b/cli/command/plugin/install.go @@ -8,6 +8,7 @@ import ( "github.com/docker/cli/cli" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/image" + "github.com/docker/cli/cli/trust" "github.com/docker/cli/internal/jsonstream" "github.com/docker/cli/internal/prompt" "github.com/docker/cli/internal/registry" @@ -28,9 +29,9 @@ type pluginOptions struct { untrusted bool } -func loadPullFlags(dockerCli command.Cli, opts *pluginOptions, flags *pflag.FlagSet) { +func loadPullFlags(opts *pluginOptions, flags *pflag.FlagSet) { flags.BoolVar(&opts.grantPerms, "grant-all-permissions", false, "Grant all permissions necessary to run the plugin") - flags.BoolVar(&opts.untrusted, "disable-content-trust", !dockerCli.ContentTrustEnabled(), "Skip image verification") + flags.BoolVar(&opts.untrusted, "disable-content-trust", !trust.Enabled(), "Skip image verification") } func newInstallCommand(dockerCli command.Cli) *cobra.Command { @@ -49,7 +50,7 @@ func newInstallCommand(dockerCli command.Cli) *cobra.Command { } flags := cmd.Flags() - loadPullFlags(dockerCli, &options, flags) + loadPullFlags(&options, flags) flags.BoolVar(&options.disable, "disable", false, "Do not enable the plugin on install") flags.StringVar(&options.localName, "alias", "", "Local name for plugin") return cmd diff --git a/cli/command/plugin/install_test.go b/cli/command/plugin/install_test.go index ee67e611d7..f534f0063a 100644 --- a/cli/command/plugin/install_test.go +++ b/cli/command/plugin/install_test.go @@ -86,11 +86,12 @@ func TestInstallContentTrustErrors(t *testing.T) { for _, tc := range testCases { t.Run(tc.description, func(t *testing.T) { + t.Setenv("DOCKER_CONTENT_TRUST", "true") cli := test.NewFakeCli(&fakeClient{ pluginInstallFunc: func(name string, options types.PluginInstallOptions) (io.ReadCloser, error) { return nil, errors.New("should not try to install plugin") }, - }, test.EnableContentTrust) + }) cli.SetNotaryClient(tc.notaryFunc) cmd := newInstallCommand(cli) cmd.SetArgs(tc.args) diff --git a/cli/command/plugin/push.go b/cli/command/plugin/push.go index 6598363f0b..b4db95bb0f 100644 --- a/cli/command/plugin/push.go +++ b/cli/command/plugin/push.go @@ -33,7 +33,7 @@ func newPushCommand(dockerCli command.Cli) *cobra.Command { flags := cmd.Flags() - flags.BoolVar(&opts.untrusted, "disable-content-trust", !dockerCli.ContentTrustEnabled(), "Skip image signing") + flags.BoolVar(&opts.untrusted, "disable-content-trust", !trust.Enabled(), "Skip image signing") return cmd } diff --git a/cli/command/plugin/upgrade.go b/cli/command/plugin/upgrade.go index 54a39685b7..4ebf003e39 100644 --- a/cli/command/plugin/upgrade.go +++ b/cli/command/plugin/upgrade.go @@ -30,7 +30,7 @@ func newUpgradeCommand(dockerCli command.Cli) *cobra.Command { } flags := cmd.Flags() - loadPullFlags(dockerCli, &options, flags) + loadPullFlags(&options, flags) flags.BoolVar(&options.skipRemoteCheck, "skip-remote-check", false, "Do not check if specified remote plugin matches existing plugin image") return cmd }