grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
apolcyn 2025-05-27 22:32:07 -07:00 committed by GitHub
parent 28128e0b1f
commit 05d49d0147
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
interop/client/client.go
View File

@ -48,9 +48,9 @@ import (
"google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver"
"google.golang.org/grpc/testdata" "google.golang.org/grpc/testdata"
_ "google.golang.org/grpc/balancer/grpclb" // Register the grpclb load balancing policy. _ "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/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/xds/googledirectpath" // Register xDS resolver required for c2p directpath.
testgrpc "google.golang.org/grpc/interop/grpc_testing" testgrpc "google.golang.org/grpc/interop/grpc_testing"
) )
@ -70,6 +70,7 @@ var (
serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file") serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file")
oauthScope = flag.String("oauth_scope", "", "The scope for OAuth2 tokens") oauthScope = flag.String("oauth_scope", "", "The scope for OAuth2 tokens")
defaultServiceAccount = flag.String("default_service_account", "", "Email of GCE default service account") 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") serverHost = flag.String("server_host", "localhost", "The server host name")
serverPort = flag.Int("server_port", 10000, "The server port number") 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.") 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") resolver.SetDefaultScheme("dns")
if len(*googleC2PUniverseDomain) > 0 {
if err := googledirectpath.SetUniverseDomain(*googleC2PUniverseDomain); err != nil {
log.Fatalf("googlec2p.SetUniverseDomain(%s) failed: %v", *googleC2PUniverseDomain, err)
}
}
serverAddr := *serverHost serverAddr := *serverHost
if *serverPort != 0 { if *serverPort != 0 {
serverAddr = net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort)) serverAddr = net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort))