From e57472e51e6ad094b484d2e8bb5f077e0844d789 Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 25 Apr 2024 07:28:37 -0700 Subject: [PATCH 1/3] Fix test failures in deploy_flask_app and backup_select_resources roles --- changelogs/fragments/backup_select_resource_bug_fix.yml | 3 +++ changelogs/fragments/fix_rds_db_version.yml | 3 +++ playbooks/webapp/README.md | 2 +- playbooks/webapp/vars/main.yaml | 2 +- roles/backup_select_resources/tasks/main.yaml | 2 +- .../roles/run_deploy_flask_app/vars/main.yaml | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/backup_select_resource_bug_fix.yml create mode 100644 changelogs/fragments/fix_rds_db_version.yml diff --git a/changelogs/fragments/backup_select_resource_bug_fix.yml b/changelogs/fragments/backup_select_resource_bug_fix.yml new file mode 100644 index 00000000..90c02cf1 --- /dev/null +++ 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 new file mode 100644 index 00000000..47adf9ac --- /dev/null +++ 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 index ffd54b22..4ef00579 100644 --- 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 index 05df567c..6531409c 100644 --- 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 index 52b1fda3..c3a2d469 100644 --- 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 index 64823dd2..fdf67710 100644 --- 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-* From 39206621317f0296559084399e2d1b3c48755b81 Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 25 Apr 2024 09:33:41 -0700 Subject: [PATCH 2/3] add ansible-core --- .../roles/run_deploy_flask_app/tasks/create.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml b/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml index 6489f236..5723e53b 100644 --- a/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml +++ b/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml @@ -184,7 +184,7 @@ - "{{ secgroup.group_id }}" user_data: | #!/bin/bash - yum install -y python3 python-virtualenv sshpass netcat ansible + yum install -y python3 python-virtualenv sshpass netcat ansible-core wait: true state: started register: vm_result From cc253ca2f37a89e5f145492f1410bae385a96fb3 Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 25 Apr 2024 14:27:49 -0700 Subject: [PATCH 3/3] Use fedora-39 to fix yum issue --- .../roles/run_deploy_flask_app/tasks/create.yaml | 2 +- .../roles/run_deploy_flask_app/vars/main.yaml | 2 +- tests/integration/targets/test_deploy_flask_app/runme.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml b/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml index 5723e53b..8cdbfcd9 100644 --- a/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml +++ b/tests/integration/targets/test_deploy_flask_app/roles/run_deploy_flask_app/tasks/create.yaml @@ -184,7 +184,7 @@ - "{{ secgroup.group_id }}" user_data: | #!/bin/bash - yum install -y python3 python-virtualenv sshpass netcat ansible-core + yum install -y python3 python3-virtualenv sshpass netcat ansible-core wait: true state: started register: vm_result 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 index fdf67710..29fb3afc 100644 --- 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 @@ -22,7 +22,7 @@ rds_engine: postgres rds_engine_version: "16.2" bastion_host_type: t3.micro bastion_host_venv_path: ~/env -image_filter: Fedora-Cloud-Base-38-* +image_filter: Fedora-Cloud-Base-39-* bastion_host_iam_role: "{{ resource_prefix }}-role" # vars for the deploy_flask_app role and create task diff --git a/tests/integration/targets/test_deploy_flask_app/runme.sh b/tests/integration/targets/test_deploy_flask_app/runme.sh index bb3f1767..d601888a 100755 --- a/tests/integration/targets/test_deploy_flask_app/runme.sh +++ b/tests/integration/targets/test_deploy_flask_app/runme.sh @@ -13,4 +13,4 @@ trap 'cleanup "${@}"' ERR ansible-playbook run.yaml -e "run_deploy_flask_app_operation=create" "$@" # Delete web application -ansible-playbook run.yaml -e "run_deploy_flask_app_operation=delete" "$@" \ No newline at end of file + ansible-playbook run.yaml -e "run_deploy_flask_app_operation=delete" "$@"