feat: pass a CallCredentials to grpc-java for DirectPath (#1488)

* feat: pass a CallCredentials to grpc-java for DirectPath Co-authored-by: Chanseok Oh <chanseok@google.com>
googleapis · Jan 7, 2022 · 4a7713a · 4a7713a
1 parent 73d078e
commit 4a7713a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java
@@ -47,12 +47,14 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
+import io.grpc.CallCredentials;
 import io.grpc.ChannelCredentials;
 import io.grpc.Grpc;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.TlsChannelCredentials;
-import io.grpc.alts.ComputeEngineChannelBuilder;
+import io.grpc.alts.GoogleDefaultChannelCredentials;
+import io.grpc.auth.MoreCallCredentials;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -336,13 +338,16 @@ private ManagedChannel createSingleChannel() throws IOException, GeneralSecurity
     if (isDirectPathEnabled(serviceAddress)
         && isNonDefaultServiceAccountAllowed()
         && isOnComputeEngine()) {
+      CallCredentials callCreds = MoreCallCredentials.from(credentials);
+      ChannelCredentials channelCreds =
+          GoogleDefaultChannelCredentials.newBuilder().callCredentials(callCreds).build();
       isDirectPathXdsEnabled = Boolean.parseBoolean(envProvider.getenv(DIRECT_PATH_ENV_ENABLE_XDS));
       if (isDirectPathXdsEnabled) {
         // google-c2p resolver target must not have a port number
         builder =
-            ComputeEngineChannelBuilder.forTarget("google-c2p-experimental:///" + serviceAddress);
+            Grpc.newChannelBuilder("google-c2p-experimental:///" + serviceAddress, channelCreds);
       } else {
-        builder = ComputeEngineChannelBuilder.forAddress(serviceAddress, port);
+        builder = Grpc.newChannelBuilderForAddress(serviceAddress, port, channelCreds);
         builder.defaultServiceConfig(directPathServiceConfig);
       }
       // Set default keepAliveTime and keepAliveTimeout when directpath environment is enabled.

diff --git a/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java b/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java
@@ -263,20 +263,9 @@ public void testWithGCECredentials() throws IOException {
     ScheduledExecutorService executor = new ScheduledThreadPoolExecutor(1);
     executor.shutdown();
 
-    ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> channelConfigurator =
-        channelBuilder -> {
-          if (InstantiatingGrpcChannelProvider.isOnComputeEngine()) {
-            assertThat(channelBuilder).isInstanceOf(ComputeEngineChannelBuilder.class);
-          } else {
-            assertThat(channelBuilder).isNotInstanceOf(ComputeEngineChannelBuilder.class);
-          }
-          return channelBuilder;
-        };
-
     TransportChannelProvider provider =
         InstantiatingGrpcChannelProvider.newBuilder()
             .setAttemptDirectPath(true)
-            .setChannelConfigurator(channelConfigurator)
             .build()
             .withExecutor((Executor) executor)
             .withHeaders(Collections.<String, String>emptyMap())