Fix AttributeError when running ec2_metadata_facts (#1138) (#1141)

[PR #1138/c269898a backport][stable-5] Fix AttributeError when running ec2_metadata_facts This is a backport of PR #1138 as merged into main (c269898). SUMMARY Prior to 5.0.0 we caught "Exception" within fetch, this was limited to json.JSONDecodeError, however it looks like we also needed to catch AttributeError for non-dict JSON ISSUE TYPE Bugfix Pull Request COMPONENT NAME ec2_metadata_facts ADDITIONAL INFORMATION fixes: #1134 Reviewed-by: Mark Chappell <None>
ansible-collections · Oct 10, 2022 · 6a3acb1 · 6a3acb1
1 parent 5b39507
commit 6a3acb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelogs/fragments/1134-ec2_metadata_facts-AttributeError.yml b/changelogs/fragments/1134-ec2_metadata_facts-AttributeError.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- ec2_metadata_facts - fixed ``AttributeError`` (https://github.com/ansible-collections/amazon.aws/issues/1134).
diff --git a/plugins/modules/ec2_metadata_facts.py b/plugins/modules/ec2_metadata_facts.py
@@ -528,7 +528,7 @@ def fetch(self, uri, recurse=True):
                         self._data['%s' % (new_uri)] = content
                         for (key, value) in json_dict.items():
                             self._data['%s:%s' % (new_uri, key.lower())] = value
-                    except json.JSONDecodeError:
+                    except (json.JSONDecodeError, AttributeError):
                         self._data['%s' % (new_uri)] = content  # not a stringified JSON string
 
     def fix_invalid_varnames(self, data):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- ec2_metadata_facts - fixed ``AttributeError`` (https://github.com/ansible-collections/amazon.aws/issues/1134).