Spring/spring-integration-aws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to testcontainers-1.18.0

Browse Source 
* Localstack 2.0.0
This commit is contained in:
abilan
2023-04-04 14:05:51 -04:00
parent 853c410f70
commit 136cce6177
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -41,7 +41,7 @@ ext {
springIntegrationVersion = '6.0.4'
kinesisClientVersion = '2.4.8'
kinesisProducerVersion = '0.15.5'
testcontainersVersion = '1.17.6'
testcontainersVersion = '1.18.0'
idPrefix = 'aws'
@@ -128,12 +128,12 @@ dependencies {
optionalApi "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
testImplementation 'software.amazon.awssdk:apache-client'
testImplementation('org.springframework.integration:spring-integration-test') {
exclude group: 'junit'
}
testImplementation "org.assertj:assertj-core:$assertjVersion"
testImplementation("org.awaitility:awaitility:$awaitilityVersion") {
exclude group: 'org.hamcrest'
}

13
src/test/java/org/springframework/integration/aws/LocalstackContainerTest.java
View File

@@ -24,7 +24,7 @@ import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
import software.amazon.awssdk.http.apache.ApacheHttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
@@ -48,14 +48,7 @@ import software.amazon.awssdk.services.sqs.SqsAsyncClient;
public interface LocalstackContainerTest {
LocalStackContainer LOCAL_STACK_CONTAINER =
new LocalStackContainer(
DockerImageName.parse("localstack/localstack:1.4.0"))
.withServices(
LocalStackContainer.Service.DYNAMODB,
LocalStackContainer.Service.KINESIS,
LocalStackContainer.Service.CLOUDWATCH,
LocalStackContainer.Service.S3,
LocalStackContainer.Service.SQS);
new LocalStackContainer(DockerImageName.parse("localstack/localstack:2.0.0"));
@BeforeAll
static void startContainer() {
@@ -79,7 +72,7 @@ public interface LocalstackContainerTest {
}
static S3Client s3Client() {
return applyAwsClientOptions(S3Client.builder().httpClient(UrlConnectionHttpClient.builder().build()),
return applyAwsClientOptions(S3Client.builder().httpClient(ApacheHttpClient.create()),
LocalStackContainer.Service.S3);
}