Skip to content

Commit 05d49d0

Browse files
authored
[interop client] provide a flag to set google-c2p resolver universe domain (#8145)
* provide a flag on interop_client to set google-c2p resolver universe domai
1 parent 28128e0 commit 05d49d0

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

interop/client/client.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ import (
4848
"google.golang.org/grpc/resolver"
4949
"google.golang.org/grpc/testdata"
5050

51-
_ "google.golang.org/grpc/balancer/grpclb" // Register the grpclb load balancing policy.
52-
_ "google.golang.org/grpc/balancer/rls" // Register the RLS load balancing policy.
53-
_ "google.golang.org/grpc/xds/googledirectpath" // Register xDS resolver required for c2p directpath.
51+
_ "google.golang.org/grpc/balancer/grpclb" // Register the grpclb load balancing policy.
52+
_ "google.golang.org/grpc/balancer/rls" // Register the RLS load balancing policy.
53+
"google.golang.org/grpc/xds/googledirectpath" // Register xDS resolver required for c2p directpath.
5454

5555
testgrpc "google.golang.org/grpc/interop/grpc_testing"
5656
)
@@ -70,6 +70,7 @@ var (
7070
serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file")
7171
oauthScope = flag.String("oauth_scope", "", "The scope for OAuth2 tokens")
7272
defaultServiceAccount = flag.String("default_service_account", "", "Email of GCE default service account")
73+
googleC2PUniverseDomain = flag.String("google_c2p_universe_domain", "", "Universe domain for google-c2p resolve")
7374
serverHost = flag.String("server_host", "localhost", "The server host name")
7475
serverPort = flag.Int("server_port", 10000, "The server port number")
7576
serviceConfigJSON = flag.String("service_config_json", "", "Disables service config lookups and sets the provided string as the default service config.")
@@ -201,6 +202,11 @@ func main() {
201202
}
202203

203204
resolver.SetDefaultScheme("dns")
205+
if len(*googleC2PUniverseDomain) > 0 {
206+
if err := googledirectpath.SetUniverseDomain(*googleC2PUniverseDomain); err != nil {
207+
log.Fatalf("googlec2p.SetUniverseDomain(%s) failed: %v", *googleC2PUniverseDomain, err)
208+
}
209+
}
204210
serverAddr := *serverHost
205211
if *serverPort != 0 {
206212
serverAddr = net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort))

0 commit comments

Comments
 (0)