Fix test failures in deploy_flask_app and backup_select_resources roles

redhat-cop · Apr 25, 2024 · e57472e · e57472e
1 parent 7a63084
commit e57472e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/changelogs/fragments/backup_select_resource_bug_fix.yml b/changelogs/fragments/backup_select_resource_bug_fix.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fix incorrect dict attribute in backup_select_resources role.
diff --git a/changelogs/fragments/fix_rds_db_version.yml b/changelogs/fragments/fix_rds_db_version.yml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - Replace the postgres db engine version from 14.8 to 16.2
diff --git a/playbooks/webapp/README.md b/playbooks/webapp/README.md
@@ -126,7 +126,7 @@ To delete the webapp:
 * **rds_instance_class** (str): DB instance class for the RDS instance. Default: `db.m6g.large`
 * **rds_instance_name** (str): Name for the database. Default: `mysampledb123`
 * **rds_engine** (str): Engine to use for the database. Default: `postgres`
-* **rds_engine_version** (str): Version number of the database engine to use. Default: `"14.8"`
+* **rds_engine_version** (str): Version number of the database engine to use. Default: `"16.2"`
 * **deploy_flask_app_rds_master_username** (str): Name of the master user for the database instance. Default: `ansible`
 * **deploy_flask_app_rds_master_password** (str): Password for the master database user. Default: `L#5cH2mgy_`
 

diff --git a/playbooks/webapp/vars/main.yaml b/playbooks/webapp/vars/main.yaml
@@ -22,7 +22,7 @@ rds_allocated_storage_gb: 20
 rds_instance_class: db.m6g.large
 rds_instance_name: mysampledb123
 rds_engine: postgres
-rds_engine_version: "14.8"
+rds_engine_version: "16.2"
 bastion_host_type: t3.micro
 bastion_host_venv_path: ~/env
 rds_listening_port: 5432

diff --git a/roles/backup_select_resources/tasks/main.yaml b/roles/backup_select_resources/tasks/main.yaml
@@ -53,7 +53,7 @@
 
     - name: Set backup role ARN
       ansible.builtin.set_fact:
-        backup_select_resources_backup_role_arn: "{{ backup_select_resources_role_info.iam_roles[0].arn if backup_select_resources_new_role_info is skipped else backup_select_resources_new_role_info.arn }}"
+        backup_select_resources_backup_role_arn: "{{ backup_select_resources_role_info.iam_roles[0].arn if backup_select_resources_new_role_info is skipped else backup_select_resources_new_role_info.iam_role.arn }}"
 
     - name: Create or update backup selection
       amazon.aws.backup_selection:

diff --git a/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/vars/main.yaml b/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/vars/main.yaml
@@ -19,7 +19,7 @@ rds_allocated_storage_gb: 20
 rds_instance_class: db.m6g.large
 rds_instance_name: mysampledb123
 rds_engine: postgres
-rds_engine_version: "14.8"
+rds_engine_version: "16.2"
 bastion_host_type: t3.micro
 bastion_host_venv_path: ~/env
 image_filter: Fedora-Cloud-Base-38-*