From afbeec8bda4255595356b08f82d7b1f966b6f588 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 5 Oct 2021 14:37:53 +0200 Subject: [PATCH] registry: remove tlsConfigForMirror() This function was just a shallow wrapper around tlsConfig(), so remove the abstraction. Signed-off-by: Sebastiaan van Stijn --- registry/service.go | 6 +----- registry/service_v2.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/registry/service.go b/registry/service.go index 7e55923c11..da96682302 100644 --- a/registry/service.go +++ b/registry/service.go @@ -257,7 +257,7 @@ func (s *DefaultService) TLSConfig(hostname string) (*tls.Config, error) { s.mu.Lock() defer s.mu.Unlock() - return newTLSConfig(hostname, isSecureIndex(s.config, hostname)) + return s.tlsConfig(hostname) } // tlsConfig constructs a client TLS configuration based on server defaults @@ -265,10 +265,6 @@ func (s *DefaultService) tlsConfig(hostname string) (*tls.Config, error) { return newTLSConfig(hostname, isSecureIndex(s.config, hostname)) } -func (s *DefaultService) tlsConfigForMirror(mirrorURL *url.URL) (*tls.Config, error) { - return s.tlsConfig(mirrorURL.Host) -} - // LookupPullEndpoints creates a list of v2 endpoints to try to pull from, in order of preference. // It gives preference to mirrors over the actual registry, and HTTPS over plain HTTP. func (s *DefaultService) LookupPullEndpoints(hostname string) (endpoints []APIEndpoint, err error) { diff --git a/registry/service_v2.go b/registry/service_v2.go index 3e3a5b41ff..46f28ebccf 100644 --- a/registry/service_v2.go +++ b/registry/service_v2.go @@ -18,7 +18,7 @@ func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndp if err != nil { return nil, err } - mirrorTLSConfig, err := s.tlsConfigForMirror(mirrorURL) + mirrorTLSConfig, err := s.tlsConfig(mirrorURL.Host) if err != nil { return nil, err }