Skip to content

Commit 100e5a5

Browse files
committed
Fixed failing workflow push to docker
1 parent 9b89839 commit 100e5a5

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

docker/build/test-docker-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ main() {
200200
LOGIN_RESPONSE=$(curl -sf -X POST \
201201
"http://localhost:$TEST_PORT/v1/api/auth/login" \
202202
-H "Content-Type: application/json" \
203-
-d "{\"username\":\"root\",\"password\":\"$ROOT_PASSWORD\"}" 2>&1)
203+
-d "{\"user\":\"root\",\"password\":\"$ROOT_PASSWORD\"}" 2>&1)
204204

205205
if [ $? -ne 0 ]; then
206206
log_error "✗ Login failed"

scripts/cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ get_access_token() {
699699

700700
response=$(curl -fsS -X POST "$base_url/v1/api/auth/login" \
701701
-H "Content-Type: application/json" \
702-
-d "{\"username\":\"root\",\"password\":\"$ROOT_PASSWORD\"}") || return 1
702+
-d "{\"user\":\"root\",\"password\":\"$ROOT_PASSWORD\"}") || return 1
703703

704704
python3 - "$response" << 'PY'
705705
import json

scripts/test-all.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ensure_admin_user() {
8787
local admin_status
8888
admin_status=$(curl -sS -o "$admin_login_body" -w '%{http_code}' \
8989
-H 'Content-Type: application/json' \
90-
-d "{\"username\":\"$KALAMDB_ADMIN_USER\",\"password\":\"$KALAMDB_ADMIN_PASSWORD\"}" \
90+
-d "{\"user\":\"$KALAMDB_ADMIN_USER\",\"password\":\"$KALAMDB_ADMIN_PASSWORD\"}" \
9191
"$KALAMDB_SERVER_URL/v1/api/auth/login")
9292
if [[ "$admin_status" == "200" ]]; then
9393
echo " Admin test user '$KALAMDB_ADMIN_USER' already available"
@@ -97,7 +97,7 @@ ensure_admin_user() {
9797
local root_status
9898
root_status=$(curl -sS -o "$root_login_body" -w '%{http_code}' \
9999
-H 'Content-Type: application/json' \
100-
-d "{\"username\":\"root\",\"password\":\"$KALAMDB_ROOT_PASSWORD\"}" \
100+
-d "{\"user\":\"root\",\"password\":\"$KALAMDB_ROOT_PASSWORD\"}" \
101101
"$KALAMDB_SERVER_URL/v1/api/auth/login")
102102
[[ "$root_status" == "200" ]] || die "Unable to authenticate as root to prepare admin test user"
103103

@@ -114,7 +114,7 @@ ensure_admin_user() {
114114
"$KALAMDB_SERVER_URL/v1/api/sql" >/dev/null
115115

116116
local admin_exists=false
117-
if grep -q "\"username\":\"$KALAMDB_ADMIN_USER\"" "$user_check_body"; then
117+
if grep -q "\"user\":\"$KALAMDB_ADMIN_USER\"" "$user_check_body"; then
118118
admin_exists=true
119119
fi
120120

@@ -144,7 +144,7 @@ ensure_admin_user() {
144144

145145
admin_status=$(curl -sS -o "$admin_login_body" -w '%{http_code}' \
146146
-H 'Content-Type: application/json' \
147-
-d "{\"username\":\"$KALAMDB_ADMIN_USER\",\"password\":\"$KALAMDB_ADMIN_PASSWORD\"}" \
147+
-d "{\"user\":\"$KALAMDB_ADMIN_USER\",\"password\":\"$KALAMDB_ADMIN_PASSWORD\"}" \
148148
"$KALAMDB_SERVER_URL/v1/api/auth/login")
149149
[[ "$admin_status" == "200" ]] || die "Admin test user '$KALAMDB_ADMIN_USER' is still not usable after bootstrap"
150150

scripts/test-typescript-sdk-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ensure_test_auth_ready() {
102102
"$SERVER_URL/v1/api/sql" >/dev/null
103103

104104
local repair_sql
105-
if grep -q "\"username\":\"$SERVER_USER\"" "$user_check_body"; then
105+
if grep -q "\"user\":\"$SERVER_USER\"" "$user_check_body"; then
106106
repair_sql="ALTER USER '$user_sql' SET PASSWORD '$password_sql'; ALTER USER '$user_sql' SET ROLE 'dba';"
107107
else
108108
repair_sql="CREATE USER '$user_sql' WITH PASSWORD '$password_sql' ROLE 'dba'"

0 commit comments

Comments
 (0)