kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Make ParseAuthHost public

Browse Source 
Signed-off-by: guillaume <guillaume.derouville@gmail.com>
This commit is contained in:
guillaume 2022-01-31 16:05:58 +01:00
parent f6a71b95cf
commit 1a98c572b8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solver/registryauth.go
View File

@ -51,7 +51,7 @@ func (a *RegistryAuthProvider) Credentials(ctx context.Context, req *bkauth.Cred
defer a.m.RUnlock() defer a.m.RUnlock()
for authHost, auth := range a.credentials { for authHost, auth := range a.credentials {
u, err := parseAuthHost(authHost) u, err := ParseAuthHost(authHost)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -65,7 +65,7 @@ func (a *RegistryAuthProvider) Credentials(ctx context.Context, req *bkauth.Cred
// Parsing function based on splitReposSearchTerm // Parsing function based on splitReposSearchTerm
// "github.com/docker/docker/registry" // "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, "http://")
host = strings.TrimPrefix(host, "https://") host = strings.TrimPrefix(host, "https://")
host = strings.TrimSuffix(host, "/") host = strings.TrimSuffix(host, "/")

4
solver/registryauth_test.go
View File

@ -257,7 +257,7 @@ func TestParseAuthHost(t *testing.T) {
successRefs := []output{} successRefs := []output{}
for _, scase := range scases { for _, scase := range scases {
named, err := parseAuthHost(scase.Host) named, err := ParseAuthHost(scase.Host)
if err != nil { if err != nil {
t.Fatalf("Invalid normalized reference for [%q]. Got %q", scase, err) t.Fatalf("Invalid normalized reference for [%q]. Got %q", scase, err)
} }
@ -273,7 +273,7 @@ func TestParseAuthHost(t *testing.T) {
} }
for _, fcase := range fcases { for _, fcase := range fcases {
named, err := parseAuthHost(fcase.Host) named, err := ParseAuthHost(fcase.Host)
if err == nil { if err == nil {
t.Fatalf("Invalid normalized reference for [%q]. Expected failure for %q", fcase, named) t.Fatalf("Invalid normalized reference for [%q]. Expected failure for %q", fcase, named)
} }