Remove x-pact from RESI API username and password (#117)

Signed-off-by: Peter Nied <petern@amazon.com>
opensearch-project · Mar 13, 2021 · 62c14bb · 62c14bb
1 parent 83e87f7
commit 62c14bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/distribution/docker/docker-test-entrypoint.sh b/distribution/docker/docker-test-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 cd /usr/share/elasticsearch/bin/
-./elasticsearch-users useradd x_pack_rest_user -p x-pack-test-password -r superuser || true
+./elasticsearch-users useradd rest_user -p test-password -r superuser || true
 echo "testnode" > /tmp/password
 /usr/local/bin/docker-entrypoint.sh | tee > /usr/share/elasticsearch/logs/console.log
diff --git a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java
@@ -36,8 +36,8 @@
 
 public class DockerYmlTestSuiteIT extends ESClientYamlSuiteTestCase {
 
-    private static final String USER = "x_pack_rest_user";
-    private static final String PASS = "x-pack-test-password";
+    private static final String USER = "rest_user";
+    private static final String PASS = "test-password";
     private static final String KEYSTORE_PASS = "testnode";
 
     public DockerYmlTestSuiteIT(ClientYamlTestCandidate testCandidate) {

diff --git a/qa/remote-clusters/docker-compose.yml b/qa/remote-clusters/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     entrypoint: /docker-test-entrypoint.sh
     healthcheck:
       start_period: 15s
-      test: ["CMD", "curl", "-f", "-u", "x_pack_rest_user:x-pack-test-password", "-k", "https://localhost:9200"]
+      test: ["CMD", "curl", "-f", "-u", "rest_user:test-password", "-k", "https://localhost:9200"]
       interval: 10s
       timeout: 2s
       retries: 5
@@ -71,7 +71,7 @@ services:
     entrypoint: /docker-test-entrypoint.sh
     healthcheck:
       start_period: 15s
-      test: ["CMD", "curl", "-f", "-u", "x_pack_rest_user:x-pack-test-password", "-k", "https://localhost:9200"]
+      test: ["CMD", "curl", "-f", "-u", "rest_user:test-password", "-k", "https://localhost:9200"]
       interval: 10s
       timeout: 2s
       retries: 5

diff --git a/qa/remote-clusters/docker-test-entrypoint.sh b/qa/remote-clusters/docker-test-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 cd /usr/share/elasticsearch/bin/
-./elasticsearch-users useradd x_pack_rest_user -p x-pack-test-password -r superuser || true
+./elasticsearch-users useradd rest_user -p test-password -r superuser || true
 echo "testnode" > /tmp/password
 /usr/local/bin/docker-entrypoint.sh | tee > /usr/share/elasticsearch/logs/console.log