Merge pull request #13714 from ahrtr/3.5_correct_dns_etcd_client

[3.5] Trim the suffix dot from the srv.Target for etcd-client DNS lookup
etcd-io · Feb 20, 2022 · 31c8e3c · 31c8e3c
2 parents 99018a7 + 4f51cc1
commit 31c8e3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/client/pkg/srv/srv.go b/client/pkg/srv/srv.go
@@ -106,9 +106,10 @@ 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(srv.Target, fmt.Sprintf("%d", srv.Port)),
+				Host:   net.JoinHostPort(shortHost, 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
@@ -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{},