diff options
| -rw-r--r-- | doc/interop-test-descriptions.md | 8 | ||||
| -rw-r--r-- | examples/objective-c/auth_sample/MakeRPCViewController.m | 2 | ||||
| -rw-r--r-- | src/objective-c/examples/Sample/Sample/ViewController.m | 2 | ||||
| -rw-r--r-- | src/objective-c/examples/SwiftSample/ViewController.swift | 2 | ||||
| -rw-r--r-- | src/objective-c/tests/InteropTestsRemote.m | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/doc/interop-test-descriptions.md b/doc/interop-test-descriptions.md index 53cc47b1f8..e618e967ee 100644 --- a/doc/interop-test-descriptions.md +++ b/doc/interop-test-descriptions.md @@ -471,7 +471,7 @@ with desired oauth scope. The test uses `--default_service_account` with GCE service account email and `--oauth_scope` with the OAuth scope to use. For testing against -grpc-test.sandbox.google.com, "https://www.googleapis.com/auth/xapi.zoo" should +grpc-test.sandbox.googleapis.com, "https://www.googleapis.com/auth/xapi.zoo" should be passed in as `--oauth_scope`. Server features: @@ -568,7 +568,7 @@ variable GOOGLE_APPLICATION_CREDENTIALS, *OR* if GCE credentials is used to fetch the token, `--default_service_account` can be used to pass in GCE service account email. - uses the flag `--oauth_scope` for the oauth scope. For testing against -grpc-test.sandbox.google.com, "https://www.googleapis.com/auth/xapi.zoo" should +grpc-test.sandbox.googleapis.com, "https://www.googleapis.com/auth/xapi.zoo" should be passed as the `--oauth_scope`. Server features: @@ -610,7 +610,7 @@ usable auth implementation, it may specify the file location in the environment variable GOOGLE_APPLICATION_CREDENTIALS - optionally uses the flag `--oauth_scope` for the oauth scope if implementator wishes to use service account credential instead of JWT credential. For testing -against grpc-test.sandbox.google.com, oauth scope +against grpc-test.sandbox.googleapis.com, oauth scope "https://www.googleapis.com/auth/xapi.zoo" should be used. Server features: @@ -1033,7 +1033,7 @@ authenticated via OAuth, then the SimpleResponse should have oauth_scope filled with the scope of the method being invoked. Although a general server-side feature, most test servers won't implement this -feature. The TLS server grpc-test.sandbox.google.com:443 supports this feature. +feature. The TLS server grpc-test.sandbox.googleapis.com:443 supports this feature. It requires at least the OAuth scope `https://www.googleapis.com/auth/xapi.zoo` for authentication to succeed. diff --git a/examples/objective-c/auth_sample/MakeRPCViewController.m b/examples/objective-c/auth_sample/MakeRPCViewController.m index 4fd23dc144..6013186b99 100644 --- a/examples/objective-c/auth_sample/MakeRPCViewController.m +++ b/examples/objective-c/auth_sample/MakeRPCViewController.m @@ -39,7 +39,7 @@ NSString * const kTestScope = @"https://www.googleapis.com/auth/xapi.zoo"; -static NSString * const kTestHostAddress = @"grpc-test.sandbox.google.com"; +static NSString * const kTestHostAddress = @"grpc-test.sandbox.googleapis.com"; // Category for RPC errors to create the descriptions as we want them to appear on our view. @interface NSError (AuthSample) diff --git a/src/objective-c/examples/Sample/Sample/ViewController.m b/src/objective-c/examples/Sample/Sample/ViewController.m index 3d634a340d..433a8a2ba3 100644 --- a/src/objective-c/examples/Sample/Sample/ViewController.m +++ b/src/objective-c/examples/Sample/Sample/ViewController.m @@ -45,7 +45,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - NSString * const kRemoteHost = @"grpc-test.sandbox.google.com"; + NSString * const kRemoteHost = @"grpc-test.sandbox.googleapis.com"; RMTSimpleRequest *request = [[RMTSimpleRequest alloc] init]; request.responseSize = 10; diff --git a/src/objective-c/examples/SwiftSample/ViewController.swift b/src/objective-c/examples/SwiftSample/ViewController.swift index 76dad9e132..a21ce07978 100644 --- a/src/objective-c/examples/SwiftSample/ViewController.swift +++ b/src/objective-c/examples/SwiftSample/ViewController.swift @@ -38,7 +38,7 @@ class ViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - let RemoteHost = "grpc-test.sandbox.google.com" + let RemoteHost = "grpc-test.sandbox.googleapis.com" let request = RMTSimpleRequest() request.responseSize = 10 diff --git a/src/objective-c/tests/InteropTestsRemote.m b/src/objective-c/tests/InteropTestsRemote.m index a67be98431..758cc9346a 100644 --- a/src/objective-c/tests/InteropTestsRemote.m +++ b/src/objective-c/tests/InteropTestsRemote.m @@ -35,7 +35,7 @@ #import "InteropTests.h" -static NSString * const kRemoteSSLHost = @"grpc-test.sandbox.google.com"; +static NSString * const kRemoteSSLHost = @"grpc-test.sandbox.googleapis.com"; /** Tests in InteropTests.m, sending the RPCs to a remote SSL server. */ @interface InteropTestsRemote : InteropTests diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 10566d6bc8..6ce618eb77 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -426,8 +426,8 @@ def cloud_to_prod_jobspec(language, test_case, docker_image=None, auth=False): """Creates jobspec for cloud-to-prod interop test""" container_name = None cmdargs = [ - '--server_host_override=grpc-test.sandbox.google.com', - '--server_host=grpc-test.sandbox.google.com', + '--server_host_override=grpc-test.sandbox.googleapis.com', + '--server_host=grpc-test.sandbox.googleapis.com', '--server_port=443', '--use_tls=true', '--test_case=%s' % test_case] |