From 8bf65c69b99ed9e1106c07c1f5d2f42f312b7ec5 Mon Sep 17 00:00:00 2001 From: Easwar Swaminathan Date: Wed, 12 May 2021 10:18:50 -0700 Subject: [PATCH] xds: use same format while registering and watching resources (#4422) --- xds/internal/testutils/e2e/clientresources.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xds/internal/testutils/e2e/clientresources.go b/xds/internal/testutils/e2e/clientresources.go index b521db95055..7c8311a51cc 100644 --- a/xds/internal/testutils/e2e/clientresources.go +++ b/xds/internal/testutils/e2e/clientresources.go @@ -20,6 +20,8 @@ package e2e import ( "fmt" + "net" + "strconv" "github.com/envoyproxy/go-control-plane/pkg/wellknown" "github.com/golang/protobuf/proto" @@ -160,7 +162,7 @@ func DefaultServerListener(host string, port uint32, secLevel SecurityLevel) *v3 } } return &v3listenerpb.Listener{ - Name: fmt.Sprintf(ServerListenerResourceNameTemplate, fmt.Sprintf("%s:%d", host, port)), + Name: fmt.Sprintf(ServerListenerResourceNameTemplate, net.JoinHostPort(host, strconv.Itoa(int(port)))), Address: &v3corepb.Address{ Address: &v3corepb.Address_SocketAddress{ SocketAddress: &v3corepb.SocketAddress{