From e14c3f041df9854d9f400a77eb7559b01857fb39 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Wed, 5 Mar 2025 21:07:32 +0000 Subject: [PATCH 1/2] provide a flag on interop_client to set google-c2p resolver universe domain --- interop/client/client.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interop/client/client.go b/interop/client/client.go index 249dd637ab9d..700a409938fe 100644 --- a/interop/client/client.go +++ b/interop/client/client.go @@ -70,6 +70,7 @@ var ( serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file") oauthScope = flag.String("oauth_scope", "", "The scope for OAuth2 tokens") defaultServiceAccount = flag.String("default_service_account", "", "Email of GCE default service account") + googleC2PUniverseDomain = flag.String("google_c2p_universe_domain", "", "Universe domain for google-c2p resolve") serverHost = flag.String("server_host", "localhost", "The server host name") serverPort = flag.Int("server_port", 10000, "The server port number") 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() { } resolver.SetDefaultScheme("dns") + if len(*googleC2PUniverseDomain) > 0 { + if err := googlec2p.SetUniverseDomain(*googleC2PUniverseDomain); err != nil { + log.Fatalf("googlec2p.SetUniverseDomain(%s) failed: %v", *googleC2PUniverseDomain, err) + } + } serverAddr := *serverHost if *serverPort != 0 { serverAddr = net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort)) From f9c06c8e3802a3d940fc7be74fae3fe04a30b7ee Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Wed, 5 Mar 2025 21:36:37 +0000 Subject: [PATCH 2/2] fix import --- interop/client/client.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interop/client/client.go b/interop/client/client.go index 700a409938fe..42d4208bdc35 100644 --- a/interop/client/client.go +++ b/interop/client/client.go @@ -48,9 +48,9 @@ import ( "google.golang.org/grpc/resolver" "google.golang.org/grpc/testdata" - _ "google.golang.org/grpc/balancer/grpclb" // Register the grpclb load balancing policy. - _ "google.golang.org/grpc/balancer/rls" // Register the RLS load balancing policy. - _ "google.golang.org/grpc/xds/googledirectpath" // Register xDS resolver required for c2p directpath. + _ "google.golang.org/grpc/balancer/grpclb" // Register the grpclb load balancing policy. + _ "google.golang.org/grpc/balancer/rls" // Register the RLS load balancing policy. + "google.golang.org/grpc/xds/googledirectpath" // Register xDS resolver required for c2p directpath. testgrpc "google.golang.org/grpc/interop/grpc_testing" ) @@ -203,7 +203,7 @@ func main() { resolver.SetDefaultScheme("dns") if len(*googleC2PUniverseDomain) > 0 { - if err := googlec2p.SetUniverseDomain(*googleC2PUniverseDomain); err != nil { + if err := googledirectpath.SetUniverseDomain(*googleC2PUniverseDomain); err != nil { log.Fatalf("googlec2p.SetUniverseDomain(%s) failed: %v", *googleC2PUniverseDomain, err) } }