From f10a70401b87eb60d9cfe89807ccad39881558d6 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 18 Apr 2017 12:08:59 -0700 Subject: [PATCH] embed: use '*url.URL.Hostname(),Port()' for Go 1.8 Signed-off-by: Gyu-Ho Lee --- embed/config.go | 4 ++-- embed/config_test.go | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/embed/config.go b/embed/config.go index e06a61472..93431d1c6 100644 --- a/embed/config.go +++ b/embed/config.go @@ -387,7 +387,7 @@ func (cfg *Config) UpdateDefaultClusterFromName(defaultInitialCluster string) (s } used := false - pip, pport, _ := net.SplitHostPort(cfg.LPUrls[0].Host) + pip, pport := cfg.LPUrls[0].Hostname(), cfg.LPUrls[0].Port() if cfg.defaultPeerHost() && pip == "0.0.0.0" { cfg.APUrls[0] = url.URL{Scheme: cfg.APUrls[0].Scheme, Host: fmt.Sprintf("%s:%s", defaultHostname, pport)} used = true @@ -397,7 +397,7 @@ func (cfg *Config) UpdateDefaultClusterFromName(defaultInitialCluster string) (s cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name) } - cip, cport, _ := net.SplitHostPort(cfg.LCUrls[0].Host) + cip, cport := cfg.LCUrls[0].Hostname(), cfg.LCUrls[0].Port() if cfg.defaultClientHost() && cip == "0.0.0.0" { cfg.ACUrls[0] = url.URL{Scheme: cfg.ACUrls[0].Scheme, Host: fmt.Sprintf("%s:%s", defaultHostname, cport)} used = true diff --git a/embed/config_test.go b/embed/config_test.go index 1be6bcd9c..27b73238e 100644 --- a/embed/config_test.go +++ b/embed/config_test.go @@ -17,7 +17,6 @@ package embed import ( "fmt" "io/ioutil" - "net" "net/url" "os" "testing" @@ -74,7 +73,7 @@ func TestUpdateDefaultClusterFromName(t *testing.T) { origadvc := cfg.ACUrls[0].String() cfg.Name = "abc" - _, lpport, _ := net.SplitHostPort(cfg.LPUrls[0].Host) + lpport := cfg.LPUrls[0].Port() // in case of 'etcd --name=abc' exp := fmt.Sprintf("%s=%s://localhost:%s", cfg.Name, oldscheme, lpport) @@ -105,13 +104,13 @@ func TestUpdateDefaultClusterFromNameOverwrite(t *testing.T) { origadvc := cfg.ACUrls[0].String() cfg.Name = "abc" - _, lpport, _ := net.SplitHostPort(cfg.LPUrls[0].Host) + lpport := cfg.LPUrls[0].Port() cfg.LPUrls[0] = url.URL{Scheme: cfg.LPUrls[0].Scheme, Host: fmt.Sprintf("0.0.0.0:%s", lpport)} dhost, _ := cfg.UpdateDefaultClusterFromName(defaultInitialCluster) if dhost != defaultHostname { t.Fatalf("expected default host %q, got %q", defaultHostname, dhost) } - aphost, apport, _ := net.SplitHostPort(cfg.APUrls[0].Host) + aphost, apport := cfg.APUrls[0].Hostname(), cfg.APUrls[0].Port() if apport != lpport { t.Fatalf("advertise peer url got different port %s, expected %s", apport, lpport) }