Visitar URL original
Merge branch 'main' into jackdingilian-sql-conformance · googleapis/java-bigtable@b107b88 · GitHub
Skip to content
This repository was archived by the owner on Aug 30, 2026. It is now read-only.

Commit b107b88

Browse files
Merge branch 'main' into jackdingilian-sql-conformance
2 parents 160dca4 + a46793a commit b107b88

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/DirectPathFallbackIT.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import static com.google.common.truth.TruthJUnit.assume;
2020

2121
import com.google.api.core.ApiFunction;
22-
import com.google.api.gax.core.FixedCredentialsProvider;
2322
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
24-
import com.google.auth.oauth2.ComputeEngineCredentials;
2523
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
2624
import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
2725
import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv.ConnectionMode;
@@ -127,9 +125,7 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder builder) {
127125

128126
settingsBuilder
129127
.stubSettings()
130-
.setTransportChannelProvider(instrumentedTransportChannelProvider)
131-
// Forcefully ignore GOOGLE_APPLICATION_CREDENTIALS
132-
.setCredentialsProvider(FixedCredentialsProvider.create(ComputeEngineCredentials.create()));
128+
.setTransportChannelProvider(instrumentedTransportChannelProvider);
133129

134130
instrumentedClient = BigtableDataClient.create(settingsBuilder.build());
135131
}

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ExecuteQueryIT.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.google.cloud.bigtable.data.v2.models.sql.ResultSet;
2929
import com.google.cloud.bigtable.data.v2.models.sql.SqlType;
3030
import com.google.cloud.bigtable.data.v2.models.sql.Struct;
31+
import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv;
3132
import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv;
3233
import com.google.cloud.bigtable.test_helpers.env.TestEnvRule;
3334
import com.google.protobuf.ByteString;
@@ -59,6 +60,12 @@ public static void setUpAll() throws IOException {
5960
.withMessage("ExecuteQuery is not supported on Emulator")
6061
.that(testEnvRule.env())
6162
.isNotInstanceOf(EmulatorEnv.class);
63+
assume()
64+
.withMessage("ExecuteQuery only works over CloudPath")
65+
.that(testEnvRule.env().getConnectionMode())
66+
.isNoneOf(
67+
AbstractTestEnv.ConnectionMode.REQUIRE_DIRECT_PATH,
68+
AbstractTestEnv.ConnectionMode.REQUIRE_DIRECT_PATH_IPV4);
6269

6370
tableId = testEnvRule.env().getTableId();
6471
dataClient = testEnvRule.env().getDataClient();

0 commit comments

Comments
 (0)