From 3b74e3019327f57d0b3e3499698fe02dbd5c8faf Mon Sep 17 00:00:00 2001 From: Tomas Dvorak Date: Fri, 18 Aug 2023 13:23:30 +0200 Subject: [PATCH] rest username and passwords extracted to constants #16009 (#16156) --- .../datanode/integration/DatanodeSecuritySetupIT.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java b/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java index 9d3f88baec..99ac6f6711 100644 --- a/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java +++ b/data-node/src/test/java/org/graylog/datanode/integration/DatanodeSecuritySetupIT.java @@ -58,6 +58,8 @@ import static org.graylog.datanode.testinfra.DatanodeContainerizedBackend.IMAGE_ public class DatanodeSecuritySetupIT { private static final Logger LOG = LoggerFactory.getLogger(DatanodeSecuritySetupIT.class); + public static final String OPENSEARCH_REST_USERNAME = "admin"; + public static final String OPENSEARCH_REST_PASSWORD = "admin"; @TempDir static Path tempDir; @@ -91,8 +93,8 @@ public class DatanodeSecuritySetupIT { datanodeContainer.withEnv("GRAYLOG_DATANODE_HTTP_CERTIFICATE_PASSWORD", "password"); // configure initial admin username and password for Opensearch REST - datanodeContainer.withEnv("GRAYLOG_DATANODE_REST_API_USERNAME", "admin"); - datanodeContainer.withEnv("GRAYLOG_DATANODE_REST_API_PASSWORD", "admin"); + datanodeContainer.withEnv("GRAYLOG_DATANODE_REST_API_USERNAME", OPENSEARCH_REST_USERNAME); + datanodeContainer.withEnv("GRAYLOG_DATANODE_REST_API_PASSWORD", OPENSEARCH_REST_PASSWORD); // this is the interface that we bind opensearch to. It must be 0.0.0.0 if we want // to be able to reach opensearch from outside the container and docker network (true?) @@ -114,7 +116,7 @@ public class DatanodeSecuritySetupIT { try { given() - .auth().basic("admin", "admin") + .auth().basic(OPENSEARCH_REST_USERNAME, OPENSEARCH_REST_PASSWORD) .trustStore(trustStore) .get("https://localhost:" + backend.getOpensearchRestPort()) .then().assertThat()