Merge pull request #13950 from liggitt/revert-srv-dot-3.5

Revert #13714
etcd-io · Apr 19, 2022 · b872757 · b872757
2 parents 0452fee + 081b4e2
commit b872757
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -226,12 +226,12 @@ 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: "a.example.com", Port: 2480},
+				{Target: "b.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,
 		},
 	}