Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/context/docker: rename receiver for Endpoint 

Code in methods of this type also used the Client, and having this receiver
named "c" made it easy to confuse it for referring to Client ("c").

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-05-04 17:08:18 +02:00
parent f7600fb539
commit 1073b0269a
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cli/context/docker/load.go
View File

@ -40,23 +40,23 @@ func WithTLSData(s store.Reader, contextName string, m EndpointMeta) (Endpoint,
} }
// tlsConfig extracts a context docker endpoint TLS config // tlsConfig extracts a context docker endpoint TLS config
func (c *Endpoint) tlsConfig() (*tls.Config, error) { func (ep *Endpoint) tlsConfig() (*tls.Config, error) {
if c.TLSData == nil && !c.SkipTLSVerify { if ep.TLSData == nil && !ep.SkipTLSVerify {
// there is no specific tls config // there is no specific tls config
return nil, nil return nil, nil
} }
var tlsOpts []func(*tls.Config) var tlsOpts []func(*tls.Config)
if c.TLSData != nil && c.TLSData.CA != nil { if ep.TLSData != nil && ep.TLSData.CA != nil {
certPool := x509.NewCertPool() certPool := x509.NewCertPool()
if !certPool.AppendCertsFromPEM(c.TLSData.CA) { if !certPool.AppendCertsFromPEM(ep.TLSData.CA) {
return nil, errors.New("failed to retrieve context tls info: ca.pem seems invalid") return nil, errors.New("failed to retrieve context tls info: ca.pem seems invalid")
} }
tlsOpts = append(tlsOpts, func(cfg *tls.Config) { tlsOpts = append(tlsOpts, func(cfg *tls.Config) {
cfg.RootCAs = certPool cfg.RootCAs = certPool
}) })
} }
if c.TLSData != nil && c.TLSData.Key != nil && c.TLSData.Cert != nil { if ep.TLSData != nil && ep.TLSData.Key != nil && ep.TLSData.Cert != nil {
keyBytes := c.TLSData.Key keyBytes := ep.TLSData.Key
pemBlock, _ := pem.Decode(keyBytes) pemBlock, _ := pem.Decode(keyBytes)
if pemBlock == nil { if pemBlock == nil {
return nil, errors.New("no valid private key found") return nil, errors.New("no valid private key found")
@ -65,7 +65,7 @@ func (c *Endpoint) tlsConfig() (*tls.Config, error) {
return nil, errors.New("private key is encrypted - support for encrypted private keys has been removed, see https://docs.docker.com/go/deprecated/") return nil, errors.New("private key is encrypted - support for encrypted private keys has been removed, see https://docs.docker.com/go/deprecated/")
} }
x509cert, err := tls.X509KeyPair(c.TLSData.Cert, keyBytes) x509cert, err := tls.X509KeyPair(ep.TLSData.Cert, keyBytes)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to retrieve context tls info") return nil, errors.Wrap(err, "failed to retrieve context tls info")
} }
@ -73,7 +73,7 @@ func (c *Endpoint) tlsConfig() (*tls.Config, error) {
cfg.Certificates = []tls.Certificate{x509cert} cfg.Certificates = []tls.Certificate{x509cert}
}) })
} }
if c.SkipTLSVerify { if ep.SkipTLSVerify {
tlsOpts = append(tlsOpts, func(cfg *tls.Config) { tlsOpts = append(tlsOpts, func(cfg *tls.Config) {
cfg.InsecureSkipVerify = true cfg.InsecureSkipVerify = true
}) })
@ -82,21 +82,21 @@ func (c *Endpoint) tlsConfig() (*tls.Config, error) {
} }
// ClientOpts returns a slice of Client options to configure an API client with this endpoint // ClientOpts returns a slice of Client options to configure an API client with this endpoint
func (c *Endpoint) ClientOpts() ([]client.Opt, error) { func (ep *Endpoint) ClientOpts() ([]client.Opt, error) {
var result []client.Opt var result []client.Opt
if c.Host != "" { if ep.Host != "" {
helper, err := connhelper.GetConnectionHelper(c.Host) helper, err := connhelper.GetConnectionHelper(ep.Host)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if helper == nil { if helper == nil {
tlsConfig, err := c.tlsConfig() tlsConfig, err := ep.tlsConfig()
if err != nil { if err != nil {
return nil, err return nil, err
} }
result = append(result, result = append(result,
withHTTPClient(tlsConfig), withHTTPClient(tlsConfig),
client.WithHost(c.Host), client.WithHost(ep.Host),
) )
} else { } else {