diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2015-10-06 16:47:49 -0700 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2015-10-06 17:57:45 -0700 |
commit | 5bd7005833b60d9db31860049458b122fa496599 (patch) | |
tree | 8c05e9f2c6c6cda444330901aa09f78feb29a6c7 /src/csharp/Grpc.IntegrationTesting/InteropClient.cs | |
parent | 9e5e7e9a6cde7f9d91b00cb65b3c99e01916c813 (diff) |
introduce the new split-type credentials api
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/InteropClient.cs')
-rw-r--r-- | src/csharp/Grpc.IntegrationTesting/InteropClient.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs index c99084d1a9..0df4ee35ba 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs @@ -132,22 +132,22 @@ namespace Grpc.IntegrationTesting await channel.ShutdownAsync(); } - private async Task<Credentials> CreateCredentialsAsync() + private async Task<ChannelCredentials> CreateCredentialsAsync() { - var credentials = options.UseTls ? TestCredentials.CreateTestClientCredentials(options.UseTestCa) : Credentials.Insecure; + var credentials = options.UseTls ? TestCredentials.CreateTestClientCredentials(options.UseTestCa) : ChannelCredentials.Insecure; if (options.TestCase == "jwt_token_creds") { var googleCredential = await GoogleCredential.GetApplicationDefaultAsync(); Assert.IsTrue(googleCredential.IsCreateScopedRequired); - credentials = CompositeCredentials.Create(googleCredential.ToGrpcCredentials(), credentials); + credentials = ChannelCredentials.Create(credentials, googleCredential.ToGrpcCredentials()); } if (options.TestCase == "compute_engine_creds") { var googleCredential = await GoogleCredential.GetApplicationDefaultAsync(); Assert.IsFalse(googleCredential.IsCreateScopedRequired); - credentials = CompositeCredentials.Create(googleCredential.ToGrpcCredentials(), credentials); + credentials = ChannelCredentials.Create(credentials, googleCredential.ToGrpcCredentials()); } return credentials; } |