Update db dump script to target the new db

akvo · Sep 11, 2024 · 1864745 · 1864745
1 parent 79def6e
commit 1864745
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/scripts/data/helper/make-gcp-dump.sh b/scripts/data/helper/make-gcp-dump.sh
@@ -10,16 +10,11 @@ fi
 
 gcloud config set project akvo-lumen
 
-gcloud sql export sql rsr-prod-database "gs://akvo-rsr-db-dump/${dump_file}" --database=rsr_db
+gcloud sql export sql rsr-prod-database-2024 "gs://akvo-rsr-db-dump/${dump_file}" --database=rsr_db
 gsutil cp "gs://akvo-rsr-db-dump/$dump_file" /data/$dump_file
 gsutil rm "gs://akvo-rsr-db-dump/$dump_file"
 
 cd /data
 
-# Remove cloudsqlimportexport user
-gzip -d $dump_file
-sed -i "/cloudsqlimportexport/d" $filename
-gzip $filename
-
 # Point db_dump to the last dump
 ln -nfs $dump_file db_dump.gz
diff --git a/scripts/data/restore-from-dump.sh b/scripts/data/restore-from-dump.sh
@@ -14,9 +14,8 @@ psql_settings=("--username=postgres" "--host=${DB_HOST}" "--dbname=${RSR_DB_NAME
 psql "${psql_settings[@]}" --command="DROP SCHEMA public CASCADE"
 psql "${psql_settings[@]}" --command="CREATE SCHEMA public"
 gunzip --stdout "${DUMP_FILE}" \
-  | sed -e "/rsr_db_test_reportserver_user/d" \
-  | sed -e "/rsr_db_readonly_reportserver/d" \
-  | sed -e "/rsr_reportserver_db_user/d" \
+  | sed -e "/^REVOKE\ /d" \
+  | sed -e "/^GRANT\ /d" \
   | sed -e "/ALTER DEFAULT PRIVILEGES FOR ROLE postgres/d" \
   | psql "${psql_settings[@]}"