From aac79d036f83396b4dae775fef82de58cc430736 Mon Sep 17 00:00:00 2001 From: Luwei Ge Date: Mon, 10 Feb 2025 21:22:46 +0000 Subject: [PATCH 1/3] enable ALTS bound token (for DirectPath) in the grpc channel provider --- .../java/com/google/cloud/storage/GrpcStorageOptions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 index 0fe1737dd..6ac41fd30 100644 --- 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 @@ -50,6 +50,7 @@ import com.google.api.gax.tracing.ApiTracerFactory; import com.google.api.pathtemplate.PathTemplate; import com.google.auth.Credentials; +import com.google.auth.oauth2.ComputeEngineCredentials; import com.google.cloud.NoCredentials; import com.google.cloud.ServiceFactory; import com.google.cloud.ServiceOptions; @@ -318,7 +319,8 @@ private Tuple> resolveSettingsAndOpts() throw InstantiatingGrpcChannelProvider.newBuilder() .setEndpoint(endpoint) .setAllowNonDefaultServiceAccount(true) - .setAttemptDirectPath(attemptDirectPath); + .setAttemptDirectPath(attemptDirectPath) + .setAllowHardBoundTokenTypes(Arrays.asList(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS)); if (!NoopGrpcInterceptorProvider.INSTANCE.equals(grpcInterceptorProvider)) { channelProviderBuilder.setInterceptorProvider(grpcInterceptorProvider); From 88171058888d18cc80adb5b50c000708f75b586d Mon Sep 17 00:00:00 2001 From: Luwei Ge Date: Wed, 12 Feb 2025 00:42:38 +0000 Subject: [PATCH 2/3] remove the unused import --- .../main/java/com/google/cloud/storage/GrpcStorageOptions.java | 1 - 1 file changed, 1 deletion(-) 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 index 6ac41fd30..7f4f41474 100644 --- 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 @@ -50,7 +50,6 @@ import com.google.api.gax.tracing.ApiTracerFactory; import com.google.api.pathtemplate.PathTemplate; import com.google.auth.Credentials; -import com.google.auth.oauth2.ComputeEngineCredentials; import com.google.cloud.NoCredentials; import com.google.cloud.ServiceFactory; import com.google.cloud.ServiceOptions; From c59673cd92b58ff20f6d50c6960362e2e57b96f1 Mon Sep 17 00:00:00 2001 From: Luwei Ge Date: Tue, 18 Feb 2025 16:29:11 +0000 Subject: [PATCH 3/3] changed to singletonlist --- .../java/com/google/cloud/storage/GrpcStorageOptions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 index 7f4f41474..a102125e9 100644 --- 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 @@ -319,7 +319,9 @@ private Tuple> resolveSettingsAndOpts() throw .setEndpoint(endpoint) .setAllowNonDefaultServiceAccount(true) .setAttemptDirectPath(attemptDirectPath) - .setAllowHardBoundTokenTypes(Arrays.asList(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS)); + .setAllowHardBoundTokenTypes( + Collections.singletonList( + InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS)); if (!NoopGrpcInterceptorProvider.INSTANCE.equals(grpcInterceptorProvider)) { channelProviderBuilder.setInterceptorProvider(grpcInterceptorProvider);