Skip to content

feat: add support for new setAllowHardBoundTokens field. #3467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jan 22, 2025
Merged

feat: add support for new setAllowHardBoundTokens field. #3467

Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
09eb2b2
Add support for new setAllowHardBoundTokens field.
rmehta19 Dec 14, 2024
db51f4e
Merge branch 'main' into add-setting
rmehta19 Jan 7, 2025
fd1015e
Merge branch 'main' into add-setting
rmehta19 Jan 9, 2025
960084d
Clarify variable name in InstantiatingGrpcChannelProvider.
rmehta19 Jan 9, 2025
ddb3b79
Merge branch 'main' into add-setting
rmehta19 Jan 15, 2025
60dafd0
add setter for allowed hard bound token types to only the GRPC channe…
rmehta19 Jan 16, 2025
e193cc9
List not ArrayList, no setter, InternalApi.
rmehta19 Jan 16, 2025
0e40f22
add enum + javadocs.
rmehta19 Jan 16, 2025
6a27af6
Merge branch 'main' into add-setting
rmehta19 Jan 17, 2025
591ef68
mark enum as internal only.
rmehta19 Jan 21, 2025
90a32af
improve javadoc for setter.
rmehta19 Jan 21, 2025
a7f8384
add to existing unit test.
rmehta19 Jan 21, 2025
4fe44cb
Merge branch 'main' into add-setting
rmehta19 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -126,6 +127,7 @@ public final class InstantiatingGrpcChannelProvider implements TransportChannelP
@Nullable private final Boolean allowNonDefaultServiceAccount;
@VisibleForTesting final ImmutableMap<String, ?> directPathServiceConfig;
@Nullable private final MtlsProvider mtlsProvider;
@Nullable private final ArrayList<String> allowedHardBoundTokenTypes;
@VisibleForTesting final Map<String, String> headersWithDuplicatesRemoved = new HashMap<>();

@Nullable
Expand All @@ -136,6 +138,7 @@ private InstantiatingGrpcChannelProvider(Builder builder) {
this.executor = builder.executor;
this.headerProvider = builder.headerProvider;
this.endpoint = builder.endpoint;
this.allowedHardBoundTokenTypes = builder.allowedHardBoundTokenTypes;
this.mtlsProvider = builder.mtlsProvider;
this.envProvider = builder.envProvider;
this.interceptorProvider = builder.interceptorProvider;
Expand Down Expand Up @@ -225,6 +228,10 @@ public TransportChannelProvider withEndpoint(String endpoint) {
return toBuilder().setEndpoint(endpoint).build();
}

public TransportChannelProvider setAllowHardBoundTokens(ArrayList<String> allowedValues) {
return toBuilder().setAllowHardBoundTokenTypes(allowedValues).build();
}

/** @deprecated Please modify pool settings via {@link #toBuilder()} */
@Deprecated
@Override
Expand Down Expand Up @@ -620,6 +627,7 @@ public static final class Builder {
@Nullable private Boolean attemptDirectPathXds;
@Nullable private Boolean allowNonDefaultServiceAccount;
@Nullable private ImmutableMap<String, ?> directPathServiceConfig;
@Nullable private ArrayList<String> allowedHardBoundTokenTypes;

private Builder() {
processorCount = Runtime.getRuntime().availableProcessors();
Expand Down Expand Up @@ -700,6 +708,11 @@ public Builder setEndpoint(String endpoint) {
return this;
}

public Builder setAllowHardBoundTokenTypes(ArrayList<String> allowedValues) {
this.allowedHardBoundTokenTypes = allowedValues;
return this;
}

@VisibleForTesting
Builder setMtlsProvider(MtlsProvider mtlsProvider) {
this.mtlsProvider = mtlsProvider;
Expand Down
Loading