Skip to content

Commit

Permalink
trim the suffix dot from the srv.Target for etcd-client DNS lookup
Browse files Browse the repository at this point in the history
  • Loading branch information
ahrtr committed Feb 18, 2022
1 parent 99018a7 commit 4f51cc1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion client/pkg/srv/srv.go
Original file line number Diff line number Diff line change
Expand Up @@ -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...)
Expand Down
4 changes: 2 additions & 2 deletions client/pkg/srv/srv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
Expand Down

0 comments on commit 4f51cc1

Please sign in to comment.