Fix #38038 cloudfront_facts module returns only first page of response (#38045)

6 years ago · 12057de1c6
parent 45f5964fed
commit 12057de1c6
1 changed files with 6 additions and 2 deletions
--- a/lib/ansible/modules/cloud/amazon/cloudfront_facts.py
+++ b/lib/ansible/modules/cloud/amazon/cloudfront_facts.py
@ -509,8 +509,12 @@ class CloudFrontServiceManager:
            else:
                result = response.get(result_key)
            results.update(result)
-            args['NextToken'] = response.get('NextToken')
-            loop = args['NextToken'] is not None
+            args['Marker'] = response.get('NextMarker')
+            for key in response.keys():
+                if key.endswith('List'):
+                    args['Marker'] = response[key].get('NextMarker')
+                    break
+            loop = args['Marker'] is not None
        return results

    def keyed_list_helper(self, list_to_key):