8000 increase number of lines extracted from Docker logs · localstack/localstack-java-utils@86f2919 · GitHub
[go: up one dir, main page]
Skip to content

Commit 86f2919

Browse files
8000 whummerwhummer
committed
increase number of lines extracted from Docker logs
1 parent a7b95bb commit 86f2919

File tree

6 files changed

+18
-5
lines changed

6 files changed

+18
-5
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Simply add the following dependency to your `pom.xml` file:
6060
<dependency>
6161
<groupId>cloud.localstack</groupId>
6262
<artifactId>localstack-utils</artifactId>
63-
<version>0.2.19</version>
63+
<version>0.2.20</version>
6464
</dependency>
6565
```
6666

@@ -108,6 +108,7 @@ make build
108108

109109
## Change Log
110110

111+
* v0.2.20: Fix extracting container logs for LocalStack startup check
111112
* v0.2.19: Bump version of log4j to 2.17.0 to fix further vulnerabilities related to recent CVE
112113
* 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
113114
* v0.2.17: Fix issue with using :: to specify lambda handler which implements the RequestHandler interface, revert removal of EC2HostNameResolver annotation

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>cloud.localstack</groupId>
55
<artifactId>localstack-utils</artifactId>
66
<packaging>jar</packaging>
7-
<version>0.2.19</version>
7+
<version>0.2.20</version>
88
<name>localstack-utils</name>
99

1010
<description>Java utilities for the LocalStack platform.</description>

‎src/main/java/cloud/localstack/docker/Container.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class Container {
2929
private static final int MAX_PORT_CONNECTION_ATTEMPTS = 10;
3030
private static final int MAX_LOG_COLLECTION_ATTEMPTS = 120;
3131
private static final long POLL_INTERVAL = 1000;
32-
private static final int NUM_LOG_LINES = 100;
32+
private static final int NUM_LOG_LINES = 1000;
3333

3434
private static final String ENV_DEBUG = "DEBUG";
3535
private static final String ENV_USE_SSL = "USE_SSL";

‎src/test/java/cloud/localstack/awssdkv1/KMSTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.nio.ByteBuffer;
44

5+
import cloud.localstack.docker.annotation.LocalstackDockerProperties;
6+
57
import com.amazonaws.services.kms.AWSKMS;
68
import com.amazonaws.services.kms.AWSKMSClientBuilder;
79
import com.amazonaws.services.kms.model.CreateKeyRequest;
@@ -18,6 +20,7 @@
1820
/**
1921
* Test integration of KMS with LocalStack
2022
*/
23+
@LocalstackDockerProperties(ignoreDockerRunErrors = true)
2124
public class KMSTest extends PowerMockLocalStack {
2225
private AWSKMS awskms;
2326
private String keyId = "";

‎src/test/java/cloud/localstack/awssdkv1/SESMessagingTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import java.util.UUID;
77

8+
import cloud.localstack.docker.annotation.LocalstackDockerProperties;
89
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
910
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceAsync;
1011
import com.amazonaws.services.simpleemail.model.*;
@@ -17,6 +18,7 @@
1718
* Test integration of SES messaging with LocalStack
1819
*/
1920
@RunWith(LocalstackTestRunner.class)
21+
@LocalstackDockerProperties(ignoreDockerRunErrors = true)
2022
public class SESMessagingTest {
2123

2224
static final String FROM = "sender@example.com";

‎src/test/java/cloud/localstack/awssdkv1/SQSMessagingTest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class SQSMessagingTest {
4040

4141
private static final String JMS_QUEUE_NAME = "aws_develop_class_jms";
4242
private static final String SAMPLE_QUEUE_NAME = "aws_develop_class";
43-
private static final String SAMPLE_MULTI_BYTE_CHAR_QUEUE_NAME = "aws_develop_multi_byte";
4443

4544
@BeforeClass
4645
public static void setup() {
@@ -155,7 +154,8 @@ public void testAsyncMessageAttributes() {
155154
@Test
156155
public void testSendMultiByteCharactersMessage() throws JMSException {
157156
final AmazonSQS clientSQS = TestUtils.getClientSQS();
158-
final String queueUrl = clientSQS.createQueue(SAMPLE_MULTI_BYTE_CHAR_QUEUE_NAME).getQueueUrl();
157+
final String queueName = "queue-" + System.currentTimeMillis();
158+
final String queueUrl = clientSQS.createQueue(queueName).getQueueUrl();
159159

160160
/*
161161
* send a message to the queue
@@ -173,13 +173,20 @@ public void testSendMultiByteCharactersMessage() throws JMSException {
173173

174174
Assert.assertNotNull(sendMessageResult);
175175
Assert.assertEquals("acbd18db4cc2f85cedef654fccc4a4d8", sendMessageResult.getMD5OfMessageBody());
176+
if (!sendMessageResult.getMD5OfMessageAttributes().equals("23bf3e5b587065b0cfbe95761641595a")) {
177+
// print details for debugging in CI (TODO remove once test is fixed)
178+
System.out.println("messageAttributes " + messageAttributes);
179+
System.out.println("getMD5OfMessageAttributes " + sendMessageResult.getMD5OfMessageAttributes());
180+
}
176181
Assert.assertEquals("23bf3e5b587065b0cfbe95761641595a", sendMessageResult.getMD5OfMessageAttributes());
177182

178183
/*
179184
* receive the message from the queue
180185
*/
181186
final ReceiveMessageResult messageResult = clientSQS.receiveMessage(queueUrl);
182187
Assert.assertNotNull(messageResult);
188+
189+
// TODO: clean up resources!
183190
}
184191

185192
/**

0 commit comments

Comments
 (0)
0