Move tests to using module_defaults (ansible-collections#368)

* Bulk migration to module_defaults
* Tests for missing creds/region
* Move dms_identifier and dms_sg_identifier into defaults

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@365b6ef

tests/integration/targets/rds_instance/tasks/credential_tests.yml

@@ -2,6 +2,10 @@
 - name: test without credentials
   rds_instance:
     db_instance_identifier: test-rds-instance
+    region: '{{ omit }}'
+    aws_access_key: '{{ omit }}'
+    aws_secret_key: '{{ omit }}'
+    security_token: '{{ omit }}'
   register: result
   ignore_errors: yes
 
@@ -14,6 +18,9 @@
   rds_instance:
     db_instance_identifier: test-rds-instance
     region: us-east-1
+    aws_access_key: '{{ omit }}'
+    aws_secret_key: '{{ omit }}'
+    security_token: '{{ omit }}'
   register: result
   ignore_errors: yes
 
@@ -27,6 +34,9 @@
     db_instance_identifier: test-rds-instance
     region: us-east-1
     profile: doesnotexist
+    aws_access_key: '{{ omit }}'
+    aws_secret_key: '{{ omit }}'
+    security_token: '{{ omit }}'
   register: result
   ignore_errors: yes
 

tests/integration/targets/rds_instance/tasks/main.yml

@@ -1,6 +1,14 @@
 ---
-- block:
-
+- name: 'rds_instance integration tests'
+  collections:
+    - amazon.aws
+  module_defaults:
+    group/aws:
+      aws_access_key: '{{ aws_access_key }}'
+      aws_secret_key: '{{ aws_secret_key }}'
+      security_token: '{{ security_token | default(omit) }}'
+      region: '{{ aws_region }}'
+  block:
     - include: ./credential_tests.yml
       tags: credentials
     - include: ./test_states.yml

tests/integration/targets/rds_instance/tasks/test_aurora.yml

@@ -1,20 +1,11 @@
 ---
   - block:
-      - name: set up aws connection info
-        set_fact:
-          aws_connection_info: &aws_connection_info
-            aws_access_key: "{{ aws_access_key }}"
-            aws_secret_key: "{{ aws_secret_key }}"
-            security_token: "{{ security_token }}"
-            region: "{{ aws_region }}"
-        no_log: yes
 
       - name: Ensure the resource doesn't exist
         rds_instance:
           id: "{{ instance_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -29,7 +20,6 @@
           cluster_id: "{{ cluster_id }}"
           username: "{{ username }}"
           password: "{{ password }}"
-          <<: *aws_connection_info
 
       - name: Create an Aurora instance
         rds_instance:
@@ -40,7 +30,6 @@
           db_instance_class: "{{ aurora_db_instance_class }}"
           tags:
             CreatedBy: rds_instance integration tests
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -55,7 +44,6 @@
           state: present
           tags:
             Test: rds_instance
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -68,7 +56,6 @@
         rds_instance:
           id: "{{ instance_id }}"
           state: present
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -82,7 +69,6 @@
           password:  "{{ password }}"
           force_update_password: True
           apply_immediately: True
-          <<: *aws_connection_info
         register: result
         ignore_errors: yes
 
@@ -97,7 +83,6 @@
           id: "{{ instance_id }}"
           state: present
           port: 1150
-          <<: *aws_connection_info
         register: result
         ignore_errors: yes
 
@@ -114,7 +99,6 @@
           purge_tags: False
           new_id: "{{ modified_instance_id }}"
           apply_immediately: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -129,7 +113,6 @@
           id: "{{ item }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         loop:
           - "{{ instance_id }}"
           - "{{ modified_instance_id }}"
@@ -140,5 +123,4 @@
           cluster_id: "{{ cluster_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         ignore_errors: yes

tests/integration/targets/rds_instance/tasks/test_bad_options.yml

@@ -1,20 +1,11 @@
 ---
   - block:
-      - name: set up aws connection info
-        set_fact:
-          aws_connection_info: &aws_connection_info
-            aws_access_key: "{{ aws_access_key }}"
-            aws_secret_key: "{{ aws_secret_key }}"
-            security_token: "{{ security_token }}"
-            region: "{{ aws_region }}"
-        no_log: yes
 
       - name: Ensure the resource doesn't exist
         rds_instance:
           id: "{{ instance_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -31,7 +22,6 @@
           password: "{{ password }}"
           db_instance_class: "{{ db_instance_class }}"
           allocated_storage: "{{ allocated_storage }}"
-          <<: *aws_connection_info
         register: result
         ignore_errors: True
 

tests/integration/targets/rds_instance/tasks/test_encryption.yml

@@ -1,20 +1,11 @@
 ---
   - block:
-      - name: set up aws connection info
-        set_fact:
-          aws_connection_info: &aws_connection_info
-            aws_access_key: "{{ aws_access_key }}"
-            aws_secret_key: "{{ aws_secret_key }}"
-            security_token: "{{ security_token }}"
-            region: "{{ aws_region }}"
-        no_log: yes
 
       - name: Ensure the resource doesn't exist
         rds_instance:
           id: "{{ instance_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -32,7 +23,6 @@
           db_instance_class: "{{ storage_encrypted_db_instance_class }}"
           allocated_storage: "{{ allocated_storage }}"
           storage_encrypted: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -49,5 +39,4 @@
           id: "{{ instance_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         register: result

tests/integration/targets/rds_instance/tasks/test_final_snapshot.yml

@@ -1,20 +1,11 @@
 ---
   - block:
-      - name: set up aws connection info
-        set_fact:
-          aws_connection_info: &aws_connection_info
-            aws_access_key: "{{ aws_access_key }}"
-            aws_secret_key: "{{ aws_secret_key }}"
-            security_token: "{{ security_token }}"
-            region: "{{ aws_region }}"
-        no_log: yes
 
       - name: Ensure the resource doesn't exist
         rds_instance:
           id: "{{ instance_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -31,15 +22,13 @@
           password: "{{ password }}"
           db_instance_class: "{{ db_instance_class }}"
           allocated_storage: "{{ allocated_storage }}"
-          <<: *aws_connection_info
         register: result
 
       - name: Delete the DB instance
         rds_instance:
           id: "{{ instance_id }}"
           state: absent
           final_snapshot_identifier: "{{ instance_id }}"
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -50,7 +39,6 @@
       - name: Check that snapshot exists
         rds_snapshot_info:
           db_snapshot_identifier: "{{ instance_id }}"
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -63,13 +51,11 @@
         rds_snapshot:
           db_snapshot_identifier: "{{ instance_id }}"
           state: absent
-          <<: *aws_connection_info
         ignore_errors: yes
 
       - name: Remove the DB instance
         rds_instance:
           id: "{{ instance_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         ignore_errors: yes         

tests/integration/targets/rds_instance/tasks/test_modification.yml

@@ -1,20 +1,11 @@
 ---
   - block:
-      - name: set up aws connection info
-        set_fact:
-          aws_connection_info: &aws_connection_info
-            aws_access_key: "{{ aws_access_key }}"
-            aws_secret_key: "{{ aws_secret_key }}"
-            security_token: "{{ security_token }}"
-            region: "{{ aws_region }}"
-        no_log: yes
 
       - name: Ensure the resource doesn't exist
         rds_instance:
           id: "{{ instance_id }}"
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -32,7 +23,6 @@
           password: "{{ password }}"
           db_instance_class: "{{ db_instance_class }}"
           allocated_storage: "{{ allocated_storage }}"
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -46,7 +36,6 @@
           state: present
           new_id: "{{ modified_instance_id }}"
           apply_immediately: False
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -60,7 +49,6 @@
           state: present
           new_id: "{{ modified_instance_id }}"
           apply_immediately: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -74,7 +62,6 @@
           state: present
           new_id: '{{ instance_id }}'
           apply_immediately: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -89,7 +76,6 @@
           password: '{{ password }}'
           force_update_password: True
           apply_immediately: True
-          <<: *aws_connection_info
         register: result
         check_mode: True
 
@@ -104,7 +90,6 @@
           password: '{{ password }}'
           force_update_password: True
           apply_immediately: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -129,7 +114,6 @@
           port: 1150
           max_allocated_storage: 100
           apply_immediately: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -155,7 +139,6 @@
           auto_minor_version_upgrade: false
           port: 1150
           max_allocated_storage: 100
-          <<: *aws_connection_info
         register: result
         retries: 30
         delay: 10
@@ -175,7 +158,6 @@
           id: '{{ instance_id }}'
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         register: result
 
       - assert:
@@ -190,6 +172,5 @@
           id: '{{ item }}'
           state: absent
           skip_final_snapshot: True
-          <<: *aws_connection_info
         loop: ['{{ instance_id }}', '{{ modified_instance_id }}']
         ignore_errors: yes