Skip to content
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.

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

AWS: avoid static global credentials provider which doesn't play well with lifecycle management #8677

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ static AwsCredentialsProvider credentialsProvider(
AwsSessionCredentials.create(accessKeyId, secretAccessKey, sessionToken));
}
} else {
return DefaultCredentialsProvider.create();
// Create a new credential provider for each client
return DefaultCredentialsProvider.builder().build();
Fokko marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ public AwsCredentialsProvider credentialsProvider(
return credentialsProvider(this.clientCredentialsProvider);
}

return DefaultCredentialsProvider.create();
// Create a new credential provider for each client
return DefaultCredentialsProvider.builder().build();
}

private AwsCredentialsProvider credentialsProvider(String credentialsProviderClass) {
Expand Down
3 changes: 2 additions & 1 deletion aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,8 @@ private AwsCredentialsProvider credentialsProvider(
return credentialsProvider(this.clientCredentialsProvider);
}

return DefaultCredentialsProvider.create();
// Create a new credential provider for each client
return DefaultCredentialsProvider.builder().build();
}

private AwsCredentialsProvider credentialsProvider(String credentialsProviderClass) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@ public void testDefaultCredentialsConfiguration() {
.isTrue();
}

@Test
public void testCreatesNewInstanceOfDefaultCredentialsConfiguration() {
AwsClientProperties awsClientProperties = new AwsClientProperties();
AwsCredentialsProvider credentialsProvider =
awsClientProperties.credentialsProvider(null, null, null);
AwsCredentialsProvider credentialsProvider2 =
awsClientProperties.credentialsProvider(null, null, null);

Assertions.assertThat(credentialsProvider)
.withFailMessage("Should create a new instance in each call")
.isNotSameAs(credentialsProvider2);
}

@Test
public void testBasicCredentialsConfiguration() {
AwsClientProperties awsClientProperties = new AwsClientProperties();
Expand Down