ec2_ami: Properly delete snapshots (#39606)

lib/ansible/modules/cloud/amazon/ec2_ami.py

@@ -496,7 +496,7 @@ def deregister_image(module, connection):
     snapshots = []
     if 'BlockDeviceMappings' in image:
         for mapping in image.get('BlockDeviceMappings'):
-            snapshot_id = mapping.get('SnapshotId')
+            snapshot_id = mapping.get('Ebs', {}).get('SnapshotId')
             if snapshot_id is not None:
                 snapshots.append(snapshot_id)
 

test/integration/targets/ec2_ami/tasks/main.yml

@@ -158,6 +158,7 @@
         that:
           - "result.changed"
           - "'image_id' not in result"
+          - "result.snapshots_deleted"
 
     # ============================================================