Fix setting endpoint from connection details to S3Presigner. (#1390)

`S3Presigner` auto-configuration did not take into account the endpoint override from `ConnectionDetails`.

Author: maciejwalkowiak

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

@@ -116,6 +116,11 @@ S3Presigner s3Presigner(S3Properties properties, AwsProperties awsProperties,
 		else if (awsProperties.getEndpoint() != null) {
 			builder.endpointOverride(awsProperties.getEndpoint());
 		}
+		connectionDetails.ifAvailable(it -> {
+			if (it.getEndpoint() != null) {
+				builder.endpointOverride(it.getEndpoint());
+			}
+		});
 		Optional.ofNullable(awsProperties.getFipsEnabled()).ifPresent(builder::fipsEnabled);
 		Optional.ofNullable(awsProperties.getDualstackEnabled()).ifPresent(builder::dualstackEnabled);
 		return builder.build();

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

@@ -69,7 +69,7 @@ S3AsyncClient s3AsyncClient(AwsCredentialsProvider credentialsProvider,
 		S3CrtAsyncClientBuilder builder = S3AsyncClient.crtBuilder().credentialsProvider(credentialsProvider).region(
 				this.awsClientBuilderConfigurer.resolveRegion(this.properties, connectionDetails.getIfAvailable()));
 		Optional.ofNullable(connectionDetails.getIfAvailable()).map(AwsConnectionDetails::getEndpoint)
-			.ifPresent(builder::endpointOverride);
+				.ifPresent(builder::endpointOverride);
 		Optional.ofNullable(this.awsProperties.getEndpoint()).ifPresent(builder::endpointOverride);
 		Optional.ofNullable(this.properties.getEndpoint()).ifPresent(builder::endpointOverride);
 		Optional.ofNullable(this.properties.getCrossRegionEnabled()).ifPresent(builder::crossRegionAccessEnabled);

spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/AwsContainerConnectionDetailsFactoryTest.java

@@ -29,6 +29,9 @@
 import io.awspring.cloud.autoconfigure.ses.SesAutoConfiguration;
 import io.awspring.cloud.autoconfigure.sns.SnsAutoConfiguration;
 import io.awspring.cloud.autoconfigure.sqs.SqsAutoConfiguration;
+import io.awspring.cloud.s3.S3Template;
+import java.net.URL;
+import java.time.Duration;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -90,6 +93,13 @@ void configuresS3ClientWithServiceConnection(@Autowired S3Client client) {
 		assertThatCode(client::listBuckets).doesNotThrowAnyException();
 	}
 
+	@Test
+	void configuresS3PresignedWithServiceConnection(@Autowired S3Template s3Template) {
+		URL signedGetURL = s3Template.createSignedGetURL("foo", "bar", Duration.ofMinutes(1));
+		assertThat(signedGetURL.getHost()).isNotNull().isNotEqualTo("foo.s3.amazonaws.com")
+				.as("Signed URL does not point to AWS as the endpoint has been overwritten by @ServiceConnection");
+	}
+
 	@Test
 	void configuresS3AsyncClientWithServiceConnection(@Autowired S3AsyncClient client) {
 		assertThatCode(client.listBuckets()::join).doesNotThrowAnyException();