Handle ec2_vol.tags when the associated instance already exists (ansi…

…ble-collections#1071)

Handle ec2_vol.tags when the associated instance already exists

Signed-off-by: GomathiselviS gomathiselvi@gmail.com
SUMMARY


Fixes ansible-collections#1067
ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

ec2_vol.py
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell <None>
Reviewed-by: Alina Buzachis <None>
Reviewed-by: GomathiselviS <None>
Reviewed-by: Mike Graves <mgraves@redhat.com>
Reviewed-by: Gonéri Le Bouder <goneri@lebouder.net>

changelogs/fragments/1071-ec2_vol_tags_idempotent.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+- ec2_vol - handle ec2_vol.tags when the associated instance already exists (https://github.com/ansible-collections/amazon.aws/pull/1071).

plugins/modules/ec2_vol.py

@@ -804,7 +804,6 @@ def main():
             mapped_device = get_mapped_block_device(instance_dict=inst, device_name=device_name)
             if mapped_device:
                 other_volume_mapped = False
-
                 if volume:
                     if volume['volume_id'] != mapped_device['ebs']['volume_id']:
                         other_volume_mapped = True
@@ -823,10 +822,11 @@ def main():
 
         final_tags = None
         tags_changed = False
-
         if volume:
             volume, changed = update_volume(module, ec2_conn, volume)
             if name:
+                if not tags:
+                    tags = boto3_tag_list_to_ansible_dict(volume.get('tags'))
                 tags['Name'] = name
             final_tags, tags_changed = ensure_tags(module, ec2_conn, volume['volume_id'], 'volume', tags, module.params.get('purge_tags'))
         else:

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

@@ -61,6 +61,21 @@
         that:
           - test_instance_2.changed
 
+    - name: create another ec2 instance
+      ec2_instance:
+        name: "{{ instance_name }}-3"
+        vpc_subnet_id: "{{ testing_subnet.subnet.id }}"
+        instance_type: t3.nano
+        image_id: "{{ ec2_ami_id }}"
+        tags:
+          ResourcePrefix: "{{ resource_prefix }}"
+      register: test_instance_3
+
+    - name: check task return attributes
+      assert:
+        that:
+          - test_instance_3.changed
+
     # # ==== ec2_vol tests ===============================================
 
     - name: create a volume (validate module defaults - check_mode)
@@ -901,6 +916,28 @@
           - 'test_instance.instance_ids[0] in vol_attach_result.volume.attachment_set | map(attribute="instance_id") | list'
           - 'test_instance_2.instance_ids[0] in vol_attach_result.volume.attachment_set | map(attribute="instance_id") | list'
 
+    - name: create a volume without tags
+      ec2_vol:
+        volume_size: 5
+        zone: "{{ availability_zone }}"
+        instance: "{{ test_instance_3.instance_ids[0] }}"
+      register: volume_without_tag
+
+    - assert:
+        that:
+          - volume_without_tag.changed
+
+    # idempotency check without tags
+    - name: create a volume without tags (idempotency check)
+      ec2_vol:
+        volume_size: 5
+        zone: "{{ availability_zone }}"
+        instance: "{{ test_instance_3.instance_ids[0] }}"
+      register: volume_without_tag
+
+    - assert:
+        that:
+          - not volume_without_tag.changed
     # ==== Cleanup ============================================================
 
   always:
@@ -912,6 +949,7 @@
       with_items:
         - "{{ test_instance.instance_ids[0] }}"
         - "{{ test_instance_2.instance_ids[0] }}"
+        - "{{ test_instance_3.instance_ids[0] }}"
       register: pre_delete
 
     - debug:
@@ -926,6 +964,7 @@
       with_items:
         - "{{ test_instance.instance_ids[0] }}"
         - "{{ test_instance_2.instance_ids[0] }}"
+        - "{{ test_instance_3.instance_ids[0] }}"
       ignore_errors: yes
 
     - name: delete volumes
@@ -942,6 +981,7 @@
         - "{{ dot_volume }}"
         - "{{ gp3_volume }}"
         - "{{ multi_attach_disk }}"
+        - "{{ volume_without_tag }}"
 
     - name: delete snapshot
       ec2_snapshot: