From 3ed0bbc6efec9c8dfe077680d215c3bfbc1129f2 Mon Sep 17 00:00:00 2001 From: Luwei Ge Date: Mon, 10 Mar 2025 22:00:05 +0000 Subject: [PATCH 1/2] revert the ALTS bound token enablement --- .../java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java index 77ce3a540b8..39aadd461d4 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java @@ -369,10 +369,6 @@ public GapicSpannerRpc(final SpannerOptions options) { boolean isAttemptDirectPathXds = Boolean.parseBoolean(directPathXdsEnv); if (isAttemptDirectPathXds) { defaultChannelProviderBuilder.setAttemptDirectPath(true); - // This will let the credentials try to fetch a hard-bound access token if the runtime - // environment supports it. - defaultChannelProviderBuilder.setAllowHardBoundTokenTypes( - Collections.singletonList(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS)); defaultChannelProviderBuilder.setAttemptDirectPathXds(); } if (options.isUseVirtualThreads()) { From a4e533eaec820da700d953506bb2ec5ded324a9a Mon Sep 17 00:00:00 2001 From: Luwei Ge Date: Mon, 10 Mar 2025 22:03:21 +0000 Subject: [PATCH 2/2] format --- .../java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java | 1 - 1 file changed, 1 deletion(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java index 39aadd461d4..0e540ea7926 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java @@ -193,7 +193,6 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List;