From 53e80aa4115b60eee11823b5aa7d3616065a9421 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <mdedetrich@gmail.com>
Date: Thu, 7 Apr 2022 18:03:27 +0200
Subject: [PATCH] Fix incorrect path for RABBITMQ_CONFIG_FILE (#5184)

Co-authored-by: Kevin Wittek <kevin@wittek.dev>
---
 .../containers/RabbitMQContainer.java         |  2 +-
 .../containers/RabbitMQContainerTest.java     | 24 +++++++------------
 .../src/test/resources/logback-test.xml       | 16 +++++++++++++
 .../src/test/resources/rabbitmq-custom.conf   |  3 +--
 .../src/test/resources/rabbitmq-custom.config | 18 ++++++--------
 5 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 modules/rabbitmq/src/test/resources/logback-test.xml

diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index edbffcf3174..37dc2fbe7ca 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -396,7 +396,7 @@ public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
      * @return This container.
      */
     public RabbitMQContainer withRabbitMQConfigSysctl(MountableFile rabbitMQConf) {
-        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom");
+        withEnv("RABBITMQ_CONFIG_FILE", "/etc/rabbitmq/rabbitmq-custom.conf");
         return withCopyFileToContainer(rabbitMQConf, "/etc/rabbitmq/rabbitmq-custom.conf");
     }
 
diff --git a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
index 8be97deb710..474d613cb8b 100644
--- a/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
+++ b/modules/rabbitmq/src/test/java/org/testcontainers/containers/RabbitMQContainerTest.java
@@ -14,6 +14,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -21,6 +22,8 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.util.Collections;
+import java.util.Objects;
+import java.util.Scanner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
@@ -115,43 +118,34 @@ public void shouldCreateRabbitMQContainerWithQueues() throws IOException, Interr
     }
 
     @Test
-    public void shouldMountConfigurationFile()
-    {
+    public void shouldMountConfigurationFile() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
             container.withRabbitMQConfig(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
 
-            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
-            assertThat(container.getLogs()).doesNotContain(" (not found)");
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
         }
     }
 
 
     @Test
-    public void shouldMountConfigurationFileErlang()
-    {
+    public void shouldMountConfigurationFileErlang() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
             container.withRabbitMQConfigErlang(MountableFile.forClasspathResource("/rabbitmq-custom.config"));
             container.start();
 
-            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.config");
-            assertThat(container.getLogs()).doesNotContain(" (not found)");
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
         }
     }
 
 
     @Test
-    public void shouldMountConfigurationFileSysctl()
-    {
+    public void shouldMountConfigurationFileSysctl() {
         try (RabbitMQContainer container = new RabbitMQContainer(RabbitMQTestImages.RABBITMQ_IMAGE)) {
-
             container.withRabbitMQConfigSysctl(MountableFile.forClasspathResource("/rabbitmq-custom.conf"));
             container.start();
 
-            assertThat(container.getLogs()).contains("config file(s) : /etc/rabbitmq/rabbitmq-custom.conf");
-            assertThat(container.getLogs()).doesNotContain(" (not found)");
+            assertThat(container.getLogs()).contains("debug"); // config file changes log level to `debug`
         }
     }
 
diff --git a/modules/rabbitmq/src/test/resources/logback-test.xml b/modules/rabbitmq/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..535e406fc13
--- /dev/null
+++ b/modules/rabbitmq/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.testcontainers" level="DEBUG"/>
+</configuration>
diff --git a/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
index 293829a353b..a2994c78602 100644
--- a/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
+++ b/modules/rabbitmq/src/test/resources/rabbitmq-custom.conf
@@ -1,2 +1 @@
-loopback_users.guest = false
-listeners.tcp.default = 5555
+log.console.level = debug
diff --git a/modules/rabbitmq/src/test/resources/rabbitmq-custom.config b/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
index a1c581542ce..353a854fc42 100644
--- a/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
+++ b/modules/rabbitmq/src/test/resources/rabbitmq-custom.config
@@ -1,13 +1,9 @@
 [
-{ rabbit, [
-{ loopback_users, [ ] },
-		{ tcp_listeners, [ 5555 ] },
-		{ ssl_listeners, [ ] },
-		{ default_vhost, <<"vhost">> },
-		{ hipe_compile, false }
-	] },
-	{ rabbitmq_management, [ { listener, [
-		{ port, 15672 },
-		{ ssl, false }
-	] } ] }
+{rabbit,
+    [
+        {log,
+            [{console, [{level, debug}]}]
+        }
+    ]
+}
 ].