From 240b06991b52f259aa1a9a9ba5389037e00dae79 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 2 Apr 2025 14:05:36 +0200 Subject: [PATCH] cli-plugins/plugin: rewrite withPluginClientConn w/ WithAPIClient The WithInitializeClient looks redundant altogether, so let's rewrite this function to not depend on it. Signed-off-by: Sebastiaan van Stijn --- cli-plugins/plugin/plugin.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cli-plugins/plugin/plugin.go b/cli-plugins/plugin/plugin.go index 08bdf73614..39d6d86943 100644 --- a/cli-plugins/plugin/plugin.go +++ b/cli-plugins/plugin/plugin.go @@ -109,7 +109,7 @@ func Run(makeCmd func(command.Cli) *cobra.Command, meta metadata.Metadata) { } func withPluginClientConn(name string) command.CLIOption { - return command.WithInitializeClient(func(dockerCli *command.DockerCli) (client.APIClient, error) { + return func(cli *command.DockerCli) error { cmd := "docker" if x := os.Getenv(metadata.ReexecEnvvar); x != "" { cmd = x @@ -133,11 +133,14 @@ func withPluginClientConn(name string) command.CLIOption { helper, err := connhelper.GetCommandConnectionHelper(cmd, flags...) if err != nil { - return nil, err + return err } - - return client.NewClientWithOpts(client.WithDialContext(helper.Dialer)) - }) + apiClient, err := client.NewClientWithOpts(client.WithDialContext(helper.Dialer)) + if err != nil { + return err + } + return command.WithAPIClient(apiClient)(cli) + } } func newPluginCommand(dockerCli *command.DockerCli, plugin *cobra.Command, meta metadata.Metadata) *cli.TopLevelCommand {