Skip to content

Commit 26385f9

Browse files
test: disable mtls checks during tests (#4052)
* test: disable mtls checks during tests Disable MTLS checks during tests, as the check is otherwise executed for every stub creation. This slows down running the tests locally to the point that they are unusable. This workaround should be removed once googleapis/sdk-platform-java#3911 has been fixed. * chore: generate libraries at Sat Sep 20 05:24:30 UTC 2025 --------- Co-authored-by: cloud-java-bot <[email protected]>
1 parent 468b7c0 commit 26385f9

29 files changed

+166
-41
lines changed

google-cloud-spanner/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,20 @@
369369
<scope>test</scope>
370370
</dependency>
371371

372+
<!-- Used to work around https://github.com/googleapis/sdk-platform-java/issues/3911 -->
373+
<dependency>
374+
<groupId>net.bytebuddy</groupId>
375+
<artifactId>byte-buddy</artifactId>
376+
<version>1.17.7</version>
377+
<scope>test</scope>
378+
</dependency>
379+
<dependency>
380+
<groupId>net.bytebuddy</groupId>
381+
<artifactId>byte-buddy-agent</artifactId>
382+
<version>1.17.7</version>
383+
<scope>test</scope>
384+
</dependency>
385+
372386
<!-- Executor tests - The 'provided' scope is overwritten to compile time scope for the profile 'executor-tests' -->
373387
<dependency>
374388
<groupId>com.google.api.grpc</groupId>

google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractAsyncTransactionTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
1920
import static com.google.cloud.spanner.MockSpannerTestUtil.EMPTY_KEY_VALUE_RESULTSET;
2021
import static com.google.cloud.spanner.MockSpannerTestUtil.INVALID_UPDATE_STATEMENT;
2122
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_MULTIPLE_KEY_VALUE_RESULTSET;
@@ -56,6 +57,7 @@ public abstract class AbstractAsyncTransactionTest {
5657

5758
@BeforeClass
5859
public static void setup() throws Exception {
60+
disableDefaultMtlsProvider();
5961
mockSpanner = new MockSpannerServiceImpl();
6062
mockSpanner.setAbortProbability(0.0D);
6163
mockSpanner.putStatementResult(

google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractMockServerTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
20+
1921
import com.google.api.gax.grpc.testing.LocalChannelProvider;
2022
import com.google.cloud.NoCredentials;
2123
import com.google.cloud.spanner.admin.database.v1.MockDatabaseAdminImpl;
@@ -31,7 +33,6 @@
3133
import io.grpc.Server;
3234
import io.grpc.inprocess.InProcessServerBuilder;
3335
import io.grpc.stub.StreamObserver;
34-
import java.io.IOException;
3536
import java.util.concurrent.atomic.AtomicBoolean;
3637
import org.junit.After;
3738
import org.junit.AfterClass;
@@ -49,7 +50,8 @@ abstract class AbstractMockServerTest {
4950
protected Spanner spanner;
5051

5152
@BeforeClass
52-
public static void startMockServer() throws IOException {
53+
public static void startMockServer() throws Exception {
54+
disableDefaultMtlsProvider();
5355
mockSpanner = new MockSpannerServiceImpl();
5456
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
5557
mockInstanceAdmin = new MockInstanceAdminImpl();

google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractNettyMockServerTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
20+
1921
import com.google.api.gax.grpc.testing.LocalChannelProvider;
2022
import com.google.cloud.NoCredentials;
2123
import io.grpc.ForwardingServerCall;
@@ -26,7 +28,6 @@
2628
import io.grpc.ServerCallHandler;
2729
import io.grpc.ServerInterceptor;
2830
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
29-
import java.io.IOException;
3031
import java.net.InetSocketAddress;
3132
import java.util.Random;
3233
import java.util.concurrent.ExecutorService;
@@ -52,7 +53,8 @@ abstract class AbstractNettyMockServerTest {
5253
protected Spanner spanner;
5354

5455
@BeforeClass
55-
public static void startMockServer() throws IOException {
56+
public static void startMockServer() throws Exception {
57+
disableDefaultMtlsProvider();
5658
mockSpanner = new MockSpannerServiceImpl();
5759
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
5860

google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackendExhaustedTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
1920
import static com.google.common.truth.Truth.assertThat;
2021

2122
import com.google.api.gax.grpc.testing.LocalChannelProvider;
@@ -32,7 +33,6 @@
3233
import io.grpc.Server;
3334
import io.grpc.Status;
3435
import io.grpc.inprocess.InProcessServerBuilder;
35-
import java.io.IOException;
3636
import java.util.concurrent.Executors;
3737
import java.util.concurrent.ScheduledExecutorService;
3838
import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -89,7 +89,8 @@ public class BackendExhaustedTest {
8989
private DatabaseClientImpl client;
9090

9191
@BeforeClass
92-
public static void startStaticServer() throws IOException {
92+
public static void startStaticServer() throws Exception {
93+
disableDefaultMtlsProvider();
9394
mockSpanner = new MockSpannerServiceImpl();
9495
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
9596
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));

google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsSlowTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.google.cloud.spanner;
1717

18+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
1819
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_RESULTSET;
1920
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_STATEMENT;
2021
import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1;
@@ -32,7 +33,6 @@
3233
import com.google.common.util.concurrent.MoreExecutors;
3334
import io.grpc.Server;
3435
import io.grpc.inprocess.InProcessServerBuilder;
35-
import java.io.IOException;
3636
import java.time.Duration;
3737
import java.util.ArrayList;
3838
import java.util.List;
@@ -59,7 +59,8 @@ public class BatchCreateSessionsSlowTest {
5959
private Spanner spanner;
6060

6161
@BeforeClass
62-
public static void startStaticServer() throws IOException {
62+
public static void startStaticServer() throws Exception {
63+
disableDefaultMtlsProvider();
6364
mockSpanner = new MockSpannerServiceImpl();
6465
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
6566
mockSpanner.putStatementResult(

google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
1920
import static org.hamcrest.CoreMatchers.equalTo;
2021
import static org.hamcrest.CoreMatchers.is;
2122
import static org.hamcrest.MatcherAssert.assertThat;
@@ -33,7 +34,6 @@
3334
import io.grpc.Server;
3435
import io.grpc.Status;
3536
import io.grpc.inprocess.InProcessServerBuilder;
36-
import java.io.IOException;
3737
import java.util.concurrent.TimeUnit;
3838
import org.junit.AfterClass;
3939
import org.junit.Before;
@@ -78,7 +78,8 @@ public class BatchCreateSessionsTest {
7878
private static LocalChannelProvider channelProvider;
7979

8080
@BeforeClass
81-
public static void startStaticServer() throws IOException {
81+
public static void startStaticServer() throws Exception {
82+
disableDefaultMtlsProvider();
8283
mockSpanner = new MockSpannerServiceImpl();
8384
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
8485
mockSpanner.putStatementResult(StatementResult.query(SELECT1AND2, SELECT1_RESULTSET));

google-cloud-spanner/src/test/java/com/google/cloud/spanner/ChannelUsageTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
1920
import static io.grpc.Grpc.TRANSPORT_ATTR_REMOTE_ADDR;
2021
import static org.junit.Assert.assertEquals;
2122
import static org.junit.Assert.assertTrue;
@@ -40,7 +41,6 @@
4041
import io.grpc.ServerCallHandler;
4142
import io.grpc.ServerInterceptor;
4243
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
43-
import java.io.IOException;
4444
import java.net.InetSocketAddress;
4545
import java.time.Duration;
4646
import java.util.Arrays;
@@ -113,7 +113,8 @@ public static Collection<Object[]> data() {
113113
private static Level originalLogLevel;
114114

115115
@BeforeClass
116-
public static void startServer() throws IOException {
116+
public static void startServer() throws Exception {
117+
disableDefaultMtlsProvider();
117118
mockSpanner = new MockSpannerServiceImpl();
118119
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
119120
mockSpanner.putStatementResult(StatementResult.query(SELECT1, SELECT1_RESULTSET));

google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
1920
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_COLUMN_NAMES;
2021
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_RESULTSET;
2122
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_STATEMENT;
@@ -113,7 +114,6 @@
113114
import io.grpc.protobuf.lite.ProtoLiteUtils;
114115
import io.opencensus.trace.Tracing;
115116
import io.opentelemetry.api.OpenTelemetry;
116-
import java.io.IOException;
117117
import java.nio.charset.StandardCharsets;
118118
import java.time.Duration;
119119
import java.time.Instant;
@@ -209,7 +209,8 @@ public class DatabaseClientImplTest {
209209
private static ExecutorService executor;
210210

211211
@BeforeClass
212-
public static void startStaticServer() throws IOException {
212+
public static void startStaticServer() throws Exception {
213+
disableDefaultMtlsProvider();
213214
mockSpanner = new MockSpannerServiceImpl();
214215
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
215216
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));

google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplWithDefaultRWTransactionOptionsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
1920
import static com.google.cloud.spanner.MockSpannerTestUtil.INVALID_SELECT_STATEMENT;
2021
import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1;
2122
import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1_RESULTSET;
@@ -41,7 +42,6 @@
4142
import io.grpc.Server;
4243
import io.grpc.Status;
4344
import io.grpc.inprocess.InProcessServerBuilder;
44-
import java.io.IOException;
4545
import java.util.Collections;
4646
import java.util.concurrent.ExecutorService;
4747
import java.util.concurrent.Executors;
@@ -83,7 +83,8 @@ public class DatabaseClientImplWithDefaultRWTransactionOptionsTest {
8383
private DatabaseClient clientWithSerOptimisticOption;
8484

8585
@BeforeClass
86-
public static void startStaticServer() throws IOException {
86+
public static void startStaticServer() throws Exception {
87+
disableDefaultMtlsProvider();
8788
mockSpanner = new MockSpannerServiceImpl();
8889
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
8990
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));

0 commit comments

Comments
 (0)