From e6a01eb505b295df4b32e899688d2d9588d65193 Mon Sep 17 00:00:00 2001
From: Ryan Bogan <rbogan@amazon.com>
Date: Wed, 24 Jan 2024 15:57:43 -0800
Subject: [PATCH] Debug
Signed-off-by: Ryan Bogan <rbogan@amazon.com>
---
.github/workflows/test_security.yml | 2 +-
build.gradle | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
index 572234166..783b4399c 100644
--- a/.github/workflows/test_security.yml
+++ b/.github/workflows/test_security.yml
@@ -56,4 +56,4 @@ jobs:
# switching the user, as OpenSearch cluster can only be started as root/Administrator on linux-deb/linux-rpm/windows-zip.
run: |
chown -R 1000:1000 `pwd`
- su `id -un 1000` -c "whoami && java -version && ./gradlew integTest -Dsecurity.enabled=true -Dhttps=true -Duser=admin -Dpassword=myStrongPassword123!"
+ su `id -un 1000` -c "whoami && java -version && ./gradlew integTest -Dsecurity.enabled=true"
diff --git a/build.gradle b/build.gradle
index 26a6db876..6a3a31ad6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,7 @@ buildscript {
version_qualifier = System.getProperty("build.version_qualifier", "")
opensearch_group = "org.opensearch"
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
+ System.setProperty("OPENSEARCH_INITIAL_ADMIN_PASSWORD", "myStrongPassword123!")
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
@@ -93,9 +94,9 @@ ext {
cluster.getNodes().forEach { node ->
var creds = node.getCredentials()
if (creds.isEmpty()) {
- creds.add(Map.of('username', 'admin', 'password', 'myStrongPassword123!'))
+ creds.add(Map.of('username', 'admin', 'password', System.getProperty("OPENSEARCH_INITIAL_ADMIN_PASSWORD")))
} else {
- creds.get(0).putAll(Map.of('username', 'admin', 'password', 'myStrongPassword123!'))
+ creds.get(0).putAll(Map.of('username', 'admin', 'password', System.getProperty("OPENSEARCH_INITIAL_ADMIN_PASSWORD")))
}
}
@@ -341,7 +342,7 @@ integTest {
// If security is enabled, set is_https/user/password defaults
is_https = is_https == null ? "true" : is_https
user = user == null ? "admin" : user
- password = password == null ? "myStrongPassword123!" : password
+ password = password == null ? System.getProperty("OPENSEARCH_INITIAL_ADMIN_PASSWORD") : password
}
systemProperty("https", is_https)