Avoiding overwriting the authorization setting in DisabledSecurityDat…

…aStreamTestCase
masseyke · Sep 30, 2023 · 3a2d5ce · 3a2d5ce
1 parent ccc896d
commit 3a2d5ce
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...c/javaRestTest/java/org/elasticsearch/datastreams/DisabledSecurityDataStreamTestCase.java b/...c/javaRestTest/java/org/elasticsearch/datastreams/DisabledSecurityDataStreamTestCase.java
@@ -36,7 +36,11 @@ protected String getTestRestCluster() {
 
     @Override
     protected Settings restAdminSettings() {
-        String token = basicAuthHeaderValue("admin", new SecureString("admin-password".toCharArray()));
-        return Settings.builder().put(ThreadContext.PREFIX + ".Authorization", token).build();
+        if (super.restAdminSettings().keySet().contains(ThreadContext.PREFIX + ".Authorization")) {
+            return super.restAdminSettings();
+        } else {
+            String token = basicAuthHeaderValue("admin", new SecureString("admin-password".toCharArray()));
+            return Settings.builder().put(super.restAdminSettings()).put(ThreadContext.PREFIX + ".Authorization", token).build();
+        }
     }
 }