-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade localstack and enable new services (#1504)
* Add new services to the enum Note: Some services need a newer Localstack version * Upgrade Localstack and alter endpoint URL generation to be IP-only Also extend basic tests to cover SQS * Describe rationale for adding new Localstack tests (or not) (#1509) * Update localstack to 0.9.4
- Loading branch information
Showing
4 changed files
with
117 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 0 additions & 52 deletions
52
...lstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackS3Test.java
This file was deleted.
Oops, something went wrong.
93 changes: 93 additions & 0 deletions
93
...calstack/src/test/java/org/testcontainers/containers/localstack/SimpleLocalstackTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package org.testcontainers.containers.localstack; | ||
|
|
||
|
|
||
| import com.amazonaws.services.s3.AmazonS3; | ||
| import com.amazonaws.services.s3.AmazonS3ClientBuilder; | ||
| import com.amazonaws.services.s3.model.Bucket; | ||
| import com.amazonaws.services.s3.model.ObjectListing; | ||
| import com.amazonaws.services.s3.model.S3Object; | ||
| import com.amazonaws.services.sqs.AmazonSQS; | ||
| import com.amazonaws.services.sqs.AmazonSQSClientBuilder; | ||
| import com.amazonaws.services.sqs.model.CreateQueueResult; | ||
| import com.amazonaws.services.sqs.model.Message; | ||
| import org.apache.commons.io.IOUtils; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import static java.util.stream.Collectors.toSet; | ||
| import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals; | ||
| import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue; | ||
| import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3; | ||
| import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS; | ||
|
|
||
| /** | ||
| * The only tests that should go here are for those Localstack services that require special testcontainers code to work with them. | ||
| * For example, S3 needs a test to ensure special HTTP routing to the S3 container works. | ||
| */ | ||
| public class SimpleLocalstackTest { | ||
|
|
||
| private static final String BUCKET_1 = "bucket1"; | ||
| private static final String BUCKET_2 = "bucket2"; | ||
| private static final String ITEM_KEY = "bar"; | ||
| private static final String DUMMY_CONTENT = "baz"; | ||
|
|
||
| @ClassRule | ||
| public static LocalStackContainer localstack = new LocalStackContainer() | ||
| .withServices(S3, SQS); | ||
|
|
||
| @Test | ||
| public void simpleS3Test() throws IOException { | ||
| AmazonS3 s3 = AmazonS3ClientBuilder | ||
| .standard() | ||
| .withEndpointConfiguration(localstack.getEndpointConfiguration(S3)) | ||
| .withCredentials(localstack.getDefaultCredentialsProvider()) | ||
| .build(); | ||
|
|
||
| s3.createBucket(BUCKET_1); | ||
| s3.putObject(BUCKET_1, ITEM_KEY, DUMMY_CONTENT); | ||
|
|
||
| s3.createBucket(BUCKET_2); | ||
| s3.putObject(BUCKET_2, ITEM_KEY, DUMMY_CONTENT); | ||
|
|
||
| final Set<String> bucketNames = s3.listBuckets().stream() | ||
| .map(Bucket::getName) | ||
| .collect(toSet()); | ||
| assertTrue("The created buckets have the right name", | ||
| bucketNames.contains(BUCKET_1) && bucketNames.contains(BUCKET_2)); | ||
|
|
||
| assertBucketContentsCorrect(s3, BUCKET_1); | ||
| assertBucketContentsCorrect(s3, BUCKET_2); | ||
| } | ||
|
|
||
| private void assertBucketContentsCorrect(AmazonS3 s3, String bucketName) throws IOException { | ||
| final ObjectListing objectListing1 = s3.listObjects(bucketName); | ||
| assertEquals("The created bucket has 1 item in it", 1, objectListing1.getObjectSummaries().size()); | ||
|
|
||
| final S3Object object = s3.getObject(bucketName, ITEM_KEY); | ||
| final String content = IOUtils.toString(object.getObjectContent(), StandardCharsets.UTF_8); | ||
| assertEquals("The object can be retrieved", DUMMY_CONTENT, content); | ||
| } | ||
|
|
||
| @Test | ||
| public void simpleSQSTest() { | ||
| AmazonSQS sqs = AmazonSQSClientBuilder.standard() | ||
| .withEndpointConfiguration(localstack.getEndpointConfiguration(SQS)) | ||
| .withCredentials(localstack.getDefaultCredentialsProvider()) | ||
| .build(); | ||
|
|
||
| CreateQueueResult queueResult = sqs.createQueue("baz"); | ||
| String queueUrl = queueResult.getQueueUrl(); | ||
|
|
||
| sqs.sendMessage(queueUrl, "ping"); | ||
|
|
||
| final List<Message> messages = sqs.receiveMessage(queueUrl).getMessages(); | ||
|
|
||
| assertTrue("the message queue contains a message", messages.size() > 0); | ||
| assertEquals("the first message is the one we sent", "ping", messages.get(0).getBody()); | ||
| } | ||
| } |