Fix configuring S3Presigner region (#937)

The presigner now uses the region from properties if it is set.
awspring · Nov 3, 2023 · e5c1010 · e5c1010
1 parent 0a176d0
commit e5c1010
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/...s-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfiguration.java b/...s-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfiguration.java
@@ -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());

diff --git a/...oconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfigurationTests.java b/...oconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfigurationTests.java
@@ -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)