cli/context/docker: Endpoint.ClientOpts, withHTTPClient: inline variables

Remove some intermediate variables, and inline them.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-15 14:39:00 +02:00
parent 6654ea1434
commit 223bf80d4b
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 8 additions and 12 deletions

View File

@ -100,15 +100,13 @@ func (ep *Endpoint) ClientOpts() ([]client.Opt, error) {
) )
} else { } else {
httpClient := &http.Client{
// No tls
// No proxy
Transport: &http.Transport{
DialContext: helper.Dialer,
},
}
result = append(result, 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.WithHost(helper.Host),
client.WithDialContext(helper.Dialer), client.WithDialContext(helper.Dialer),
) )
@ -125,8 +123,7 @@ func withHTTPClient(tlsConfig *tls.Config) func(*client.Client) error {
// Use the default HTTPClient // Use the default HTTPClient
return nil return nil
} }
return client.WithHTTPClient(&http.Client{
httpClient := &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
TLSClientConfig: tlsConfig, TLSClientConfig: tlsConfig,
DialContext: (&net.Dialer{ DialContext: (&net.Dialer{
@ -135,8 +132,7 @@ func withHTTPClient(tlsConfig *tls.Config) func(*client.Client) error {
}).DialContext, }).DialContext,
}, },
CheckRedirect: client.CheckRedirect, CheckRedirect: client.CheckRedirect,
} })(c)
return client.WithHTTPClient(httpClient)(c)
} }
} }