fix: update GrpcStorageOptions to attempt direct path by default (#2715)

Update our tests to not attempt direct path, as we do not always run in gce.
googleapis · Sep 20, 2024 · 9de9a92 · 9de9a92
1 parent 2c7f088
commit 9de9a92
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java
@@ -689,7 +689,7 @@ public Duration getTerminationAwaitDuration() {
     /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */
     @BetaApi
     public boolean isAttemptDirectPath() {
-      return false;
+      return true;
     }
 
     /** @since 2.41.0 This new api is in preview and is subject to breaking changes. */

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/FakeServer.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/FakeServer.java
@@ -61,6 +61,7 @@ static FakeServer of(StorageGrpc.StorageImplBase service) throws IOException {
             .setCredentials(NoCredentials.getInstance())
             .setGrpcInterceptorProvider(GrpcPlainRequestLoggingInterceptor.getInterceptorProvider())
             .setEnableGrpcClientMetrics(false)
+            .setAttemptDirectPath(false)
             .build();
     return new FakeServer(server, grpcStorageOptions);
   }

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/ITStorageLifecycleTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/ITStorageLifecycleTest.java
@@ -51,6 +51,7 @@ public void grpc() throws Exception {
             .setCredentials(NoCredentials.getInstance())
             .setProjectId("test-project-id")
             .setEnableGrpcClientMetrics(false)
+            .setAttemptDirectPath(false)
             .build();
 
     Storage service1 = options.getService();

diff --git a/...ud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RetryTestFixture.java b/...ud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RetryTestFixture.java
@@ -160,7 +160,8 @@ private Storage newStorage(boolean forTest) {
           builder =
               StorageOptions.grpc()
                   .setHost(testBench.getGRPCBaseUri())
-                  .setEnableGrpcClientMetrics(false);
+                  .setEnableGrpcClientMetrics(false)
+                  .setAttemptDirectPath(false);
           break;
         default:
           throw new IllegalStateException(

diff --git a/...e-cloud-storage/src/test/java/com/google/cloud/storage/it/ITGrpcIdempotencyTokenTest.java b/...e-cloud-storage/src/test/java/com/google/cloud/storage/it/ITGrpcIdempotencyTokenTest.java
@@ -69,6 +69,7 @@ public void setUp() throws Exception {
         StorageOptions.grpc()
             .setGrpcInterceptorProvider(() -> ImmutableList.of(requestAuditing))
             .setEnableGrpcClientMetrics(false)
+            .setAttemptDirectPath(false)
             .build()
             .getService();
   }

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/StorageNativeCanary.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/StorageNativeCanary.java
@@ -57,7 +57,12 @@ public void canary_happyPath_http() throws Exception {
 
   @Test
   public void canary_happyPath_grpc() throws Exception {
-    assertBehaviorOfPrimaryStorageActions(StorageOptions.grpc().build().getService());
+    assertBehaviorOfPrimaryStorageActions(
+        StorageOptions.grpc()
+            // TODO https://github.com/googleapis/java-storage/issues/2716
+            .setAttemptDirectPath(false)
+            .build()
+            .getService());
   }
 
   /**

diff --git a/...d-storage/src/test/java/com/google/cloud/storage/it/runner/registry/BackendResources.java b/...d-storage/src/test/java/com/google/cloud/storage/it/runner/registry/BackendResources.java
@@ -118,6 +118,7 @@ static BackendResources of(Backend backend) {
                       .setGrpcInterceptorProvider(
                           GrpcPlainRequestLoggingInterceptor.getInterceptorProvider())
                       .setEnableGrpcClientMetrics(false)
+                      .setAttemptDirectPath(false)
                       .build();
               return new StorageInstance(built, protectedBucketNames);
             });