fix: pr user removal on pr close (#2149)

Signed-off-by: OMPRAKASH MISHRA <[email protected]>
bcgov · Oct 28, 2024 · b316e31 · b316e31
1 parent cd6d7ca
commit b316e31
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
@@ -57,7 +57,10 @@ jobs:
           CRUNCHY_PG_PRIMARY_POD_NAME=$(oc get pods -l postgres-operator.crunchydata.com/role=master -o json | jq -r '.items[0].metadata.name')
           
           echo "${CRUNCHY_PG_PRIMARY_POD_NAME}"
-
+          # Terminate all connections to the database before trying terminate
+          oc exec "${CRUNCHY_PG_PRIMARY_POD_NAME}" -- psql -c "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = 'app-${{ github.event.number }}' AND pid <> pg_backend_pid();"
+          
+          # Drop the database and role
           oc exec "${CRUNCHY_PG_PRIMARY_POD_NAME}" -- psql -c "DROP DATABASE \"app-${{ github.event.number }}\" --cascade"
           oc exec "${CRUNCHY_PG_PRIMARY_POD_NAME}" -- psql -c "DROP ROLE \"app-${{ github.event.number }}\" --cascade"
           echo 'database and role deleted'