Skip to content

Commit c90e73a

Browse files
tjmoore4tjmoore4
committed
Updates to support changes starting in pgAdmin 9.3
1 parent af97e79 commit c90e73a

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

‎internal/controller/standalone_pgadmin/users.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ cd $PGADMIN_DIR
173173
intentUsers := []pgAdminUserForJson{}
174174
for _, user := range pgadmin.Spec.Users {
175175
var stdin, stdout, stderr bytes.Buffer
176-
typeFlag := "--nonadmin"
176+
// typeFlag := "--nonadmin"
177+
typeFlag := "--role User"
177178
isAdmin := false
178179
if user.Role == "Administrator" {
179180
typeFlag = "--admin"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ 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=$(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')
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
1313
14-
[ $bob_role = 1 ] && [ $dave_role = 2 ] || exit 1
14+
[ $bob_role = "Administrator" ] && [ $dave_role = "User" ] || exit 1
1515
1616
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1717

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ 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=$(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')
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
13+
jimi_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
1414
15-
[ $bob_role = 1 ] && [ $dave_role = 1 ] && [ $jimi_role = 2 ] || exit 1
15+
[ $bob_role = "Administrator" ] && [ $dave_role = "Administrator" ] && [ $jimi_role = "User" ] || exit 1
1616
1717
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1818

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ 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=$(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')
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
13+
jimi_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
1414
15-
[ $bob_role = 1 ] && [ $dave_role = 1 ] && [ $jimi_role = 2 ] || exit 1
15+
[ $bob_role = "Administrator" ] && [ $dave_role = "Administrator" ] && [ $jimi_role = "User" ] || exit 1
1616
1717
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1818

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ 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=$(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')
11+
bob_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
12+
dave_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
13+
jimi_role=$(printf '%s\n' $users_in_pgadmin | jq -r '.[] | select(.username=="[email protected]") | .role')
1414
15-
[ $bob_role = 1 ] && [ $dave_role = 1 ] && [ $jimi_role = 2 ] || exit 1
15+
[ $bob_role = "Administrator" ] && [ $dave_role = "Administrator" ] && [ $jimi_role = "User" ] || exit 1
1616
1717
users_in_secret=$(kubectl get "${secret_name}" -n "${NAMESPACE}" -o 'go-template={{index .data "users.json" }}' | base64 -d)
1818

0 commit comments

Comments
 (0)