Merge pull request #322 from lucas-benedito/fix_awx_restore

Fix EDA Restore multiple bugs

Author: dsavineau

roles/restore/defaults/main.yml

@@ -30,4 +30,6 @@ restore_resource_requirements:
 set_self_labels: true
 
 spec_overrides: {}
+
+force_drop_db: false
 ...

roles/restore/tasks/postgres.yml

@@ -72,13 +72,24 @@
 - name: Set pg_restore command
   set_fact:
     pg_restore: >-
-      pg_restore --clean --if-exists --no-owner --no-acl
+      pg_restore {{ force_drop_db | bool | ternary('', '--clean --if-exists') }} --no-owner --no-acl
       -U {{ eda_postgres_user }}
       -h {{ resolvable_db_host }}
       -d {{ eda_postgres_database }}
       -p {{ eda_postgres_port }}
   no_log: "{{ no_log }}"
 
+- name: Grant CREATEDB privilege to database user for force_drop_db
+  kubernetes.core.k8s_exec:
+    namespace: "{{ ansible_operator_meta.namespace }}"
+    pod: "{{ postgres_pod_name }}"
+    container: postgres
+    command: >-
+      psql -c "ALTER USER {{ eda_postgres_user }} CREATEDB;"
+  when:
+    - force_drop_db | bool
+    - eda_postgres_type == 'managed'
+
 - name: Force drop and create database if force_drop_db is true
   block:
     - name: Set drop db command
@@ -138,3 +149,14 @@
       "
   register: data_migration
   no_log: "{{ no_log }}"
+
+- name: Revoke CREATEDB privilege from database user
+  kubernetes.core.k8s_exec:
+    namespace: "{{ ansible_operator_meta.namespace }}"
+    pod: "{{ postgres_pod_name }}"
+    container: postgres
+    command: >-
+      psql -c "ALTER USER {{ eda_postgres_user }} NOCREATEDB;"
+  when:
+    - force_drop_db | bool
+    - eda_postgres_type == 'managed'

roles/restore/vars/main.yml

@@ -8,5 +8,4 @@ _postgres_image_version: latest
 backup_api_version: '{{ deployment_type }}.ansible.com/v1alpha1'
 backup_kind: 'EDABackup'
 
-force_drop_db: false
 pg_drop_create: ''