Add path-style-access-enabled config to S3 CRT client (#872)

Co-authored-by: Maciej Walkowiak <[email protected]>

Author: chrisrhut

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/S3CrtAsyncClientAutoConfiguration.java

@@ -67,6 +67,7 @@ S3AsyncClient s3AsyncClient(AwsCredentialsProvider credentialsProvider) {
 		Optional.ofNullable(this.awsProperties.getEndpoint()).ifPresent(builder::endpointOverride);
 		Optional.ofNullable(this.properties.getEndpoint()).ifPresent(builder::endpointOverride);
 		Optional.ofNullable(this.properties.getCrossRegionEnabled()).ifPresent(builder::crossRegionAccessEnabled);
+		Optional.ofNullable(this.properties.getPathStyleAccessEnabled()).ifPresent(builder::forcePathStyle);
 
 		if (this.properties.getCrt() != null) {
 			S3CrtClientProperties crt = this.properties.getCrt();

spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/S3CrtAsyncClientAutoConfigurationTests.java

@@ -28,9 +28,13 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.test.util.ReflectionTestUtils;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.endpoints.S3ClientContextParams;
 import software.amazon.awssdk.services.s3.internal.crt.S3NativeClientConfiguration;
+import software.amazon.awssdk.utils.AttributeMap;
 
 /**
  * Tests for {@link S3CrtAsyncClientAutoConfiguration}.
@@ -78,6 +82,17 @@ void withCustomGlobalEndpointAndS3Endpoint() {
 		}
 	}
 
+	@Test
+	void withPathStyleAccessEnabled() {
+		contextRunner.withPropertyValues("spring.cloud.aws.s3.path-style-access-enabled:true").run(context -> {
+			S3AsyncClient client = context.getBean(S3AsyncClient.class);
+			S3AsyncClient delegate = (S3AsyncClient) ReflectionTestUtils.getField(client, "delegate");
+			SdkClientConfiguration clientConfiguration = (SdkClientConfiguration) ReflectionTestUtils.getField(delegate, "clientConfiguration");
+			AttributeMap contextParams = clientConfiguration.option(SdkClientOption.CLIENT_CONTEXT_PARAMS);
+			assertThat(contextParams.get(S3ClientContextParams.FORCE_PATH_STYLE)).isTrue();
+		});
+	}
+
 	@Test
 	void setsPropertiesOnClient() {
 		contextRunner.withPropertyValues("spring.cloud.aws.s3.crt.minimum-part-size-in-bytes=50",