From 8b8bbbd44551b66641502e899f4401e6795afb82 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 25 Feb 2022 23:58:25 +0100
Subject: [PATCH] registry: un-export HTTPClient() and NewTransport()

They're only used internally.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 registry/auth.go          |  2 +-
 registry/endpoint_test.go |  2 +-
 registry/endpoint_v1.go   |  4 ++--
 registry/registry.go      | 12 +++++-------
 registry/registry_test.go |  4 ++--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/registry/auth.go b/registry/auth.go
index 81533d269f..1f0a41db99 100644
--- a/registry/auth.go
+++ b/registry/auth.go
@@ -80,7 +80,7 @@ func loginV2(authConfig *types.AuthConfig, endpoint APIEndpoint, userAgent strin
 	var (
 		endpointStr          = strings.TrimRight(endpoint.URL.String(), "/") + "/v2/"
 		modifiers            = Headers(userAgent, nil)
-		authTransport        = transport.NewTransport(NewTransport(endpoint.TLSConfig), modifiers...)
+		authTransport        = transport.NewTransport(newTransport(endpoint.TLSConfig), modifiers...)
 		credentialAuthConfig = *authConfig
 		creds                = loginCredentialStore{authConfig: &credentialAuthConfig}
 	)
diff --git a/registry/endpoint_test.go b/registry/endpoint_test.go
index 9268c3a4f0..d8f283974c 100644
--- a/registry/endpoint_test.go
+++ b/registry/endpoint_test.go
@@ -65,7 +65,7 @@ func TestValidateEndpoint(t *testing.T) {
 
 	testEndpoint := V1Endpoint{
 		URL:    testServerURL,
-		client: HTTPClient(NewTransport(nil)),
+		client: httpClient(newTransport(nil)),
 	}
 
 	if err = validateEndpoint(&testEndpoint); err != nil {
diff --git a/registry/endpoint_v1.go b/registry/endpoint_v1.go
index 684c330dc3..7721d7693a 100644
--- a/registry/endpoint_v1.go
+++ b/registry/endpoint_v1.go
@@ -109,12 +109,12 @@ func newV1EndpointFromStr(address string, tlsConfig *tls.Config, userAgent strin
 	}
 
 	// TODO(tiborvass): make sure a ConnectTimeout transport is used
-	tr := NewTransport(tlsConfig)
+	tr := newTransport(tlsConfig)
 
 	return &V1Endpoint{
 		IsSecure: tlsConfig == nil || !tlsConfig.InsecureSkipVerify,
 		URL:      uri,
-		client:   HTTPClient(transport.NewTransport(tr, Headers(userAgent, metaHeaders)...)),
+		client:   httpClient(transport.NewTransport(tr, Headers(userAgent, metaHeaders)...)),
 	}, nil
 }
 
diff --git a/registry/registry.go b/registry/registry.go
index 42f0f4dc9f..6f866ed17a 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -120,9 +120,9 @@ func Headers(userAgent string, metaHeaders http.Header) []transport.RequestModif
 	return modifiers
 }
 
-// HTTPClient returns an HTTP client structure which uses the given transport
+// httpClient returns an HTTP client structure which uses the given transport
 // and contains the necessary headers for redirected requests
-func HTTPClient(transport http.RoundTripper) *http.Client {
+func httpClient(transport http.RoundTripper) *http.Client {
 	return &http.Client{
 		Transport:     transport,
 		CheckRedirect: addRequiredHeadersToRedirectedRequests,
@@ -165,9 +165,9 @@ func addRequiredHeadersToRedirectedRequests(req *http.Request, via []*http.Reque
 	return nil
 }
 
-// NewTransport returns a new HTTP transport. If tlsConfig is nil, it uses the
+// newTransport returns a new HTTP transport. If tlsConfig is nil, it uses the
 // default TLS configuration.
-func NewTransport(tlsConfig *tls.Config) *http.Transport {
+func newTransport(tlsConfig *tls.Config) *http.Transport {
 	if tlsConfig == nil {
 		tlsConfig = tlsconfig.ServerDefault()
 	}
@@ -177,7 +177,7 @@ func NewTransport(tlsConfig *tls.Config) *http.Transport {
 		KeepAlive: 30 * time.Second,
 	}
 
-	base := &http.Transport{
+	return &http.Transport{
 		Proxy:               http.ProxyFromEnvironment,
 		DialContext:         direct.DialContext,
 		TLSHandshakeTimeout: 10 * time.Second,
@@ -185,6 +185,4 @@ func NewTransport(tlsConfig *tls.Config) *http.Transport {
 		// TODO(dmcgowan): Call close idle connections when complete and use keep alive
 		DisableKeepAlives: true,
 	}
-
-	return base
 }
diff --git a/registry/registry_test.go b/registry/registry_test.go
index 10a88add0a..ba06e4145e 100644
--- a/registry/registry_test.go
+++ b/registry/registry_test.go
@@ -23,9 +23,9 @@ func spawnTestRegistrySession(t *testing.T) *Session {
 		t.Fatal(err)
 	}
 	userAgent := "docker test client"
-	var tr http.RoundTripper = debugTransport{NewTransport(nil), t.Log}
+	var tr http.RoundTripper = debugTransport{newTransport(nil), t.Log}
 	tr = transport.NewTransport(AuthTransport(tr, authConfig, false), Headers(userAgent, nil)...)
-	client := HTTPClient(tr)
+	client := httpClient(tr)
 	r, err := NewSession(client, authConfig, endpoint)
 	if err != nil {
 		t.Fatal(err)