dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-13 06:29:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: WithTLSClientConfig, WithTLSClientConfigFromEnv: inline vars

Browse Source 
Remove intermediate variables.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-07-15 18:03:34 +02:00
parent 9d1e690751
commit 6846c63252
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/options.go
View File

@@ -135,13 +135,12 @@ func WithScheme(scheme string) Opt {
// WithTLSClientConfig applies a TLS config to the client transport.
func WithTLSClientConfig(cacertPath, certPath, keyPath string) Opt {
return func(c *Client) error {
opts := tlsconfig.Options{
config, err := tlsconfig.Client(tlsconfig.Options{
CAFile: cacertPath,
CertFile: certPath,
KeyFile: keyPath,
ExclusiveRootPools: true,
}
config, err := tlsconfig.Client(opts)
})
if err != nil {
return errors.Wrap(err, "failed to create tls config")
}
@@ -170,13 +169,12 @@ func WithTLSClientConfigFromEnv() Opt {
if dockerCertPath == "" {
return nil
}
options := tlsconfig.Options{
tlsc, err := tlsconfig.Client(tlsconfig.Options{
CAFile: filepath.Join(dockerCertPath, "ca.pem"),
CertFile: filepath.Join(dockerCertPath, "cert.pem"),
KeyFile: filepath.Join(dockerCertPath, "key.pem"),
InsecureSkipVerify: os.Getenv(EnvTLSVerify) == "",
}
tlsc, err := tlsconfig.Client(options)
})
if err != nil {
return err
}