Fix rds_cluster tests on stable-5 branch (#1671)

Fix rds_cluster tests on stable-5 branch SUMMARY This fixes two problems with the rds_cluster test target. Ansible 2.16 is removing ansible.builtin.include (and has removed it in the current milestone branch), so this has been replaced with ansible.builtin.include_tasks. In addition, this updates the engine as Aurora 1 has been retired. I'm a little confused by the history of this test target. #1493 and #1504 seem to have been merged on the same day, with one overwriting some of the changes of the other. The tests for rds_cluster on the stable-5 branch are currently broken, though, as can be seen in the failure on #1664. If there's a better way to fix this, feel free to suggest something different. ISSUE TYPE Bugfix Pull Request COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: Jill R Reviewed-by: Alina Buzachis
ansible-collections · Jul 31, 2023 · c03a39e · c03a39e
1 parent 265dcae
commit c03a39e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/defaults/main.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/defaults/main.yml
@@ -4,7 +4,7 @@
 cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix}}
 username: testrdsusername
 password: test-rds_password
-engine: aurora
+engine: aurora-mysql
 port: 3306
 tags_create:
   Name: ansible-test-cluster-{{ tiny_prefix }}

diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml
@@ -7,4 +7,4 @@
       security_token: '{{ security_token | default(omit) }}'
 
   block:
-  - include: ./test_{{ inventory_hostname }}.yml
+  - include_tasks: ./test_{{ inventory_hostname }}.yml
diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create.yml
@@ -62,15 +62,15 @@
       - "'engine' in _result_create_db_cluster"
       - _result_create_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_create_db_cluster"
-      - _result_create_db_cluster.engine_mode == "serverless"
+      - _result_create_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_create_db_cluster"
       - "'master_username' in _result_create_db_cluster"
       - _result_create_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_create_db_cluster"
       - _result_create_db_cluster.port == {{ port }}
       - "'status' in _result_create_db_cluster"
       - _result_create_db_cluster.status == 'available'
-      - _result_create_db_cluster.storage_encrypted == true
+      - _result_create_db_cluster.storage_encrypted == false
       - "'tags' in _result_create_db_cluster"
       - _result_create_db_cluster.tags | length == 2
       - _result_create_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]}}"

diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create_sgs.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create_sgs.yml
@@ -71,15 +71,15 @@
       - "'engine' in _result_create_db_cluster"
       - _result_create_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_create_db_cluster"
-      - _result_create_db_cluster.engine_mode == "serverless"
+      - _result_create_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_create_db_cluster"
       - "'master_username' in _result_create_db_cluster"
       - _result_create_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_create_db_cluster"
       - _result_create_db_cluster.port == {{ port }}
       - "'status' in _result_create_db_cluster"
       - _result_create_db_cluster.status == 'available'
-      - _result_create_db_cluster.storage_encrypted == true
+      - _result_create_db_cluster.storage_encrypted == false
       - "'tags' in _result_create_db_cluster"
       - "'vpc_security_groups' in _result_create_db_cluster"
       - _result_create_db_cluster.vpc_security_groups | selectattr('status', 'in',
@@ -126,15 +126,15 @@
       - "'engine' in _result_create_db_cluster"
       - _result_create_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_create_db_cluster"
-      - _result_create_db_cluster.engine_mode == "serverless"
+      - _result_create_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_create_db_cluster"
       - "'master_username' in _result_create_db_cluster"
       - _result_create_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_create_db_cluster"
       - _result_create_db_cluster.port == {{ port }}
       - "'status' in _result_create_db_cluster"
       - _result_create_db_cluster.status == 'available'
-      - _result_create_db_cluster.storage_encrypted == true
+      - _result_create_db_cluster.storage_encrypted == false
       - "'tags' in _result_create_db_cluster"
       - "'vpc_security_groups' in _result_create_db_cluster"
       - _result_create_db_cluster.vpc_security_groups | selectattr('status', 'in',

diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_promote.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_promote.yml
@@ -47,7 +47,7 @@
       - "'engine' in _result_create_src_db_cluster"
       - _result_create_src_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_create_src_db_cluster"
-      - _result_create_src_db_cluster.engine_mode == "serverless"
+      - _result_create_src_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_create_src_db_cluster"
       - "'master_username' in _result_create_src_db_cluster"
       - _result_create_src_db_cluster.master_username == "{{ username }}"
@@ -103,7 +103,7 @@
       - "'engine' in _result_create_replica_db_cluster"
       - _result_create_replica_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_create_replica_db_cluster"
-      - _result_create_replica_db_cluster.engine_mode == "serverless"
+      - _result_create_replica_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_create_replica_db_cluster"
       - "'master_username' in _result_create_replica_db_cluster"
       - _result_create_replica_db_cluster.master_username == "{{ username }}"

diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_restore.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_restore.yml
@@ -41,15 +41,15 @@
       - "'engine' in _result_create_source_db_cluster"
       - _result_create_source_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_create_source_db_cluster"
-      - _result_create_source_db_cluster.engine_mode == "serverless"
+      - _result_create_source_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_create_source_db_cluster"
       - "'master_username' in _result_create_source_db_cluster"
       - _result_create_source_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_create_source_db_cluster"
       - _result_create_source_db_cluster.port == {{ port }}
       - "'status' in _result_create_source_db_cluster"
       - _result_create_source_db_cluster.status == 'available'
-      - _result_create_source_db_cluster.storage_encrypted == true
+      - _result_create_source_db_cluster.storage_encrypted == false
       - "'tags' in _result_create_source_db_cluster"
       - "'vpc_security_groups' in _result_create_source_db_cluster"
 
@@ -83,7 +83,7 @@
       - "'engine' in _result_restored_db_cluster"
       - _result_restored_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_restored_db_cluster"
-      - _result_restored_db_cluster.engine_mode == "serverless"
+      - _result_restored_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_restored_db_cluster"
       - "'master_username' in _result_restored_db_cluster"
       - _result_restored_db_cluster.master_username == "{{ username }}"
@@ -152,7 +152,7 @@
       - "'engine' in _result_restored_db_cluster"
       - _result_restored_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_restored_db_cluster"
-      - _result_restored_db_cluster.engine_mode == "serverless"
+      - _result_restored_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_restored_db_cluster"
       - "'master_username' in _result_restored_db_cluster"
       - _result_restored_db_cluster.master_username == "{{ username }}"

diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_tag.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_tag.yml
@@ -39,15 +39,15 @@
       - "'engine' in _result_create_db_cluster"
       - _result_create_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_create_db_cluster"
-      - _result_create_db_cluster.engine_mode == "serverless"
+      - _result_create_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_create_db_cluster"
       - "'master_username' in _result_create_db_cluster"
       - _result_create_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_create_db_cluster"
       - _result_create_db_cluster.port == {{ port }}
       - "'status' in _result_create_db_cluster"
       - _result_create_db_cluster.status == 'available'
-      - _result_create_db_cluster.storage_encrypted == true
+      - _result_create_db_cluster.storage_encrypted == false
       - "'tags' in _result_create_db_cluster"
       - _result_create_db_cluster.tags | length == 2
       - _result_create_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]
@@ -81,15 +81,15 @@
       - "'engine' in _result_tag_db_cluster"
       - _result_tag_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_tag_db_cluster"
-      - _result_tag_db_cluster.engine_mode == "serverless"
+      - _result_tag_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_tag_db_cluster"
       - "'master_username' in _result_tag_db_cluster"
       - _result_tag_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_tag_db_cluster"
       - _result_tag_db_cluster.port == {{ port }}
       - "'status' in _result_tag_db_cluster"
       - _result_tag_db_cluster.status == 'available'
-      - _result_tag_db_cluster.storage_encrypted == true
+      - _result_tag_db_cluster.storage_encrypted == false
       - "'tags' in _result_tag_db_cluster"
       - _result_tag_db_cluster.tags | length == 2
       - _result_tag_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]
