From 7ffce9b345414657f6e74a8a80be54a93a83e5ba Mon Sep 17 00:00:00 2001
From: Julien Bouquillon <julien.bouquillon@sg.social.gouv.fr>
Date: Mon, 11 Oct 2021 23:50:40 +0200
Subject: [PATCH] fix(azure-db): fix drop (#877)

* fix(azure-db): fix drop

* fix test

* fix: handle weird db names
---
 azure-db/bin/drop-db-user        | 14 +++++++-------
 azure-db/tests/drop-db-user.bats |  4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/azure-db/bin/drop-db-user b/azure-db/bin/drop-db-user
index 3520dc277..26b2a0529 100755
--- a/azure-db/bin/drop-db-user
+++ b/azure-db/bin/drop-db-user
@@ -38,17 +38,17 @@ echo
 echo "deleting database ${DROP_DATABASE} on ${PGHOST}"
 psql -abe "$PG_URL_ADMIN" <<EOF
   SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE;
-  DROP DATABASE $DROP_DATABASE;
+  DROP DATABASE "$DROP_DATABASE";
 EOF
 
 echo
 echo "deleting user ${DROP_USER_BASE} on ${PGHOST}"
 psql -abe "$PG_URL_ADMIN" <<EOF
   SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE;
-  REVOKE ALL PRIVILEGES ON SCHEMA public FROM \"${DROP_USER_BASE}\";
-  REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM \"${DROP_USER_BASE}\";
-  REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM \"${DROP_USER_BASE}\";
-  REVOKE ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA public FROM \"${DROP_USER_BASE}\";
-  DROP OWNED BY ${DROP_USER_BASE} CASCADE;
-  DROP USER ${DROP_USER_BASE};
+  REVOKE ALL PRIVILEGES ON SCHEMA public FROM "$DROP_USER_BASE";
+  REVOKE ALL PRIVILEGES ON ALL TABLES IN SCHEMA public FROM "$DROP_USER_BASE";
+  REVOKE ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public FROM "$DROP_USER_BASE";
+  REVOKE ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA public FROM "$DROP_USER_BASE";
+  DROP OWNED BY "${DROP_USER_BASE}" CASCADE;
+  DROP USER "${DROP_USER_BASE}";
 EOF
diff --git a/azure-db/tests/drop-db-user.bats b/azure-db/tests/drop-db-user.bats
index 0e71c56e3..199ab86a2 100644
--- a/azure-db/tests/drop-db-user.bats
+++ b/azure-db/tests/drop-db-user.bats
@@ -38,6 +38,10 @@ teardown_file() {
   assert_line --partial 'SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE;'
   assert_line --partial 'SELECT pg_terminate_backend (pg_stat_activity.pid)'
   assert_line --partial 'deleting database autodevops_'${ID}' on localhost'
+  assert_line --partial 'deleting user user_'${ID}' on localhost'
+  assert_line 'DROP DATABASE'
+  assert_line 'DROP OWNED'
+  assert_line 'DROP ROLE'
   assert_success
 }