add tests for S3 list buckets creation date

Author: whummer

.travis.yml

@@ -10,12 +10,14 @@ branches:
 
 install:
   - set -e
-  - nohup docker pull localstack/localstack > /dev/null &
+  - nohup docker pull localstack/localstack-light > /dev/null &
   - nohup docker pull lambci/lambda:java8 > /dev/null &
 
 script:
   - set -e
   - mvn -q -DskipTests test
+  - docker pull localstack/localstack-light > /dev/null
+  - docker tag localstack/localstack-light localstack/localstack
   - make test
   - docker ps -a
 

pom.xml

@@ -32,7 +32,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <aws.sdk.version>1.11.642</aws.sdk.version>
-        <aws.sdkv2.version>2.13.36</aws.sdkv2.version>
+        <aws.sdkv2.version>2.13.39</aws.sdkv2.version>
     </properties>
 
     <dependencies>
@@ -151,6 +151,12 @@
             <version>${aws.sdkv2.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <version>${aws.sdkv2.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>netty-nio-client</artifactId>

src/main/java/cloud/localstack/awssdkv2/TestUtils.java

@@ -6,11 +6,10 @@
 import software.amazon.awssdk.services.kinesis.*;
 import software.amazon.awssdk.services.sns.*;
 import software.amazon.awssdk.services.sqs.*;
+import software.amazon.awssdk.services.s3.*;
+import software.amazon.awssdk.auth.credentials.*;
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.core.client.builder.SdkAsyncClientBuilder;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
 
 import cloud.localstack.Localstack;
@@ -35,6 +34,10 @@ public static SnsAsyncClient getClientSNSAsyncV2() {
         return wrapApiClientV2(SnsAsyncClient.builder(), Localstack.INSTANCE.getEndpointSNS()).build();
     }
 
+    public static S3AsyncClient getClientS3AsyncV2() {
+        return wrapApiClientV2(S3AsyncClient.builder(), Localstack.INSTANCE.getEndpointS3()).build();
+    }
+
     public static <T extends SdkAsyncClientBuilder> T wrapApiClientV2(T builder, String endpointURL) {
         try {
             return (T) ((AwsClientBuilder)builder

src/main/java/cloud/localstack/docker/LocalstackDockerExtension.java

@@ -37,7 +37,10 @@ public void beforeAll(final ExtensionContext context) throws Exception {
         } else {
             store = context.getStore(NAMESPACE);
         }
-        store.getOrComputeIfAbsent("localstack", key -> new LocalstackDockerExtension.StartedLocalStack(context));
+        if (store.get("localstack") == null) {
+            final StartedLocalStack startedStack = new LocalstackDockerExtension.StartedLocalStack(context);
+            store.getOrComputeIfAbsent("localstack", key -> startedStack);
+        }
     }
 
     private boolean isUseSingleDockerContainer(final ExtensionContext context) {

src/test/java/cloud/localstack/awssdkv2/BasicFeaturesSDKV2Test.java

@@ -4,10 +4,14 @@
 import cloud.localstack.LocalstackTestRunner;
 
 import software.amazon.awssdk.core.SdkSystemSetting;
-import software.amazon.awssdk.services.sqs.*;
-import software.amazon.awssdk.services.sqs.model.*;
 import software.amazon.awssdk.services.kinesis.*;
 import software.amazon.awssdk.services.kinesis.model.*;
+import software.amazon.awssdk.services.s3.*;
+import software.amazon.awssdk.services.s3.model.*;
+import software.amazon.awssdk.services.sns.*;
+import software.amazon.awssdk.services.sns.model.*;
+import software.amazon.awssdk.services.sqs.*;
+import software.amazon.awssdk.services.sqs.model.*;
 import software.amazon.awssdk.auth.credentials.*;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.utils.Logger;
@@ -32,8 +36,7 @@ public void testCreateSqsQueueV2() throws Exception {
         CreateQueueRequest request = CreateQueueRequest.builder().queueName(queueName).build();
         SqsAsyncClient sqsClient = TestUtils.getClientSQSAsyncV2();
         CreateQueueResponse queue = sqsClient.createQueue(request).get();
-        // TODO fix classpath for v2 and finalize test
-        System.out.println(queue);
+        Assert.assertTrue(queue.queueUrl().contains("queue/" + queueName));
     }
 
     @Test
@@ -43,8 +46,36 @@ public void testCreateKinesisStreamV2() throws Exception {
         CreateStreamRequest request = CreateStreamRequest.builder()
             .streamName(streamName).shardCount(1).build();
         CreateStreamResponse response = kinesisClient.createStream(request).get();
-        // TODO fix classpath for v2 and finalize test
-        System.out.println(response);
+        Assert.assertNotNull(response);
+    }
+
+    @Test
+    public void testS3CreateListBuckets() throws Exception {
+        String bucketName = "test-b-9716";
+        S3AsyncClient s3Client = TestUtils.getClientS3AsyncV2();
+        CreateBucketRequest request = CreateBucketRequest.builder().bucket(bucketName).build();
+        CreateBucketResponse response = s3Client.createBucket(request).get();
+        Assert.assertNotNull(response);
+        ListBucketsRequest listRequest = ListBucketsRequest.builder().build();
+        ListBucketsResponse buckets = s3Client.listBuckets(listRequest).get();
+        Bucket bucket = buckets.buckets().stream().filter(b -> b.name().equals(bucketName)).findFirst().get();
+        Assert.assertNotNull(bucket);
     }
 
+    @Test
+    public void testSendSNSMessage() throws Exception {
+        // Test integration of SNS messaging with LocalStack using SDK v2
+
+        final String topicName = "test-t-6210";
+        final SnsAsyncClient clientSNS = TestUtils.getClientSNSAsyncV2();
+        CreateTopicResponse createTopicResponse = clientSNS.createTopic(
+            CreateTopicRequest.builder().name(topicName).build()).get();
+
+        String topicArn = createTopicResponse.topicArn();
+        Assert.assertNotNull(topicArn);
+        PublishRequest publishRequest = PublishRequest.builder().topicArn(topicArn).subject("test subject").message("message test.").build();
+
+        PublishResponse publishResponse = clientSNS.publish(publishRequest).get();
+        Assert.assertNotNull(publishResponse.messageId());
+    }
 }