Force drop of pr database

bcgov · Oct 30, 2024 · 4826781 · 4826781
2 parents b684f7e + 51b3708
commit 4826781
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/on-pr-closed.yaml b/.github/workflows/on-pr-closed.yaml
@@ -61,7 +61,7 @@ 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}"
-          oc exec "${CRUNCHY_PG_PRIMARY_POD_NAME}" -- psql -c "DROP DATABASE \"pr-${{ github.event.number }}\" --cascade"
+          oc exec "${CRUNCHY_PG_PRIMARY_POD_NAME}" -- psql -c "DROP DATABASE \"pr-${{ github.event.number }}\" WITH (FORCE) --cascade"
           oc exec "${CRUNCHY_PG_PRIMARY_POD_NAME}" -- psql -c "DROP ROLE \"pr-${{ github.event.number }}\" --cascade"
           echo 'database and role deleted'
 

diff --git a/app/src/controllers/bucket.js b/app/src/controllers/bucket.js
@@ -162,6 +162,7 @@ const controller = {
         });
       }
 
+      // Future task: give user MANAGE permission on existing sub-folder (bucket) instead (see above)
       // Check for existing bucket collision
       const bucketCollision = await bucketService.readUnique({
         bucket: parentBucket.bucket,