internal/registry: remove dead code

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

internal/registry/auth.go

@@ -127,44 +127,6 @@ func v2AuthHTTPClient(endpoint *url.URL, authTransport http.RoundTripper, modifi
 	}, nil
 }
 
-// ConvertToHostname normalizes a registry URL which has http|https prepended
-// to just its hostname. It is used to match credentials, which may be either
-// stored as hostname or as hostname including scheme (in legacy configuration
-// files).
-func ConvertToHostname(maybeURL string) string {
-	stripped := maybeURL
-	if scheme, remainder, ok := strings.Cut(stripped, "://"); ok {
-		switch scheme {
-		case "http", "https":
-			stripped = remainder
-		default:
-			// unknown, or no scheme; doing nothing for now, as we never did.
-		}
-	}
-	stripped, _, _ = strings.Cut(stripped, "/")
-	return stripped
-}
-
-// ResolveAuthConfig matches an auth configuration to a server address or a URL
-func ResolveAuthConfig(authConfigs map[string]registry.AuthConfig, index *registry.IndexInfo) registry.AuthConfig {
-	configKey := GetAuthConfigKey(index)
-	// First try the happy case
-	if c, found := authConfigs[configKey]; found || index.Official {
-		return c
-	}
-
-	// Maybe they have a legacy config file, we will iterate the keys converting
-	// them to the new format and testing
-	for registryURL, ac := range authConfigs {
-		if configKey == ConvertToHostname(registryURL) {
-			return ac
-		}
-	}
-
-	// When all else fails, return an empty auth config
-	return registry.AuthConfig{}
-}
-
 // PingResponseError is used when the response from a ping
 // was received but invalid.
 type PingResponseError struct {

internal/registry/auth_test.go

@@ -106,19 +106,6 @@ func newServiceConfig(options ServiceOptions) (*serviceConfig, error) {
 	return config, nil
 }
 
-// copy constructs a new ServiceConfig with a copy of the configuration in config.
-func (config *serviceConfig) copy() *registry.ServiceConfig {
-	ic := make(map[string]*registry.IndexInfo)
-	for key, value := range config.IndexConfigs {
-		ic[key] = value
-	}
-	return &registry.ServiceConfig{
-		InsecureRegistryCIDRs: append([]*registry.NetIPNet(nil), config.InsecureRegistryCIDRs...),
-		IndexConfigs:          ic,
-		Mirrors:               append([]string(nil), config.Mirrors...),
-	}
-}
-
 // loadMirrors loads mirrors to config, after removing duplicates.
 // Returns an error if mirrors contains an invalid mirror.
 func (config *serviceConfig) loadMirrors(mirrors []string) error {
@@ -320,18 +307,12 @@ func ValidateIndexName(val string) (string, error) {
 }
 
 func normalizeIndexName(val string) string {
-	// TODO(thaJeztah): consider normalizing other known options, such as "(https://)registry-1.docker.io", "https://index.docker.io/v1/".
-	// TODO: upstream this to check to reference package
 	if val == "index.docker.io" {
 		return "docker.io"
 	}
 	return val
 }
 
-func hasScheme(reposName string) bool {
-	return strings.Contains(reposName, "://")
-}
-
 func validateHostPort(s string) error {
 	// Split host and port, and in case s can not be split, assume host only
 	host, port, err := net.SplitHostPort(s)
@@ -356,32 +337,6 @@ func validateHostPort(s string) error {
 	return nil
 }
 
-// newIndexInfo returns IndexInfo configuration from indexName
-func newIndexInfo(config *serviceConfig, indexName string) *registry.IndexInfo {
-	indexName = normalizeIndexName(indexName)
-
-	// Return any configured index info, first.
-	if index, ok := config.IndexConfigs[indexName]; ok {
-		return index
-	}
-
-	// Construct a non-configured index info.
-	return &registry.IndexInfo{
-		Name:    indexName,
-		Mirrors: []string{},
-		Secure:  config.isSecureIndex(indexName),
-	}
-}
-
-// GetAuthConfigKey special-cases using the full index address of the official
-// index as the AuthConfig key, and uses the (host)name[:port] for private indexes.
-func GetAuthConfigKey(index *registry.IndexInfo) string {
-	if index.Official {
-		return IndexServer
-	}
-	return index.Name
-}
-
 // ParseRepositoryInfo performs the breakdown of a repository name into a
 // [RepositoryInfo], but lacks registry configuration.
 //

internal/registry/config.go

@@ -49,19 +49,3 @@ func (invalidParameterErr) InvalidParameter() {}
 func (e invalidParameterErr) Unwrap() error {
 	return e.error
 }
-
-type systemErr struct{ error }
-
-func (systemErr) System() {}
-
-func (e systemErr) Unwrap() error {
-	return e.error
-}
-
-type errUnknown struct{ error }
-
-func (errUnknown) Unknown() {}
-
-func (e errUnknown) Unwrap() error {
-	return e.error
-}

internal/registry/errors.go

@@ -13,10 +13,7 @@ import (
 	"gotest.tools/v3/assert"
 )
 
-var (
-	testHTTPServer  *httptest.Server
-	testHTTPSServer *httptest.Server
-)
+var testHTTPServer *httptest.Server
 
 func init() {
 	r := http.NewServeMux()
@@ -29,7 +26,6 @@ func init() {
 	r.HandleFunc("/v2/version", handlerGetPing)
 
 	testHTTPServer = httptest.NewServer(handlerAccessLog(r))
-	testHTTPSServer = httptest.NewTLSServer(handlerAccessLog(r))
 }
 
 func handlerAccessLog(handler http.Handler) http.Handler {
@@ -44,30 +40,6 @@ func makeURL(req string) string {
 	return testHTTPServer.URL + req
 }
 
-func makeHTTPSURL(req string) string {
-	return testHTTPSServer.URL + req
-}
-
-func makeIndex(req string) *registry.IndexInfo {
-	return &registry.IndexInfo{
-		Name: makeURL(req),
-	}
-}
-
-func makeHTTPSIndex(req string) *registry.IndexInfo {
-	return &registry.IndexInfo{
-		Name: makeHTTPSURL(req),
-	}
-}
-
-func makePublicIndex() *registry.IndexInfo {
-	return &registry.IndexInfo{
-		Name:     IndexServer,
-		Secure:   true,
-		Official: true,
-	}
-}
-
 func writeHeaders(w http.ResponseWriter) {
 	h := w.Header()
 	h.Add("Server", "docker-tests/mock")

internal/registry/registry_mock_test.go

@@ -34,6 +34,23 @@ func overrideLookupIP(t *testing.T) {
 	})
 }
 
+// newIndexInfo returns IndexInfo configuration from indexName
+func newIndexInfo(config *serviceConfig, indexName string) *registry.IndexInfo {
+	indexName = normalizeIndexName(indexName)
+
+	// Return any configured index info, first.
+	if index, ok := config.IndexConfigs[indexName]; ok {
+		return index
+	}
+
+	// Construct a non-configured index info.
+	return &registry.IndexInfo{
+		Name:    indexName,
+		Mirrors: []string{},
+		Secure:  config.isSecureIndex(indexName),
+	}
+}
+
 func TestParseRepositoryInfo(t *testing.T) {
 	type staticRepositoryInfo struct {
 		Index         *registry.IndexInfo