increase number of lines extracted from Docker logs

whummer · whummer · commit 86f2919965ff · 2022-01-22T14:46:25.000+01:00
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ Simply add the following dependency to your `pom.xml` file:
 <dependency>
     <groupId>cloud.localstack</groupId>
     <artifactId>localstack-utils</artifactId>
-    <version>0.2.19</version>
+    <version>0.2.20</version>
 </dependency>
 ```
 
@@ -108,6 +108,7 @@ make build
 
 ## Change Log
 
+* v0.2.20: Fix extracting container logs for LocalStack startup check
 * v0.2.19: Bump version of log4j to 2.17.0 to fix further vulnerabilities related to recent CVE
 * v0.2.18: Fix for isRunning method after stopping the container; filter synthetic bridge methods during method detection for java Lambda full handler syntax; pass ADDITIONAL_MVN_ARGS to mvn javadoc command; bump version of log4j to 2.15.0 to fix CVE-2021-44228
 * v0.2.17: Fix issue with using :: to specify lambda handler which implements the RequestHandler interface, revert removal of EC2HostNameResolver annotation
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>cloud.localstack</groupId>
     <artifactId>localstack-utils</artifactId>
     <packaging>jar</packaging>
-    <version>0.2.19</version>
+    <version>0.2.20</version>
     <name>localstack-utils</name>
 
     <description>Java utilities for the LocalStack platform.</description>
diff --git a/src/main/java/cloud/localstack/docker/Container.java b/src/main/java/cloud/localstack/docker/Container.java
@@ -29,7 +29,7 @@ public class Container {
     private static final int MAX_PORT_CONNECTION_ATTEMPTS = 10;
     private static final int MAX_LOG_COLLECTION_ATTEMPTS = 120;
     private static final long POLL_INTERVAL = 1000;
-    private static final int NUM_LOG_LINES = 100;
+    private static final int NUM_LOG_LINES = 1000;
 
     private static final String ENV_DEBUG = "DEBUG";
     private static final String ENV_USE_SSL = "USE_SSL";
diff --git a/src/test/java/cloud/localstack/awssdkv1/KMSTest.java b/src/test/java/cloud/localstack/awssdkv1/KMSTest.java
@@ -2,6 +2,8 @@
 
 import java.nio.ByteBuffer;
 
+import cloud.localstack.docker.annotation.LocalstackDockerProperties;
+
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
 import com.amazonaws.services.kms.model.CreateKeyRequest;
@@ -18,6 +20,7 @@
 /**
  * Test integration of KMS with LocalStack
  */
+@LocalstackDockerProperties(ignoreDockerRunErrors = true)
 public class KMSTest extends PowerMockLocalStack {
     private AWSKMS awskms;
     private String keyId = "";
diff --git a/src/test/java/cloud/localstack/awssdkv1/SESMessagingTest.java b/src/test/java/cloud/localstack/awssdkv1/SESMessagingTest.java
@@ -5,6 +5,7 @@
 
 import java.util.UUID;
 
+import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceAsync;
 import com.amazonaws.services.simpleemail.model.*;
@@ -17,6 +18,7 @@
  * Test integration of SES messaging with LocalStack
  */
 @RunWith(LocalstackTestRunner.class)
+@LocalstackDockerProperties(ignoreDockerRunErrors = true)
 public class SESMessagingTest {
 
     static final String FROM = "sender@example.com";
diff --git a/src/test/java/cloud/localstack/awssdkv1/SQSMessagingTest.java b/src/test/java/cloud/localstack/awssdkv1/SQSMessagingTest.java
@@ -40,7 +40,6 @@ public class SQSMessagingTest {
 
     private static final String JMS_QUEUE_NAME = "aws_develop_class_jms";
     private static final String SAMPLE_QUEUE_NAME = "aws_develop_class";
-    private static final String SAMPLE_MULTI_BYTE_CHAR_QUEUE_NAME = "aws_develop_multi_byte";
 
     @BeforeClass
     public static void setup() {
@@ -155,7 +154,8 @@ public void testAsyncMessageAttributes() {
     @Test
     public void testSendMultiByteCharactersMessage() throws JMSException {
         final AmazonSQS clientSQS = TestUtils.getClientSQS();
-        final String queueUrl = clientSQS.createQueue(SAMPLE_MULTI_BYTE_CHAR_QUEUE_NAME).getQueueUrl();
+        final String queueName = "queue-" + System.currentTimeMillis();
+        final String queueUrl = clientSQS.createQueue(queueName).getQueueUrl();
 
         /*
          * send a message to the queue
@@ -173,13 +173,20 @@ public void testSendMultiByteCharactersMessage() throws JMSException {
 
         Assert.assertNotNull(sendMessageResult);
         Assert.assertEquals("acbd18db4cc2f85cedef654fccc4a4d8", sendMessageResult.getMD5OfMessageBody());
+        if (!sendMessageResult.getMD5OfMessageAttributes().equals("23bf3e5b587065b0cfbe95761641595a")) {
+            // print details for debugging in CI (TODO remove once test is fixed)
+            System.out.println("messageAttributes " + messageAttributes);
+            System.out.println("getMD5OfMessageAttributes " + sendMessageResult.getMD5OfMessageAttributes());
+        }
         Assert.assertEquals("23bf3e5b587065b0cfbe95761641595a", sendMessageResult.getMD5OfMessageAttributes());
 
         /*
          * receive the message from the queue
          */
         final ReceiveMessageResult messageResult = clientSQS.receiveMessage(queueUrl);
         Assert.assertNotNull(messageResult);
+
+        // TODO: clean up resources!
     }
 
     /**
