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

Use edge endpoint for Localstack services

Browse Source 
* Upgrade to Testcontainers `1.18.3`
* Simplify `LocalstackContainerTest` to rely on the `LocalStackContainer.getEndpoint()`
for all the AWS services requested
This commit is contained in:
abilan
2023-06-08 10:53:12 -04:00
parent 31a4dc67f4
commit 2e27339594
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -40,7 +40,7 @@ ext {
springIntegrationVersion = '6.0.5'
kinesisClientVersion = '2.5.0'
kinesisProducerVersion = '0.15.7'
testcontainersVersion = '1.18.2'
testcontainersVersion = '1.18.3'
idPrefix = 'aws'

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

@@ -56,28 +56,27 @@ public interface LocalstackContainerTest {
}
static DynamoDbAsyncClient dynamoDbClient() {
return applyAwsClientOptions(DynamoDbAsyncClient.builder(), LocalStackContainer.Service.DYNAMODB);
return applyAwsClientOptions(DynamoDbAsyncClient.builder());
}
static KinesisAsyncClient kinesisClient() {
return applyAwsClientOptions(KinesisAsyncClient.builder(), LocalStackContainer.Service.KINESIS);
return applyAwsClientOptions(KinesisAsyncClient.builder());
}
static CloudWatchAsyncClient cloudWatchClient() {
return applyAwsClientOptions(CloudWatchAsyncClient.builder(), LocalStackContainer.Service.CLOUDWATCH);
return applyAwsClientOptions(CloudWatchAsyncClient.builder());
}
static S3AsyncClient s3AsyncClient() {
return applyAwsClientOptions(S3AsyncClient.builder(), LocalStackContainer.Service.S3);
return applyAwsClientOptions(S3AsyncClient.builder());
}
static S3Client s3Client() {
return applyAwsClientOptions(S3Client.builder().httpClient(ApacheHttpClient.create()),
LocalStackContainer.Service.S3);
return applyAwsClientOptions(S3Client.builder().httpClient(ApacheHttpClient.create()));
}
static SqsAsyncClient sqsClient() {
return applyAwsClientOptions(SqsAsyncClient.builder(), LocalStackContainer.Service.SQS);
return applyAwsClientOptions(SqsAsyncClient.builder());
}
static AwsCredentialsProvider credentialsProvider() {
@@ -85,13 +84,12 @@ public interface LocalstackContainerTest {
AwsBasicCredentials.create(LOCAL_STACK_CONTAINER.getAccessKey(), LOCAL_STACK_CONTAINER.getSecretKey()));
}
private static <B extends AwsClientBuilder<B, T>, T> T applyAwsClientOptions(B clientBuilder,
LocalStackContainer.Service serviceToBuild) {
private static <B extends AwsClientBuilder<B, T>, T> T applyAwsClientOptions(B clientBuilder) {
return clientBuilder
.region(Region.of(LOCAL_STACK_CONTAINER.getRegion()))
.credentialsProvider(credentialsProvider())
.endpointOverride(LOCAL_STACK_CONTAINER.getEndpointOverride(serviceToBuild))
.endpointOverride(LOCAL_STACK_CONTAINER.getEndpoint())
.build();
}
}