Fix localstack cloudwatchlogs service (testcontainers#2316)

artjomka · Feb 28, 2020 · 6cd1e35 · 6cd1e35
1 parent d03aeef
commit 6cd1e35
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle
@@ -6,4 +6,5 @@ dependencies {
     compileOnly 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-s3:1.11.683'
     testCompile 'com.amazonaws:aws-java-sdk-sqs:1.11.636'
+    testCompile 'com.amazonaws:aws-java-sdk-logs:1.11.636'
 }
diff --git a/...ocalstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/...ocalstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java
@@ -154,7 +154,7 @@ public enum Service {
         SSM("ssm", 4583),
         SECRETSMANAGER("secretsmanager", 4584),
         STEPFUNCTIONS("stepfunctions", 4585),
-        CLOUDWATCHLOGS("cloudwatchlogs", 4586),
+        CLOUDWATCHLOGS("logs", 4586),
         STS("sts", 4592),
         IAM("iam", 4593);
 

diff --git a/...stack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java b/...stack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java
@@ -1,6 +1,12 @@
 package org.testcontainers.containers.localstack;
 
 
+import com.amazonaws.services.logs.AWSLogs;
+import com.amazonaws.services.logs.AWSLogsClientBuilder;
+import com.amazonaws.services.logs.model.CreateLogGroupRequest;
+import com.amazonaws.services.logs.model.CreateLogGroupResult;
+import com.amazonaws.services.logs.model.DescribeLogGroupsRequest;
+import com.amazonaws.services.logs.model.LogGroup;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.Bucket;
@@ -13,6 +19,7 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
@@ -31,6 +38,7 @@
 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;
+import static org.testcontainers.containers.localstack.LocalStackContainer.Service.CLOUDWATCHLOGS;
 
 /**
  * Tests for Localstack Container, used both in bridge network (exposed to host) and docker network modes.
@@ -48,7 +56,7 @@ public static class WithoutNetwork {
         // without_network {
         @ClassRule
         public static LocalStackContainer localstack = new LocalStackContainer()
-            .withServices(S3, SQS);
+            .withServices(S3, SQS, CLOUDWATCHLOGS);
         // }
 
         @Test
@@ -95,6 +103,20 @@ public void sqsTestOverBridgeNetwork() {
                 .count();
             assertEquals("the sent message can be received", 1L, messageCount);
         }
+
+        @Test
+        @Ignore("Fails due to https://github.com/localstack/localstack/issues/1434")
+        public void cloudWatchLogsTestOverBridgeNetwork() {
+            AWSLogs logs = AWSLogsClientBuilder.standard()
+                    .withEndpointConfiguration(localstack.getEndpointConfiguration(CLOUDWATCHLOGS))
+                    .withCredentials(localstack.getDefaultCredentialsProvider()).build();
+
+            logs.createLogGroup(new CreateLogGroupRequest("foo"));
+
+            List<LogGroup> groups = logs.describeLogGroups().getLogGroups();
+            assertEquals("One log group should be created", 1, groups.size());
+            assertEquals("Name of created log group is [foo]", "foo", groups.get(0).getLogGroupName());
+        }
     }
 
     public static class WithNetwork {
@@ -105,7 +127,7 @@ public static class WithNetwork {
         public static LocalStackContainer localstackInDockerNetwork = new LocalStackContainer()
             .withNetwork(network)
             .withNetworkAliases("notthis", "localstack")    // the last alias is used for HOSTNAME_EXTERNAL
-            .withServices(S3, SQS);
+            .withServices(S3, SQS, CLOUDWATCHLOGS);
         // }
 
         @ClassRule
@@ -139,6 +161,11 @@ public void sqsTestOverDockerNetwork() throws Exception {
             assertTrue("the sent message can be received", message.contains("\"Body\": \"test\""));
         }
 
+        @Test
+        public void cloudWatchLogsTestOverDockerNetwork() throws Exception {
+            runAwsCliAgainstDockerNetworkContainer("logs create-log-group --log-group-name foo", CLOUDWATCHLOGS.getPort());
+        }
+
         private String runAwsCliAgainstDockerNetworkContainer(String command, final int port) throws Exception {
             final String[] commandParts = String.format("/usr/bin/aws --region eu-west-1 %s --endpoint-url http://localstack:%d --no-verify-ssl", command, port).split(" ");
             final Container.ExecResult execResult = awsCliInDockerNetwork.execInContainer(commandParts);