From 8722d3f741e7454eecb94bb44a8a31deb8a4e71a Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Fri, 6 Aug 2021 17:26:40 +0300
Subject: [PATCH] dependency org.apache.httpcomponents httpclient moved from
 blackboxtests to the room POM. httpclient used in edge, but not explicitly
 added by dependency management. httpclient version with no change.

---
 msa/black-box-tests/pom.xml                   | 15 ++++++
 .../server/msa/ContainerTestSuite.java        | 46 ++++++++++++++++---
 pom.xml                                       |  6 +++
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index 50aca3ce22..5dcff4bd33 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -62,6 +62,21 @@
             <artifactId>takari-cpsuite</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
index 7f54298069..d619a5c4c9 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@@ -16,20 +16,25 @@
 package org.thingsboard.server.msa;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
-import org.junit.rules.ExternalResource;
 import org.junit.runner.RunWith;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.Base58;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.Duration;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({"org.thingsboard.server.msa.*Test"})
@@ -50,7 +55,7 @@ public class ContainerTestSuite {
                 String transportsLogRegexp = ".*Going to recalculate partitions.*";
 
                 testContainer = new DockerComposeContainer<>(
-                        new File("./../../docker/docker-compose.yml"),
+                        new File(removeContainerName("./../../docker/docker-compose.yml")),
                         new File("./../../docker/docker-compose.postgres.yml"),
                         new File("./../../docker/docker-compose.postgres.volumes.yml"),
                         new File("./../../docker/docker-compose.kafka.yml"))
@@ -73,4 +78,31 @@ public class ContainerTestSuite {
         }
         return testContainer;
     }
+
+    /**
+     * This workaround is actual until issue will be resolved:
+     * Support container_name in docker-compose file #2472 https://github.com/testcontainers/testcontainers-java/issues/2472
+     * docker-compose files which contain container_name are not supported and the creation of DockerComposeContainer fails due to IllegalStateException.
+     * This has been introduced in #1151 as a quick fix for unintuitive feedback. https://github.com/testcontainers/testcontainers-java/issues/1151
+     * Using the latest testcontainers and waiting for the fix...
+     * */
+    private static String removeContainerName(String sourceFilename) {
+        String outputFilename = null;
+        try {
+            String sourceContent = FileUtils.readFileToString(new File(sourceFilename), StandardCharsets.UTF_8);
+            String outputContent = sourceContent.replace("container_name: \"${LOAD_BALANCER_NAME}\"", "");
+            assertThat(outputContent, (not(containsString("container_name"))));
+
+            Path tempFile = Files.createTempFile("docker-compose", ".yml"); // the file looks like /tmp/docker-compose713972234379430232.yml
+            log.info("tempFile is {}", tempFile.toFile().getAbsolutePath());
+
+            FileUtils.writeStringToFile(tempFile.toFile(), outputContent, StandardCharsets.UTF_8);
+            outputFilename = tempFile.toFile().getAbsolutePath();
+            assertThat(FileUtils.readFileToString(new File(outputFilename), StandardCharsets.UTF_8), is(outputContent));
+
+        } catch (IOException e) {
+            Assert.fail("failed to create tmp file " + e.getMessage());
+        }
+        return outputFilename;
+    }
 }
diff --git a/pom.xml b/pom.xml
index e1bc101d00..14d0f65cb3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1731,6 +1731,12 @@
                 <artifactId>testcontainers</artifactId>
                 <version>${testcontainers.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.zeroturnaround</groupId>