Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/netutil: not export resolve and urlsEqual functions

Browse Source 
They are only used in this package, so there is no need to public them.
This commit is contained in:
Yicheng Qin 2015-08-21 11:58:37 -07:00
parent bad1b20620
commit c530acf6a4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/netutil/netutil.go
View File

@ -34,10 +34,10 @@ var (
resolveTCPAddr = net.ResolveTCPAddr resolveTCPAddr = net.ResolveTCPAddr
) )
// ResolveTCPAddrs is a convenience wrapper for net.ResolveTCPAddr. // resolveTCPAddrs is a convenience wrapper for net.ResolveTCPAddr.
// ResolveTCPAddrs resolves all DNS hostnames in-place for the given set of // resolveTCPAddrs resolves all DNS hostnames in-place for the given set of
// url.URLs. // url.URLs.
func ResolveTCPAddrs(urls ...[]url.URL) error { func resolveTCPAddrs(urls ...[]url.URL) error {
for _, us := range urls { for _, us := range urls {
for i, u := range us { for i, u := range us {
host, _, err := net.SplitHostPort(u.Host) host, _, err := net.SplitHostPort(u.Host)
@ -63,13 +63,13 @@ func ResolveTCPAddrs(urls ...[]url.URL) error {
return nil return nil
} }
// URLsEqual checks equality of url.URLS between two arrays. // urlsEqual checks equality of url.URLS between two arrays.
// This check pass even if an URL is in hostname and opposite is in IP address. // This check pass even if an URL is in hostname and opposite is in IP address.
func URLsEqual(a []url.URL, b []url.URL) bool { func urlsEqual(a []url.URL, b []url.URL) bool {
if len(a) != len(b) { if len(a) != len(b) {
return false return false
} }
ResolveTCPAddrs(a, b) resolveTCPAddrs(a, b)
sort.Sort(types.URLs(a)) sort.Sort(types.URLs(a))
sort.Sort(types.URLs(b)) sort.Sort(types.URLs(b))
for i := range a { for i := range a {
@ -102,7 +102,7 @@ func URLStringsEqual(a []string, b []string) bool {
urlsB = append(urlsB, *u) urlsB = append(urlsB, *u)
} }
return URLsEqual(urlsA, urlsB) return urlsEqual(urlsA, urlsB)
} }
// BasicAuth returns the username and password provided in the request's // BasicAuth returns the username and password provided in the request's

4
pkg/netutil/netutil_test.go
View File

@ -124,7 +124,7 @@ func TestResolveTCPAddrs(t *testing.T) {
} }
return &net.TCPAddr{IP: net.ParseIP(tt.hostMap[host]), Port: i, Zone: ""}, nil return &net.TCPAddr{IP: net.ParseIP(tt.hostMap[host]), Port: i, Zone: ""}, nil
} }
err := ResolveTCPAddrs(tt.urls...) err := resolveTCPAddrs(tt.urls...)
if tt.hasError { if tt.hasError {
if err == nil { if err == nil {
t.Errorf("expected error") t.Errorf("expected error")
@ -244,7 +244,7 @@ func TestURLsEqual(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
result := URLsEqual(test.a, test.b) result := urlsEqual(test.a, test.b)
if result != test.expect { if result != test.expect {
t.Errorf("a:%v b:%v, expected %v but %v", test.a, test.b, test.expect, result) t.Errorf("a:%v b:%v, expected %v but %v", test.a, test.b, test.expect, result)
} }