cli/command: make WithInitializeClient a wrapper for WithAPIClient

thaJeztah · thaJeztah · commit 7b1f889074d0 · 2025-05-16T23:31:53.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/cli_options.go b/cli/command/cli_options.go
@@ -118,9 +118,11 @@ func WithAPIClient(c client.APIClient) CLIOption {
 // an API Client for use by the CLI.
 func WithInitializeClient(makeClient func(*DockerCli) (client.APIClient, error)) CLIOption {
 	return func(cli *DockerCli) error {
-		var err error
-		cli.client, err = makeClient(cli)
-		return err
+		c, err := makeClient(cli)
+		if err != nil {
+			return err
+		}
+		return WithAPIClient(c)(cli)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,11 @@ func WithAPIClient(c client.APIClient) CLIOption {`
`118`	`118`	`// an API Client for use by the CLI.`
`119`	`119`	`func WithInitializeClient(makeClient func(*DockerCli) (client.APIClient, error)) CLIOption {`
`120`	`120`	`return func(cli *DockerCli) error {`
`121`		`- var err error`
`122`		`- cli.client, err = makeClient(cli)`
`123`		`- return err`
	`121`	`+ c, err := makeClient(cli)`
	`122`	`+ if err != nil {`
	`123`	`+ return err`
	`124`	`+ }`
	`125`	`+ return WithAPIClient(c)(cli)`
`124`	`126`	`}`
`125`	`127`	`}`
`126`	`128`