Update testcontainers to 1.15.0-rc2 (fix for a breaking change that appeared in Docker for Mac v2.4.0.0 testcontainers/testcontainers-java#3159)

Author: Anastasiia Smirnova

embedded-kafka/src/main/java/com/playtika/test/kafka/KafkaTopicsConfigurer.java

@@ -23,17 +23,19 @@
  */
 package com.playtika.test.kafka;
 
-import com.playtika.test.common.utils.ContainerUtils;
 import com.playtika.test.kafka.properties.KafkaConfigurationProperties;
 import com.playtika.test.kafka.properties.ZookeeperConfigurationProperties;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 
 import javax.annotation.PostConstruct;
 import java.util.Collection;
 
+import static com.playtika.test.common.utils.ContainerUtils.executeInContainer;
+
 @Slf4j
 @RequiredArgsConstructor
 @Getter
@@ -60,9 +62,8 @@ public void createTopics(Collection<String> topics) {
 
     private void createTopic(String topic) {
         String[] createTopicCmd = getCreateTopicCmd(topic, zookeeperProperties.getZookeeperConnect());
-        ContainerUtils.ExecCmdResult output = ContainerUtils.execCmd(this.kafka.getDockerClient(), this.kafka.getContainerId(), createTopicCmd);
-        log.debug("Topic={} creation cmd='{}' exitCode={} : {}",
-                topic, createTopicCmd, output.getExitCode(), output.getOutput());
+        Container.ExecResult execResult = executeInContainer(this.kafka, createTopicCmd);
+        log.debug("Topic={} creation cmd='{}' execResult={}", topic, createTopicCmd, execResult);
     }
 
     private void restrictTopics(String username, Collection<String> topics) {
@@ -71,11 +72,11 @@ private void restrictTopics(String username, Collection<String> topics) {
             for (String topic : topics) {
                 String[] topicConsumerACLsCmd = getTopicConsumerACLCmd(username, topic, zookeeperProperties.getZookeeperConnect());
                 String[] topicProducerACLsCmd = getTopicProducerACLCmd(username, topic, zookeeperProperties.getZookeeperConnect());
-                ContainerUtils.ExecCmdResult topicConsumerACLsOutput = ContainerUtils.execCmd(this.kafka.getDockerClient(), this.kafka.getContainerId(), topicConsumerACLsCmd);
-                ContainerUtils.ExecCmdResult topicProducerACLsOutput = ContainerUtils.execCmd(this.kafka.getDockerClient(), this.kafka.getContainerId(), topicProducerACLsCmd);
-                log.debug("Topic={} consumer ACLs cmd='{}' exitCode={} : {}, producer ACLs cmd='{}' exitCode={} : {}",
-                        topic, topicConsumerACLsCmd, topicConsumerACLsOutput.getExitCode(), topicConsumerACLsOutput.getOutput(),
-                        topicProducerACLsCmd, topicProducerACLsOutput.getExitCode(), topicProducerACLsOutput.getOutput());
+                Container.ExecResult topicConsumerACLsOutput = executeInContainer(this.kafka, topicConsumerACLsCmd);
+                Container.ExecResult topicProducerACLsOutput = executeInContainer(this.kafka, topicProducerACLsCmd);
+                log.debug("Topic={} consumer ACLs cmd='{}' execResult={}, producer ACLs cmd='{}' execResult={}",
+                        topic, topicConsumerACLsCmd, topicConsumerACLsOutput,
+                        topicProducerACLsCmd, topicProducerACLsOutput.getExitCode());
             }
             log.info("Created ACLs for Kafka topics: {}", topics);
         }

embedded-keycloak/src/test/java/com/playtika/test/keycloak/util/RealmInfo.java

@@ -1,10 +1,10 @@
 package com.playtika.test.keycloak.util;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.testcontainers.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.testcontainers.shaded.com.fasterxml.jackson.annotation.JsonProperty;
 
 @ToString
 @Getter

pom.xml

@@ -61,7 +61,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <testcontainers.version>1.14.3</testcontainers.version>
+        <testcontainers.version>1.15.0-rc2</testcontainers.version>
         <spring.cloud.version>Hoxton.SR8</spring.cloud.version>
 
         <equalsverifier.version>3.4.2</equalsverifier.version>

testcontainers-common/src/main/java/com/playtika/test/common/checks/AbstractCommandWaitStrategy.java

@@ -1,33 +1,34 @@
 /*
-* The MIT License (MIT)
-*
-* Copyright (c) 2018 Playtika
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Playtika
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 package com.playtika.test.common.checks;
 
-import com.playtika.test.common.utils.ContainerUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.Container;
 
-import static com.playtika.test.common.utils.ContainerUtils.ExecCmdResult;
+import java.util.Arrays;
+
+import static com.playtika.test.common.utils.ContainerUtils.executeInContainer;
 
 @Slf4j
 public abstract class AbstractCommandWaitStrategy extends AbstractRetryingWaitStrategy {
@@ -36,14 +37,14 @@ public abstract class AbstractCommandWaitStrategy extends AbstractRetryingWaitSt
 
     protected boolean isReady() {
         String commandName = getContainerType();
+
         String containerId = waitStrategyTarget.getContainerId();
-        log.debug("{} execution of command {} for container id: {} ", commandName, containerId);
+        String[] checkCommand = getCheckCommand();
+        log.debug("{} execution of command {} for container id: {} ", commandName, Arrays.toString(checkCommand), containerId);
 
-        ExecCmdResult healthCheckCmdResult =
-                ContainerUtils.execCmd(DockerClientFactory.instance().client(), containerId, getCheckCommand());
+        Container.ExecResult healthCheckCmdResult = executeInContainer(waitStrategyTarget, checkCommand);
 
-        log.debug("{} executed with exitCode: {}, output: {}",
-                commandName, healthCheckCmdResult.getExitCode(), healthCheckCmdResult.getOutput());
+        log.debug("{} executed with result: {}", commandName, healthCheckCmdResult);
 
         if (healthCheckCmdResult.getExitCode() != 0) {
             log.debug("{} executed with exitCode !=0, considering status as unknown", commandName);

testcontainers-common/src/main/java/com/playtika/test/common/utils/ContainerUtils.java

@@ -1,42 +1,38 @@
 /*
-* The MIT License (MIT)
-*
-* Copyright (c) 2018 Playtika
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Playtika
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 package com.playtika.test.common.utils;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.core.command.ExecStartResultCallback;
-import lombok.Value;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.OutputFrame;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.ServerSocket;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
@@ -58,8 +54,7 @@ public long startAndLogTime(GenericContainer container) {
 
         if (startupTime < 10L) {
             log.info("{} startup time is {} seconds", container.getDockerImageName(), startupTime);
-        } else
-        if (startupTime < 20L) {
+        } else if (startupTime < 20L) {
             log.warn("{} startup time is {} seconds", container.getDockerImageName(), startupTime);
         } else {
             log.error("{} startup time is {} seconds", container.getDockerImageName(), startupTime);
@@ -92,36 +87,12 @@ public static Consumer<OutputFrame> containerLogsConsumer(Logger log) {
         };
     }
 
-    public static ExecCmdResult execCmd(DockerClient dockerClient, String containerId, String[] command) {
-        ExecCreateCmdResponse cmd = dockerClient.execCreateCmd(containerId)
-                .withAttachStdout(true)
-                .withAttachStderr(true)
-                .withCmd(command)
-                .exec();
-
-        String cmdStdout;
-        String cmdStderr;
-
-        try (ByteArrayOutputStream stdout = new ByteArrayOutputStream();
-             ByteArrayOutputStream stderr = new ByteArrayOutputStream();
-             ExecStartResultCallback cmdCallback = new ExecStartResultCallback(stdout, stderr)) {
-            dockerClient.execStartCmd(cmd.getId()).exec(cmdCallback).awaitCompletion();
-            cmdStdout = stdout.toString(StandardCharsets.UTF_8.name());
-            cmdStderr = stderr.toString(StandardCharsets.UTF_8.name());
+    public static Container.ExecResult executeInContainer(ContainerState container, String[] command) {
+        try {
+            return container.execInContainer(command);
         } catch (Exception e) {
-            String format = String.format("Exception was thrown when executing: %s, for container: %s ", Arrays.toString(command), containerId);
+            String format = String.format("Exception was thrown when executing: %s, for container: %s ", Arrays.toString(command), container.getContainerId());
             throw new IllegalStateException(format, e);
         }
-
-        int exitCode = dockerClient.inspectExecCmd(cmd.getId()).exec().getExitCode();
-        String output = cmdStdout.isEmpty() ? cmdStderr : cmdStdout;
-        return new ExecCmdResult(exitCode, output);
     }
-
-    @Value
-    public static class ExecCmdResult {
-        int exitCode;
-        String output;
-    }
-
 }