Skip to content

Commit 916a2a9

Browse files
dsessler7dsessler7
committed
make standalone-pgadmin-user-management kuttl test POSIX compliant
1 parent 5a03299 commit 916a2a9

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎testing/kuttl/e2e/standalone-pgadmin-user-management/01-assert.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ commands:
88
99
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
1010
11-
bob_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
12-
dave_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
1313
1414
[ $bob_role = 1 ] && [ $dave_role = 2 ] || exit 1
1515
1616
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1717
18-
bob_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
19-
dave_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
18+
bob_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
19+
dave_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
2020
2121
$bob_is_admin && ! $dave_is_admin || exit 1
2222
23-
bob_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
24-
dave_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
23+
bob_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
24+
dave_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
2525
2626
[ "$bob_password" = "password123" ] && [ "$dave_password" = "password456" ] || exit 1

‎testing/kuttl/e2e/standalone-pgadmin-user-management/03-assert.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ commands:
88
99
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
1010
11-
bob_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
12-
dave_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
13-
jimi_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
13+
jimi_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
1414
1515
[ $bob_role = 1 ] && [ $dave_role = 1 ] && [ $jimi_role = 2 ] || exit 1
1616
1717
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1818
19-
bob_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
20-
dave_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
21-
jimi_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
19+
bob_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
20+
dave_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
21+
jimi_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
2222
2323
$bob_is_admin && $dave_is_admin && ! $jimi_is_admin || exit 1
2424
25-
bob_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
26-
dave_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
27-
jimi_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
25+
bob_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
26+
dave_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
27+
jimi_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
2828
2929
[ "$bob_password" = "password123" ] && [ "$dave_password" = "password456" ] && [ "$jimi_password" = "password789" ] || exit 1

‎testing/kuttl/e2e/standalone-pgadmin-user-management/05-assert.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ commands:
88
99
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
1010
11-
bob_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
12-
dave_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
13-
jimi_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
13+
jimi_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
1414
1515
[ $bob_role = 1 ] && [ $dave_role = 1 ] && [ $jimi_role = 2 ] || exit 1
1616
1717
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1818
19-
bob_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
20-
dave_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
21-
jimi_is_admin=$(jq '.[] | select(.username=="[email protected]") | .isAdmin' <<< $users_in_secret)
19+
bob_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
20+
dave_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
21+
jimi_is_admin=$(printf '%s\n' $users_in_secret | jq '.[] | select(.username=="[email protected]") | .isAdmin')
2222
2323
$bob_is_admin && $dave_is_admin && ! $jimi_is_admin || exit 1
2424
25-
bob_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
26-
dave_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
27-
jimi_password=$(jq -r '.[] | select(.username=="[email protected]") | .password' <<< $users_in_secret)
25+
bob_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
26+
dave_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
27+
jimi_password=$(printf '%s\n' $users_in_secret | jq -r '.[] | select(.username=="[email protected]") | .password')
2828
2929
[ "$bob_password" = "NEWpassword123" ] && [ "$dave_password" = "NEWpassword456" ] && [ "$jimi_password" = "NEWpassword789" ] || exit 1

‎testing/kuttl/e2e/standalone-pgadmin-user-management/07-assert.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ commands:
88
99
users_in_pgadmin=$(kubectl exec -n "${NAMESPACE}" "${pod_name}" -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py get-users --json")
1010
11-
bob_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
12-
dave_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
13-
jimi_role=$(jq '.[] | select(.username=="[email protected]") | .role' <<< $users_in_pgadmin)
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
13+
jimi_role=$(printf '%s\n' $users_in_pgadmin | jq '.[] | select(.username=="[email protected]") | .role')
1414
1515
[ $bob_role = 1 ] && [ $dave_role = 1 ] && [ $jimi_role = 2 ] || exit 1
1616
1717
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1818
19-
$(jq '. == []' <<< $users_in_secret) || exit 1
19+
$(printf '%s\n' $users_in_secret | jq '. == []') || exit 1

0 commit comments

Comments
 (0)