@@ -120,15 +120,15 @@
       - "'engine' in _result_tag_db_cluster"
       - _result_tag_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_tag_db_cluster"
-      - _result_tag_db_cluster.engine_mode == "serverless"
+      - _result_tag_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_tag_db_cluster"
       - "'master_username' in _result_tag_db_cluster"
       - _result_tag_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_tag_db_cluster"
       - _result_tag_db_cluster.port == {{ port }}
       - "'status' in _result_tag_db_cluster"
       - _result_tag_db_cluster.status == 'available'
-      - _result_tag_db_cluster.storage_encrypted == true
+      - _result_tag_db_cluster.storage_encrypted == false
       - "'tags' in _result_tag_db_cluster"
       - _result_tag_db_cluster.tags | length == 2
       - _result_tag_db_cluster.tags["Name"] == "{{ tags_patch['Name'] }}"
@@ -175,15 +175,15 @@
       - "'engine' in _result_tag_db_cluster"
       - _result_tag_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_tag_db_cluster"
-      - _result_tag_db_cluster.engine_mode == "serverless"
+      - _result_tag_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_tag_db_cluster"
       - "'master_username' in _result_tag_db_cluster"
       - _result_tag_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_tag_db_cluster"
       - _result_tag_db_cluster.port == {{ port }}
       - "'status' in _result_tag_db_cluster"
       - _result_tag_db_cluster.status == 'available'
-      - _result_tag_db_cluster.storage_encrypted == true
+      - _result_tag_db_cluster.storage_encrypted == false
       - "'tags' in _result_tag_db_cluster"
       - _result_tag_db_cluster.tags | length == 1
       - _result_tag_db_cluster.tags["Created_By"] == "Ansible_rds_cluster_integration_test"
@@ -230,15 +230,15 @@
       - "'engine' in _result_tag_db_cluster"
       - _result_tag_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_tag_db_cluster"
-      - _result_tag_db_cluster.engine_mode == "serverless"
+      - _result_tag_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_tag_db_cluster"
       - "'master_username' in _result_tag_db_cluster"
       - _result_tag_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_tag_db_cluster"
       - _result_tag_db_cluster.port == {{ port }}
       - "'status' in _result_tag_db_cluster"
       - _result_tag_db_cluster.status == 'available'
-      - _result_tag_db_cluster.storage_encrypted == true
+      - _result_tag_db_cluster.storage_encrypted == false
       - "'tags' in _result_tag_db_cluster"
       - _result_tag_db_cluster.tags | length == 2
       - _result_tag_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]}}"
@@ -269,15 +269,15 @@
       - "'engine' in _result_tag_db_cluster"
       - _result_tag_db_cluster.engine == "{{ engine }}"
       - "'engine_mode' in _result_tag_db_cluster"
-      - _result_tag_db_cluster.engine_mode == "serverless"
+      - _result_tag_db_cluster.engine_mode == "provisioned"
       - "'engine_version' in _result_tag_db_cluster"
       - "'master_username' in _result_tag_db_cluster"
       - _result_tag_db_cluster.master_username == "{{ username }}"
       - "'port' in _result_tag_db_cluster"
       - _result_tag_db_cluster.port == {{ port }}
       - "'status' in _result_tag_db_cluster"
       - _result_tag_db_cluster.status == 'available'
-      - _result_tag_db_cluster.storage_encrypted == true
+      - _result_tag_db_cluster.storage_encrypted == false
       - "'tags' in _result_tag_db_cluster"
       - _result_tag_db_cluster.tags | length == 0
       - "'vpc_security_groups' in _result_tag_db_cluster"