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.

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

Jump to bottom

Fix S3Presigner region resolution #937

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Fix S3Presigner region resolution #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...s-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ S3Template s3Template(S3Client s3Client, S3OutputStreamProvider s3OutputStreamPr
S3Presigner s3Presigner(S3Properties properties, AwsProperties awsProperties,
AwsCredentialsProvider credentialsProvider, AwsRegionProvider regionProvider) {
S3Presigner.Builder builder = S3Presigner.builder().serviceConfiguration(properties.toS3Configuration())
.credentialsProvider(credentialsProvider).region(regionProvider.getRegion());
.credentialsProvider(credentialsProvider)
.region(AwsClientBuilderConfigurer.resolveRegion(properties, regionProvider));

if (properties.getEndpoint() != null) {
builder.endpointOverride(properties.getEndpoint());
Expand Down
16 changes: 16 additions & 0 deletions ...oconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,22 @@ void setsCommonAwsPropertiesOnPresigner() {
assertThat(presigner.getRegion()).isEqualTo(Region.of("eu-west-1"));
});
}

@Test
void setsRegionFromProperties() {
contextRunner.withPropertyValues("spring.cloud.aws.s3.region:us-east-1").run(context -> {
ConfiguredAwsPresigner presigner = new ConfiguredAwsPresigner(context.getBean(S3Presigner.class));
assertThat(presigner.getRegion()).isEqualTo(Region.of("us-east-1"));
});
}

@Test
void setsRegionToDefault() {
contextRunner.run(context -> {
ConfiguredAwsPresigner presigner = new ConfiguredAwsPresigner(context.getBean(S3Presigner.class));
assertThat(presigner.getRegion()).isEqualTo(Region.of("eu-west-1"));
});
}
}

@Configuration(proxyBeanMethods = false)
Expand Down
Loading