mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
79bedc4f46
This fix updates aws-sdk-go and go-ini to recent versions. The aws-sdk-go used to be `v1.4.22` which was more than a year old, and go-ini used to be pre-1.0 release. This fix updates aws-sdk-go to v1.12.66 and go-ini to v1.25.4: ``` github.com/aws/aws-sdk-go v1.12.66 github.com/go-ini/ini v1.25.4 ``` Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
29 lines
627 B
Go
29 lines
627 B
Go
// +build !go1.8
|
|
|
|
package aws
|
|
|
|
import (
|
|
"net/url"
|
|
"strings"
|
|
)
|
|
|
|
// URLHostname will extract the Hostname without port from the URL value.
|
|
//
|
|
// Copy of Go 1.8's net/url#URL.Hostname functionality.
|
|
func URLHostname(url *url.URL) string {
|
|
return stripPort(url.Host)
|
|
|
|
}
|
|
|
|
// stripPort is copy of Go 1.8 url#URL.Hostname functionality.
|
|
// https://golang.org/src/net/url/url.go
|
|
func stripPort(hostport string) string {
|
|
colon := strings.IndexByte(hostport, ':')
|
|
if colon == -1 {
|
|
return hostport
|
|
}
|
|
if i := strings.IndexByte(hostport, ']'); i != -1 {
|
|
return strings.TrimPrefix(hostport[:i], "[")
|
|
}
|
|
return hostport[:colon]
|
|
}
|