From 76564778a9530331f3b8345e9f6083311cc48e11 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 15 Apr 2022 15:33:16 -0400 Subject: [PATCH 1/2] Revert "trim the suffix dot from the srv.Target for etcd-client DNS lookup" This reverts commit 4f51cc1d9a6d31ae5622fe50c90f03962a7ee3a4. --- client/pkg/srv/srv.go | 3 +-- client/pkg/srv/srv_test.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/pkg/srv/srv.go b/client/pkg/srv/srv.go index 21c377e352b..948c6834909 100644 --- a/client/pkg/srv/srv.go +++ b/client/pkg/srv/srv.go @@ -106,10 +106,9 @@ func GetClient(service, domain string, serviceName string) (*SRVClients, error) return err } for _, srv := range addrs { - shortHost := strings.TrimSuffix(srv.Target, ".") urls = append(urls, &url.URL{ Scheme: scheme, - Host: net.JoinHostPort(shortHost, fmt.Sprintf("%d", srv.Port)), + Host: net.JoinHostPort(srv.Target, fmt.Sprintf("%d", srv.Port)), }) } srvs = append(srvs, addrs...) diff --git a/client/pkg/srv/srv_test.go b/client/pkg/srv/srv_test.go index f5c84421b9d..c2ccf9485d9 100644 --- a/client/pkg/srv/srv_test.go +++ b/client/pkg/srv/srv_test.go @@ -226,8 +226,8 @@ func TestSRVDiscover(t *testing.T) { }, { []*net.SRV{ - {Target: "a.example.com.", Port: 2480}, - {Target: "b.example.com.", Port: 2480}, + {Target: "a.example.com", Port: 2480}, + {Target: "b.example.com", Port: 2480}, {Target: "c.example.com", Port: 2480}, }, []*net.SRV{}, From 081b4e2a0f606a30bdad798d1e4b8968543faf0e Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 15 Apr 2022 15:30:32 -0400 Subject: [PATCH 2/2] Add unit test for canonical SRV records --- client/pkg/srv/srv_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/pkg/srv/srv_test.go b/client/pkg/srv/srv_test.go index c2ccf9485d9..bc234dfc798 100644 --- a/client/pkg/srv/srv_test.go +++ b/client/pkg/srv/srv_test.go @@ -228,10 +228,10 @@ func TestSRVDiscover(t *testing.T) { []*net.SRV{ {Target: "a.example.com", Port: 2480}, {Target: "b.example.com", Port: 2480}, - {Target: "c.example.com", Port: 2480}, + {Target: "c.example.com.", Port: 2480}, }, []*net.SRV{}, - []string{"https://a.example.com:2480", "https://b.example.com:2480", "https://c.example.com:2480"}, + []string{"https://a.example.com:2480", "https://b.example.com:2480", "https://c.example.com.:2480"}, false, }, }