vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

registry: refactor registry.IsSecure calls into registry.NewEndpoint

Browse source 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
This commit is contained in:
Tibor Vass 2014-11-11 17:37:44 -05:00
parent 524aa8b1a6
commit 80255ff224
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
docs/endpoint.go
View file

@ -34,12 +34,15 @@ func scanForAPIVersion(hostname string) (string, APIVersion) {
return hostname, DefaultAPIVersion
}
func NewEndpoint(hostname string, secure bool) (*Endpoint, error) {
endpoint, err := newEndpoint(hostname, secure)
func NewEndpoint(hostname string, insecureRegistries []string) (*Endpoint, error) {
endpoint, err := newEndpoint(hostname)
if err != nil {
return nil, err
}
secure := isSecure(endpoint.URL.Host, insecureRegistries)
endpoint.secure = secure
// Try HTTPS ping to registry
endpoint.URL.Scheme = "https"
if _, err := endpoint.Ping(); err != nil {
@ -65,9 +68,9 @@ func NewEndpoint(hostname string, secure bool) (*Endpoint, error) {
return endpoint, nil
}
func newEndpoint(hostname string, secure bool) (*Endpoint, error) {
func newEndpoint(hostname string) (*Endpoint, error) {
var (
endpoint = Endpoint{secure: secure}
endpoint = Endpoint{secure: true}
trimmedHostname string
err error
)
@ -149,10 +152,9 @@ func (e Endpoint) Ping() (RegistryInfo, error) {
return info, nil
}
// IsSecure returns false if the provided hostname is part of the list of insecure registries.
// isSecure returns false if the provided hostname is part of the list of insecure registries.
// Insecure registries accept HTTP and/or accept HTTPS with certificates from unknown CAs.
func IsSecure(hostname string, insecureRegistries []string) bool {
func isSecure(hostname string, insecureRegistries []string) bool {
if hostname == IndexServerAddress() {
return true
}