Upgrade AWS SDK to 2.28.2 (#1216)

awspring · Sep 18, 2024 · cdfdaa8 · cdfdaa8
1 parent 2a13bbf
commit cdfdaa8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/...s-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/ConfiguredAwsPresigner.java b/...s-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/ConfiguredAwsPresigner.java
@@ -38,11 +38,11 @@ public ConfiguredAwsPresigner(SdkPresigner presigner) {
 	}
 
 	public URI getEndpoint() {
-		return attributes.get(SdkClientOption.ENDPOINT);
+		return attributes.get(SdkClientOption.CLIENT_ENDPOINT_PROVIDER).clientEndpoint();
 	}
 
 	public boolean isEndpointOverridden() {
-		return attributes.get(SdkClientOption.ENDPOINT_OVERRIDDEN);
+		return attributes.get(SdkClientOption.CLIENT_ENDPOINT_PROVIDER).isEndpointOverridden();
 	}
 
 	public Boolean getFipsEnabled() {

diff --git a/spring-cloud-aws-dependencies/pom.xml b/spring-cloud-aws-dependencies/pom.xml
@@ -24,7 +24,7 @@
 
 	<properties>
 		<spotless.version>2.31.0</spotless.version>
-		<awssdk-v2.version>2.25.70</awssdk-v2.version>
+		<awssdk-v2.version>2.28.2</awssdk-v2.version>
 		<amazon.dax.version>2.0.4</amazon.dax.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<spring-cloud-commons.version>4.1.4</spring-cloud-commons.version>

diff --git a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/ObjectMetadataTests.java b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/ObjectMetadataTests.java
@@ -53,9 +53,9 @@ void canBeAppliedToPutObjectRequest() {
 		PutObjectRequest.Builder builder = PutObjectRequest.builder();
 		objectMetadata.apply(builder);
 
-		assertThat(builder)
-				.usingRecursiveComparison().ignoringFields("awsRequestOverrideConfig", "checksumCRC32C", "checksumSHA1",
-						"checksumSHA256", "key", "contentMD5", "bucket", "checksumCRC32", "contentLength")
+		assertThat(builder).usingRecursiveComparison()
+				.ignoringFields("awsRequestOverrideConfig", "checksumCRC32C", "checksumSHA1", "checksumSHA256", "key",
+						"contentMD5", "bucket", "checksumCRC32", "contentLength", "ifNoneMatch")
 				.isEqualTo(objectMetadata);
 	}
 

diff --git a/...ng-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/SqsIntegrationTests.java b/...ng-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/SqsIntegrationTests.java
@@ -17,6 +17,7 @@
 
 import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -188,7 +189,10 @@ void receivesMessageBatch() throws Exception {
 		List<Message<String>> messages = create10Messages("receivesMessageBatch");
 		sqsTemplate.sendMany(RECEIVES_MESSAGE_BATCH_QUEUE_NAME, messages);
 		logger.debug("Sent 10 messages to queue {}", RECEIVES_MESSAGE_BATCH_QUEUE_NAME);
-		assertThat(latchContainer.receivesMessageBatchLatch.await(10, TimeUnit.SECONDS)).isTrue();
+		await().untilAsserted(() -> {
+			// ensure that first batch was processed more than once
+			assertThat(latchContainer.receivesMessageBatchLatch.getCount()).isLessThan(10);
+		});
 		assertThat(latchContainer.acknowledgementCallbackBatchLatch.await(10, TimeUnit.SECONDS)).isTrue();
 	}