From 223bf80d4b2b3ebfe2ae32d84c72527ae10bd39c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 15 Jul 2023 14:39:00 +0200 Subject: [PATCH] cli/context/docker: Endpoint.ClientOpts, withHTTPClient: inline variables Remove some intermediate variables, and inline them. Signed-off-by: Sebastiaan van Stijn --- cli/context/docker/load.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/cli/context/docker/load.go b/cli/context/docker/load.go index 77baa15173..8c597bf9a8 100644 --- a/cli/context/docker/load.go +++ b/cli/context/docker/load.go @@ -100,15 +100,13 @@ func (ep *Endpoint) ClientOpts() ([]client.Opt, error) { ) } else { - httpClient := &http.Client{ - // No tls - // No proxy - Transport: &http.Transport{ - DialContext: helper.Dialer, - }, - } result = append(result, - client.WithHTTPClient(httpClient), + client.WithHTTPClient(&http.Client{ + // No TLS, and no proxy. + Transport: &http.Transport{ + DialContext: helper.Dialer, + }, + }), client.WithHost(helper.Host), client.WithDialContext(helper.Dialer), ) @@ -125,8 +123,7 @@ func withHTTPClient(tlsConfig *tls.Config) func(*client.Client) error { // Use the default HTTPClient return nil } - - httpClient := &http.Client{ + return client.WithHTTPClient(&http.Client{ Transport: &http.Transport{ TLSClientConfig: tlsConfig, DialContext: (&net.Dialer{ @@ -135,8 +132,7 @@ func withHTTPClient(tlsConfig *tls.Config) func(*client.Client) error { }).DialContext, }, CheckRedirect: client.CheckRedirect, - } - return client.WithHTTPClient(httpClient)(c) + })(c) } }