From 1a98c572b89463f4908bd328e7cc34fd0aeca3d5 Mon Sep 17 00:00:00 2001 From: guillaume Date: Mon, 31 Jan 2022 16:05:58 +0100 Subject: [PATCH] Make ParseAuthHost public Signed-off-by: guillaume --- solver/registryauth.go | 4 ++-- solver/registryauth_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/solver/registryauth.go b/solver/registryauth.go index 04607758..e3337254 100644 --- a/solver/registryauth.go +++ b/solver/registryauth.go @@ -51,7 +51,7 @@ func (a *RegistryAuthProvider) Credentials(ctx context.Context, req *bkauth.Cred defer a.m.RUnlock() for authHost, auth := range a.credentials { - u, err := parseAuthHost(authHost) + u, err := ParseAuthHost(authHost) if err != nil { return nil, err } @@ -65,7 +65,7 @@ func (a *RegistryAuthProvider) Credentials(ctx context.Context, req *bkauth.Cred // Parsing function based on splitReposSearchTerm // "github.com/docker/docker/registry" -func parseAuthHost(host string) (string, error) { +func ParseAuthHost(host string) (string, error) { host = strings.TrimPrefix(host, "http://") host = strings.TrimPrefix(host, "https://") host = strings.TrimSuffix(host, "/") diff --git a/solver/registryauth_test.go b/solver/registryauth_test.go index 33e30a37..f2071372 100644 --- a/solver/registryauth_test.go +++ b/solver/registryauth_test.go @@ -257,7 +257,7 @@ func TestParseAuthHost(t *testing.T) { successRefs := []output{} for _, scase := range scases { - named, err := parseAuthHost(scase.Host) + named, err := ParseAuthHost(scase.Host) if err != nil { t.Fatalf("Invalid normalized reference for [%q]. Got %q", scase, err) } @@ -273,7 +273,7 @@ func TestParseAuthHost(t *testing.T) { } for _, fcase := range fcases { - named, err := parseAuthHost(fcase.Host) + named, err := ParseAuthHost(fcase.Host) if err == nil { t.Fatalf("Invalid normalized reference for [%q]. Expected failure for %q", fcase, named) }