Skip to content

AWS: Configure Default s3Async credentials the same as s3 #13132

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
RussellSpitzer merged 2 commits into from
May 29, 2025
Merged

AWS: Configure Default s3Async credentials the same as s3 #13132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4c89d
AWS: Configure DefaultS3FileIOAwsClientFactory.s3Async credentials th…
devinrsmith May 22, 2025
5625e77
Cleanup based on review
devinrsmith May 29, 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
6 changes: 4 additions & 2 deletions aws/src/main/java/org/apache/iceberg/aws/AwsClientFactories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,16 @@ public S3AsyncClient s3Async() {
if (s3FileIOProperties.isS3CRTEnabled()) {
return S3AsyncClient.crtBuilder()
.applyMutation(awsClientProperties::applyClientRegionConfiguration)
.applyMutation(awsClientProperties::applyClientCredentialConfigurations)
.applyMutation(
b -> s3FileIOProperties.applyCredentialConfigurations(awsClientProperties, b))
.applyMutation(s3FileIOProperties::applyEndpointConfigurations)
.applyMutation(s3FileIOProperties::applyS3CrtConfigurations)
.build();
}
return S3AsyncClient.builder()
.applyMutation(awsClientProperties::applyClientRegionConfiguration)
.applyMutation(awsClientProperties::applyClientCredentialConfigurations)
.applyMutation(
b -> s3FileIOProperties.applyCredentialConfigurations(awsClientProperties, b))
.applyMutation(s3FileIOProperties::applyEndpointConfigurations)
.build();
}
Expand Down
20 changes: 15 additions & 5 deletions aws/src/main/java/org/apache/iceberg/aws/s3/S3FileIOProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.iceberg.util.PropertyUtil;
import org.apache.iceberg.util.SerializableMap;
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
import software.amazon.awssdk.core.exception.SdkServiceException;
Expand All @@ -49,6 +50,7 @@
import software.amazon.awssdk.core.retry.conditions.RetryOnExceptionsCondition;
import software.amazon.awssdk.core.retry.conditions.TokenBucketRetryCondition;
import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
import software.amazon.awssdk.services.s3.S3BaseClientBuilder;
import software.amazon.awssdk.services.s3.S3ClientBuilder;
import software.amazon.awssdk.services.s3.S3Configuration;
import software.amazon.awssdk.services.s3.S3CrtAsyncClientBuilder;
Expand Down Expand Up @@ -958,12 +960,20 @@ private boolean keyIdAccessKeyBothConfigured() {
return (accessKeyId == null) == (secretAccessKey == null);
}

public <T extends S3ClientBuilder> void applyCredentialConfigurations(
public <T extends S3BaseClientBuilder<T, ?>> void applyCredentialConfigurations(
AwsClientProperties awsClientProperties, T builder) {
builder.credentialsProvider(
isRemoteSigningEnabled
? AnonymousCredentialsProvider.create()
: awsClientProperties.credentialsProvider(accessKeyId, secretAccessKey, sessionToken));
builder.credentialsProvider(getCredentialsProvider(awsClientProperties));
}

public <T extends S3CrtAsyncClientBuilder> void applyCredentialConfigurations(
AwsClientProperties awsClientProperties, T builder) {
builder.credentialsProvider(getCredentialsProvider(awsClientProperties));
}

private AwsCredentialsProvider getCredentialsProvider(AwsClientProperties awsClientProperties) {
return isRemoteSigningEnabled
? AnonymousCredentialsProvider.create()
: awsClientProperties.credentialsProvider(accessKeyId, secretAccessKey, sessionToken);
}

/**
Expand Down