Skip to content

xds: use same format while registering and watching resources #4422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
easwars merged 2 commits into from
May 12, 2021
Merged

xds: use same format while registering and watching resources #4422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4839ef5
xds: use same format while registering and watching resources
easwars May 11, 2021
b2f6f09
use net.JoinHostPort() instead
easwars May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions xds/internal/test/xds_server_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ func (s) TestServerSideXDS_Fallback(t *testing.T) {
// Create an inbound xDS listener resource for the server side that does not
// contain any security configuration. This should force the server-side
// xdsCredentials to use fallback.
inboundLis := e2e.DefaultServerListener(host, port, e2e.SecurityLevelNone)
name := fmt.Sprintf(e2e.ServerListenerResourceNameTemplate, lis.Addr().String())
inboundLis := e2e.DefaultServerListener(name, host, port, e2e.SecurityLevelNone)
resources.Listeners = append(resources.Listeners, inboundLis)

// Setup the management server with client and server-side resources.
Expand Down Expand Up @@ -217,7 +218,8 @@ func (s) TestServerSideXDS_FileWatcherCerts(t *testing.T) {
// Create an inbound xDS listener resource for the server side that
// contains security configuration pointing to the file watcher
// plugin.
inboundLis := e2e.DefaultServerListener(host, port, test.secLevel)
name := fmt.Sprintf(e2e.ServerListenerResourceNameTemplate, lis.Addr().String())
inboundLis := e2e.DefaultServerListener(name, host, port, test.secLevel)
resources.Listeners = append(resources.Listeners, inboundLis)

// Setup the management server with client and server resources.
Expand Down Expand Up @@ -282,7 +284,8 @@ func (s) TestServerSideXDS_SecurityConfigChange(t *testing.T) {
// Create an inbound xDS listener resource for the server side that does not
// contain any security configuration. This should force the xDS credentials
// on server to use its fallback.
inboundLis := e2e.DefaultServerListener(host, port, e2e.SecurityLevelNone)
name := fmt.Sprintf(e2e.ServerListenerResourceNameTemplate, lis.Addr().String())
inboundLis := e2e.DefaultServerListener(name, host, port, e2e.SecurityLevelNone)
resources.Listeners = append(resources.Listeners, inboundLis)

// Setup the management server with client and server-side resources.
Expand Down Expand Up @@ -336,7 +339,7 @@ func (s) TestServerSideXDS_SecurityConfigChange(t *testing.T) {
Port: port,
SecLevel: e2e.SecurityLevelMTLS,
})
inboundLis = e2e.DefaultServerListener(host, port, e2e.SecurityLevelMTLS)
inboundLis = e2e.DefaultServerListener(name, host, port, e2e.SecurityLevelMTLS)
resources.Listeners = append(resources.Listeners, inboundLis)
if err := managementServer.Update(resources); err != nil {
t.Fatal(err)
Expand Down
6 changes: 4 additions & 2 deletions xds/internal/test/xds_server_serving_mode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,14 @@ func (s) TestServerSideXDS_ServingModeChanges(t *testing.T) {
if err != nil {
t.Fatalf("failed to retrieve host and port of server: %v", err)
}
listener1 := e2e.DefaultServerListener(host1, port1, e2e.SecurityLevelNone)
name1 := fmt.Sprintf(e2e.ServerListenerResourceNameTemplate, lis1.Addr().String())
listener1 := e2e.DefaultServerListener(name1, host1, port1, e2e.SecurityLevelNone)
host2, port2, err := hostPortFromListener(lis2)
if err != nil {
t.Fatalf("failed to retrieve host and port of server: %v", err)
}
listener2 := e2e.DefaultServerListener(host2, port2, e2e.SecurityLevelNone)
name2 := fmt.Sprintf(e2e.ServerListenerResourceNameTemplate, lis2.Addr().String())
listener2 := e2e.DefaultServerListener(name2, host2, port2, e2e.SecurityLevelNone)
resources := e2e.UpdateOptions{
NodeID: xdsClientNodeID,
Listeners: []*v3listenerpb.Listener{listener1, listener2},
Expand Down
6 changes: 2 additions & 4 deletions xds/internal/testutils/e2e/clientresources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
package e2e

import (
"fmt"

"github.com/envoyproxy/go-control-plane/pkg/wellknown"
"github.com/golang/protobuf/proto"
"google.golang.org/grpc/internal/testutils"
Expand Down Expand Up @@ -122,7 +120,7 @@ func DefaultClientListener(target, routeName string) *v3listenerpb.Listener {

// DefaultServerListener returns a basic xds Listener resource to be used on
// the server side.
func DefaultServerListener(host string, port uint32, secLevel SecurityLevel) *v3listenerpb.Listener {
func DefaultServerListener(name, host string, port uint32, secLevel SecurityLevel) *v3listenerpb.Listener {
var tlsContext *v3tlspb.DownstreamTlsContext
switch secLevel {
case SecurityLevelNone:
Expand Down Expand Up @@ -160,7 +158,7 @@ func DefaultServerListener(host string, port uint32, secLevel SecurityLevel) *v3
}
}
return &v3listenerpb.Listener{
Name: fmt.Sprintf(ServerListenerResourceNameTemplate, fmt.Sprintf("%s:%d", host, port)),
Name: name,
Copy link
Contributor

@menghanl menghanl May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to have the ability to name the resource separately?

If this is just to fix [], use https://golang.org/pkg/net/#JoinHostPort?

Copy link
Contributor Author

@easwars easwars May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks.

Address: &v3corepb.Address{
Address: &v3corepb.Address_SocketAddress{
SocketAddress: &v3corepb.SocketAddress{
Expand Down