test: fix directpath tests (#2556)

igorbernstein2 · web-flow · commit a46793a85b74 · 2025-04-05T01:44:25.000Z
Change-Id: Ie1d14cc80ef26b4f35f6005d5d213d4cf436d950 Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/java-bigtable/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) - [ ] Rollback plan is reviewed and LGTMed - [ ] All new data plane features have a completed end to end testing plan Fixes #<issue_number_goes_here> ☕️ If you write sample code, please follow the [samples format]( https://togithub.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md).
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java
@@ -19,9 +19,7 @@
 import static com.google.common.truth.TruthJUnit.assume;
 
 import com.google.api.core.ApiFunction;
-import com.google.api.gax.core.FixedCredentialsProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
-import com.google.auth.oauth2.ComputeEngineCredentials;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
 import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv.ConnectionMode;
@@ -127,9 +125,7 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder builder) {
 
     settingsBuilder
         .stubSettings()
-        .setTransportChannelProvider(instrumentedTransportChannelProvider)
-        // Forcefully ignore GOOGLE_APPLICATION_CREDENTIALS
-        .setCredentialsProvider(FixedCredentialsProvider.create(ComputeEngineCredentials.create()));
+        .setTransportChannelProvider(instrumentedTransportChannelProvider);
 
     instrumentedClient = BigtableDataClient.create(settingsBuilder.build());
   }
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ExecuteQueryIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ExecuteQueryIT.java
@@ -28,6 +28,7 @@
 import com.google.cloud.bigtable.data.v2.models.sql.ResultSet;
 import com.google.cloud.bigtable.data.v2.models.sql.SqlType;
 import com.google.cloud.bigtable.data.v2.models.sql.Struct;
+import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv;
 import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv;
 import com.google.cloud.bigtable.test_helpers.env.TestEnvRule;
 import com.google.protobuf.ByteString;
@@ -59,6 +60,12 @@ public static void setUpAll() throws IOException {
         .withMessage("ExecuteQuery is not supported on Emulator")
         .that(testEnvRule.env())
         .isNotInstanceOf(EmulatorEnv.class);
+    assume()
+        .withMessage("ExecuteQuery only works over CloudPath")
+        .that(testEnvRule.env().getConnectionMode())
+        .isNoneOf(
+            AbstractTestEnv.ConnectionMode.REQUIRE_DIRECT_PATH,
+            AbstractTestEnv.ConnectionMode.REQUIRE_DIRECT_PATH_IPV4);
 
     tableId = testEnvRule.env().getTableId();
     dataClient = testEnvRule.env().getDataClient();
