ec2_vpc_nacl_info - Fix failure when listing NetworkACLs (#2425) (#2429)

SUMMARY Only fail listing NetworkACLs if specific ACLs were requested and not found. Fixes: #2425 ISSUE TYPE Bugfix Pull Request COMPONENT NAME ec2_vpc_nacl_info ADDITIONAL INFORMATION Reviewed-by: Mark Chappell
ansible-collections · Jan 14, 2025 · 7b5212d · 7b5212d
1 parent 473575f
commit 7b5212d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/changelogs/fragments/20241219-ec2_vpc_nacl_info-fix-issue-returning-results.yml b/changelogs/fragments/20241219-ec2_vpc_nacl_info-fix-issue-returning-results.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ec2_vpc_nacl_info - Fix failure when listing NetworkACLs and no ACLs are found (https://github.com/ansible-collections/amazon.aws/issues/2425).
diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py
@@ -166,8 +166,11 @@ def list_ec2_vpc_nacls(connection, module: AnsibleAWSModule) -> None:
 
     try:
         network_acls = describe_network_acls(connection, **params)
-        if not network_acls:
-            module.fail_json(msg="Unable to describe ACL. NetworkAcl does not exist")
+        if nacl_ids and not len(nacl_ids) == len(network_acls):
+            if len(nacl_ids) == 1:
+                module.fail_json(msg="Unable to describe ACL. NetworkAcl does not exist.")
+            else:
+                module.fail_json(msg="Unable to describe all ACLs. One or more NetworkAcls does not exist.")
     except AnsibleEC2Error as e:
         module.fail_json_aws_error(e)
 

diff --git a/tests/integration/targets/ec2_vpc_nacl/tasks/main.yml b/tests/integration/targets/ec2_vpc_nacl/tasks/main.yml
@@ -41,7 +41,33 @@
         that:
           - nacl_facts is failed
           - '"does not exist" in nacl_facts.msg'
+          - '"One or more" not in nacl_facts.msg'
 
+    - name: Get network multiple ACLs info with invalid ID
+      amazon.aws.ec2_vpc_nacl_info:
+        nacl_ids:
+        - 'acl-000000000000'
+        - 'acl-000000000001'
+      register: nacl_facts
+      ignore_errors: true
+
+    - name: Assert message mentions missing ACLs
+      assert:
+        that:
+          - nacl_facts is failed
+          - '"does not exist" in nacl_facts.msg'
+          - '"One or more" in nacl_facts.msg'
+
+    - name: Get network ACL info with filters
+      amazon.aws.ec2_vpc_nacl_info:
+        filters:
+          default: false
+      register: nacl_facts
+
+    - name: Assert error is not returned
+      ansible.builtin.assert:
+        that:
+          - nacl_facts is succeeded
     # ============================================================
 
     - name: Fetch AZ availability