From eb61f0e25330b2c2a34d543e63e59f6be95de859 Mon Sep 17 00:00:00 2001
From: David Byron <82477955+dbyron-sf@users.noreply.github.com>
Date: Wed, 28 Aug 2024 08:02:07 -0700
Subject: [PATCH] chore(keiko-redis): test logging cleanups (#4775)

* chore(keiko-redis/test): add slf4j binding to keiko-redis tests

so test output contains log messages and to avoid these error messages:

SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
SLF4J: Failed to load class "org.slf4j.impl.StaticMDCBinder".
SLF4J: Defaulting to no-operation MDCAdapter implementation.
SLF4J: See http://www.slf4j.org/codes.html#no_static_mdc_binder for further details.

* chore(keiko-redis-spring/test): add slf4j binding to keiko-redis-spring tests

so test output contains log messages and to avoid these error messages:

SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.

* chore(keiko-redis/test): tone down testcontainers logging

since it's super verbose by default
---
 keiko-redis-spring/keiko-redis-spring.gradle |  1 +
 keiko-redis/keiko-redis.gradle               |  1 +
 keiko-redis/src/test/resources/logback.xml   | 36 ++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 keiko-redis/src/test/resources/logback.xml

diff --git a/keiko-redis-spring/keiko-redis-spring.gradle b/keiko-redis-spring/keiko-redis-spring.gradle
index 5515c3ccdb..cb6a57f96d 100644
--- a/keiko-redis-spring/keiko-redis-spring.gradle
+++ b/keiko-redis-spring/keiko-redis-spring.gradle
@@ -11,5 +11,6 @@ dependencies {
   testImplementation "org.assertj:assertj-core"
   testImplementation("io.spinnaker.kork:kork-jedis-test")
 
+  testRuntimeOnly "ch.qos.logback:logback-classic"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 }
diff --git a/keiko-redis/keiko-redis.gradle b/keiko-redis/keiko-redis.gradle
index b2bf3a24e5..86185e2d09 100644
--- a/keiko-redis/keiko-redis.gradle
+++ b/keiko-redis/keiko-redis.gradle
@@ -11,4 +11,5 @@ dependencies {
 
   testImplementation project(":keiko-tck")
   testImplementation "io.spinnaker.kork:kork-jedis-test"
+  testRuntimeOnly "ch.qos.logback:logback-classic"
 }
diff --git a/keiko-redis/src/test/resources/logback.xml b/keiko-redis/src/test/resources/logback.xml
new file mode 100644
index 0000000000..6145d38780
--- /dev/null
+++ b/keiko-redis/src/test/resources/logback.xml
@@ -0,0 +1,36 @@
+<!--
+
+    Copyright 2024 Salesforce, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<configuration>
+
+    <!-- see https://java.testcontainers.org/supported_docker_environment/logging_config/ -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <logger name="org.testcontainers" level="INFO"/>
+    <logger name="tc" level="INFO"/>
+    <logger name="com.github.dockerjava" level="WARN"/>
+    <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
+    <logger name="wiremock.org.eclipse.jetty" level="INFO"/>
+</configuration>