potyarkin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Merge pull request #8387 from vbatts/vbatts-registry_test_enpoint

Browse source 
registry/endpoint: make it testable
This commit is contained in:
Victor Vieux 2014-10-29 13:36:17 -07:00
commit 5685221c5f
2 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
docs/endpoint.go
View file

@ -35,16 +35,7 @@ func scanForAPIVersion(hostname string) (string, APIVersion) {
}
func NewEndpoint(hostname string) (*Endpoint, error) {
var (
endpoint Endpoint
trimmedHostname string
err error
)
if !strings.HasPrefix(hostname, "http") {
hostname = "https://" + hostname
}
trimmedHostname, endpoint.Version = scanForAPIVersion(hostname)
endpoint.URL, err = url.Parse(trimmedHostname)
endpoint, err := newEndpoint(hostname)
if err != nil {
return nil, err
}
@ -59,6 +50,22 @@ func NewEndpoint(hostname string) (*Endpoint, error) {
}
}
return endpoint, nil
}
func newEndpoint(hostname string) (*Endpoint, error) {
var (
endpoint Endpoint
trimmedHostname string
err error
)
if !strings.HasPrefix(hostname, "http") {
hostname = "https://" + hostname
}
trimmedHostname, endpoint.Version = scanForAPIVersion(hostname)
endpoint.URL, err = url.Parse(trimmedHostname)
if err != nil {
return nil, err
}
return &endpoint, nil
}