From 71b49489a51a0902d24f7d761ff830d354ccb262 Mon Sep 17 00:00:00 2001
From: David Holub <74815577+Corpratespaz@users.noreply.github.com>
Date: Wed, 5 Apr 2023 21:16:30 +0700
Subject: [PATCH 1/2] Suppressed security warning for testing and elevated
 logging level

---
 api/src/main/resources/config/application-test.properties | 2 +-
 api/src/test/kotlin/edu/wgu/osmt/BaseDockerizedTest.kt    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/src/main/resources/config/application-test.properties b/api/src/main/resources/config/application-test.properties
index 0ad8fa855..1f981ec45 100644
--- a/api/src/main/resources/config/application-test.properties
+++ b/api/src/main/resources/config/application-test.properties
@@ -1,7 +1,7 @@
 # This property was added to suppress ElasticSearch RestClient warnings after upgrading
 # ElasticSearch to 7.16.2 for log4j vulnerabilities. We would expect this property to be
 # removed after upgrading Spring Boot and associated API dependencies.
-logging.level.org.elasticsearch.client.RestClient=DEBUG
+logging.level.org.elasticsearch.client.RestClient=INFO
 
 spring.flyway.enabled=true
 
diff --git a/api/src/test/kotlin/edu/wgu/osmt/BaseDockerizedTest.kt b/api/src/test/kotlin/edu/wgu/osmt/BaseDockerizedTest.kt
index cb660885a..3b3306ec9 100644
--- a/api/src/test/kotlin/edu/wgu/osmt/BaseDockerizedTest.kt
+++ b/api/src/test/kotlin/edu/wgu/osmt/BaseDockerizedTest.kt
@@ -35,6 +35,7 @@ object Containers {
         withExposedPorts(9200, 9300)
         withEnv("discovery.type","single-node")
         withEnv("net","host")
+        withEnv("xpack.security.enabled","false")
         start()
         println("Elasticsearch port: ${getMappedPort(9200)}")
     }

From 0520a9fe9509a342d548782c257ed7669a41e16e Mon Sep 17 00:00:00 2001
From: David Holub <74815577+Corpratespaz@users.noreply.github.com>
Date: Wed, 5 Apr 2023 21:23:46 +0700
Subject: [PATCH 2/2] Remove unneeded comments

---
 api/src/main/resources/config/application-test.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/api/src/main/resources/config/application-test.properties b/api/src/main/resources/config/application-test.properties
index 1f981ec45..448835d05 100644
--- a/api/src/main/resources/config/application-test.properties
+++ b/api/src/main/resources/config/application-test.properties
@@ -1,6 +1,3 @@
-# This property was added to suppress ElasticSearch RestClient warnings after upgrading
-# ElasticSearch to 7.16.2 for log4j vulnerabilities. We would expect this property to be
-# removed after upgrading Spring Boot and associated API dependencies.
 logging.level.org.elasticsearch.client.RestClient=INFO
 
 spring.flyway.enabled=true