@@ -24,7 +24,6 @@ import (
24
24
"testing"
25
25
26
26
"github.com/google/uuid"
27
- "google.golang.org/grpc/credentials"
28
27
"google.golang.org/grpc/credentials/insecure"
29
28
"google.golang.org/grpc/internal/testutils"
30
29
"google.golang.org/grpc/xds/internal/clients"
@@ -66,13 +65,13 @@ func (s) TestResourceUpdateMetrics(t *testing.T) {
66
65
resourceTypes := map [string ]xdsclient.ResourceType {xdsresource .V3ListenerURL : listenerType }
67
66
si := clients.ServerIdentifier {
68
67
ServerURI : mgmtServer .Address ,
69
- Extensions : grpctransport.ServerIdentifierExtension {Credentials : "insecure" },
68
+ Extensions : grpctransport.ServerIdentifierExtension {ConfigName : "insecure" },
70
69
}
71
- credentials := map [string ]credentials. Bundle {"insecure" : insecure .NewBundle ()}
70
+ configs := map [string ]grpctransport. Config {"insecure" : { Credentials : insecure .NewBundle ()} }
72
71
xdsClientConfig := xdsclient.Config {
73
72
Servers : []xdsclient.ServerConfig {{ServerIdentifier : si }},
74
73
Node : clients.Node {ID : nodeID },
75
- TransportBuilder : grpctransport .NewBuilder (credentials ),
74
+ TransportBuilder : grpctransport .NewBuilder (configs ),
76
75
ResourceTypes : resourceTypes ,
77
76
// Xdstp resource names used in this test do not specify an
78
77
// authority. These will end up looking up an entry with the
@@ -153,13 +152,13 @@ func (s) TestServerFailureMetrics_BeforeResponseRecv(t *testing.T) {
153
152
resourceTypes := map [string ]xdsclient.ResourceType {xdsresource .V3ListenerURL : listenerType }
154
153
si := clients.ServerIdentifier {
155
154
ServerURI : mgmtServer .Address ,
156
- Extensions : grpctransport.ServerIdentifierExtension {Credentials : "insecure" },
155
+ Extensions : grpctransport.ServerIdentifierExtension {ConfigName : "insecure" },
157
156
}
158
- credentials := map [string ]credentials. Bundle {"insecure" : insecure .NewBundle ()}
157
+ configs := map [string ]grpctransport. Config {"insecure" : { Credentials : insecure .NewBundle ()} }
159
158
xdsClientConfig := xdsclient.Config {
160
159
Servers : []xdsclient.ServerConfig {{ServerIdentifier : si }},
161
160
Node : clients.Node {ID : nodeID },
162
- TransportBuilder : grpctransport .NewBuilder (credentials ),
161
+ TransportBuilder : grpctransport .NewBuilder (configs ),
163
162
ResourceTypes : resourceTypes ,
164
163
// Xdstp resource names used in this test do not specify an
165
164
// authority. These will end up looking up an entry with the
@@ -235,13 +234,13 @@ func (s) TestServerFailureMetrics_AfterResponseRecv(t *testing.T) {
235
234
resourceTypes := map [string ]xdsclient.ResourceType {xdsresource .V3ListenerURL : listenerType }
236
235
si := clients.ServerIdentifier {
237
236
ServerURI : mgmtServer .Address ,
238
- Extensions : grpctransport.ServerIdentifierExtension {Credentials : "insecure" },
237
+ Extensions : grpctransport.ServerIdentifierExtension {ConfigName : "insecure" },
239
238
}
240
- credentials := map [string ]credentials. Bundle {"insecure" : insecure .NewBundle ()}
239
+ configs := map [string ]grpctransport. Config {"insecure" : { Credentials : insecure .NewBundle ()} }
241
240
xdsClientConfig := xdsclient.Config {
242
241
Servers : []xdsclient.ServerConfig {{ServerIdentifier : si }},
243
242
Node : clients.Node {ID : nodeID },
244
- TransportBuilder : grpctransport .NewBuilder (credentials ),
243
+ TransportBuilder : grpctransport .NewBuilder (configs ),
245
244
ResourceTypes : resourceTypes ,
246
245
// Xdstp resource names used in this test do not specify an
247
246
// authority. These will end up looking up an entry with the
0 commit comments