test: enable gax-grpc

Author: diegomarquezp

sdk-platform-java/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

@@ -82,6 +82,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslProvider;
 import javax.annotation.Nullable;
 import javax.net.ssl.KeyManagerFactory;
 
@@ -816,6 +821,8 @@ public ManagedChannelBuilder<?> createDecoratedChannelBuilder() throws IOExcepti
       builder = channelConfigurator.apply(builder);
     }
 
+    configurePqc(builder);
+
     return builder;
   }
 
@@ -829,6 +836,29 @@ private ManagedChannel createSingleChannel() throws IOException {
     return managedChannel;
   }
 
+  private void configurePqc(ManagedChannelBuilder<?> builder) {
+    NettyChannelBuilder nettyBuilder = (NettyChannelBuilder) builder;
+    try {
+      ApplicationProtocolConfig apn =
+          new ApplicationProtocolConfig(
+              ApplicationProtocolConfig.Protocol.ALPN,
+              ApplicationProtocolConfig.SelectorFailureBehavior.NO_ADVERTISE,
+              ApplicationProtocolConfig.SelectedListenerFailureBehavior.ACCEPT,
+              "h2");
+
+      SslContext shadedSslContext =
+          SslContextBuilder.forClient()
+              .sslProvider(SslProvider.JDK)
+              .protocols("TLSv1.3")
+              .applicationProtocolConfig(apn)
+              .build();
+
+      nettyBuilder.sslContext(shadedSslContext);
+    } catch (Exception e) {
+      LOG.log(Level.WARNING, "Failed to configure shaded gRPC Netty channel for PQC", e);
+    }
+  }
+
   /* Remove provided headers that will also get set by {@link com.google.auth.ApiKeyCredentials}. They will be added as part of the grpc call when performing auth
    * {@link io.grpc.auth.GoogleAuthLibraryCallCredentials#applyRequestMetadata}.  GRPC does not dedup headers {@link https://github.com/grpc/grpc-java/blob/a140e1bb0cfa662bcdb7823d73320eb8d49046f1/api/src/main/java/io/grpc/Metadata.java#L504} so we must before initiating the call.
    *

sdk-platform-java/pqc-test/pqc-test-common/src/main/java/com/google/api/gax/httpjson/PqcConnectivityTest.java

@@ -35,11 +35,6 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import com.google.api.gax.core.NoCredentialsProvider;
-import com.google.api.gax.rpc.ApiException;
-import com.google.api.gax.rpc.StatusCode;
-import com.google.cloud.NoCredentials;
-import com.google.cloud.bigquery.*;
-import com.google.cloud.translate.v3.*;
 import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig;
 import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
@@ -272,51 +267,38 @@ public static void teardown() {
   }
 
   private void runGrpcTest(int port, boolean shouldSucceed) throws Exception {
-    TranslationServiceSettings.Builder settingsBuilder =
-        TranslationServiceSettings.newBuilder()
+    com.google.api.gax.grpc.InstantiatingGrpcChannelProvider.Builder channelProviderBuilder =
+        com.google.api.gax.grpc.InstantiatingGrpcChannelProvider.newBuilder()
             .setEndpoint("localhost:" + port)
-            .setCredentialsProvider(NoCredentialsProvider.create());
+            .setHeaderProvider(() -> java.util.Collections.emptyMap());
 
-    com.google.api.gax.grpc.InstantiatingGrpcChannelProvider.Builder channelProviderBuilder =
-        ((com.google.api.gax.grpc.InstantiatingGrpcChannelProvider)
-                settingsBuilder.getTransportChannelProvider())
-            .toBuilder();
-    channelProviderBuilder.setChannelConfigurator(
-        new com.google.api.core.ApiFunction<
-            io.grpc.ManagedChannelBuilder, io.grpc.ManagedChannelBuilder>() {
-          @Override
-          public io.grpc.ManagedChannelBuilder apply(io.grpc.ManagedChannelBuilder builder) {
-            if (clientSupportsPqc()) {
-              configureGrpcChannelForPqc(builder);
-            } else {
-              configureGrpcChannelForClassical(builder);
-            }
-            return builder;
-          }
-        });
-    settingsBuilder.setTransportChannelProvider(channelProviderBuilder.build());
-
-    TranslationServiceSettings settings = settingsBuilder.build();
-
-    try (TranslationServiceClient client = TranslationServiceClient.create(settings)) {
-      List<String> contents = new ArrayList<>();
-      contents.add("house");
-      TranslateTextRequest request =
-          TranslateTextRequest.newBuilder()
-              .setParent("projects/test-project")
-              .addAllContents(contents)
+
+    com.google.api.gax.grpc.InstantiatingGrpcChannelProvider channelProvider = channelProviderBuilder.build();
+    com.google.api.gax.rpc.TransportChannel transportChannel = channelProvider.getTransportChannel();
+    io.grpc.Channel channel = ((com.google.api.gax.grpc.GrpcTransportChannel) transportChannel).getChannel();
+
+    try {
+      io.grpc.MethodDescriptor<byte[], byte[]> method =
+          io.grpc.MethodDescriptor.<byte[], byte[]>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("Greeter/SayHello")
+              .setRequestMarshaller(new ByteMarshaller())
+              .setResponseMarshaller(new ByteMarshaller())
               .build();
 
-      try {
-        TranslateTextResponse response = client.translateText(request);
-        if (!shouldSucceed) {
-          fail("Expected gRPC call to fail!");
-        }
-        assertNotNull(response);
-      } catch (ApiException e) {
-        if (shouldSucceed) {
-          fail("Expected gRPC call to succeed, but failed: " + e.getMessage(), e);
-        }
+      byte[] response = io.grpc.stub.ClientCalls.blockingUnaryCall(channel, method, io.grpc.CallOptions.DEFAULT, "request".getBytes());
+      if (!shouldSucceed) {
+        fail("Expected gRPC call to fail!");
+      }
+      assertNotNull(response);
+      assertEquals("PQC gRPC OK", new String(response));
+    } catch (Exception e) {
+      if (shouldSucceed) {
+        fail("Expected gRPC call to succeed, but failed: " + e.getMessage(), e);
+      }
+    } finally {
+      if (channel instanceof io.grpc.ManagedChannel) {
+        ((io.grpc.ManagedChannel) channel).shutdownNow();
       }
     }
   }
@@ -395,4 +377,20 @@ private static void configureGrpcChannelForClassical(io.grpc.ManagedChannelBuild
       throw new RuntimeException("Failed to configure shaded gRPC Netty channel for Classical", e);
     }
   }
+
+  private static class ByteMarshaller implements io.grpc.MethodDescriptor.Marshaller<byte[]> {
+    @Override
+    public InputStream stream(byte[] value) {
+      return new java.io.ByteArrayInputStream(value);
+    }
+
+    @Override
+    public byte[] parse(InputStream stream) {
+      try {
+        return com.google.common.io.ByteStreams.toByteArray(stream);
+      } catch (java.io.IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
 }

sdk-platform-java/pqc-test/pqc-test-common/src/main/java/com/google/api/gax/pqc/PqcTestServer.java

@@ -42,7 +42,6 @@
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.security.KeyStore;
-import java.security.Security;
 import java.util.List;
 import java.util.function.BiFunction;
 import javax.net.ssl.KeyManagerFactory;
@@ -228,8 +227,6 @@ public void stop() {
     if (httpServerClassical != null) httpServerClassical.stop(0);
     if (grpcServerPqc != null) grpcServerPqc.shutdown();
     if (grpcServerClassical != null) grpcServerClassical.shutdown();
-    Security.removeProvider("BC");
-    Security.removeProvider("BCJSSE");
   }
 
   public int getHttpPqcPort() {