From 933166b984c49c0c72e8cf31b598146c4b80edcf Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 07:24:08 +0100 Subject: [PATCH] [PR #9818/3b6efd5c backport][stable-9] cloudflare_dns: handle exhausted response stream in case of http error (#9822) cloudflare_dns: handle exhausted response stream in case of http error (#9818) * cloudflare_dns: handle exhausted response stream in case of http error * Update changelogs/fragments/9818-cloudflare-dns-exhausted-response.yml Co-authored-by: Felix Fontein --------- Co-authored-by: Felix Fontein (cherry picked from commit 3b6efd5cbc8ca7d0e42a4e36305edca7eac02ebd) Co-authored-by: Kristian Heljas <11139388+kristianheljas@users.noreply.github.com> --- .../fragments/9818-cloudflare-dns-exhausted-response.yml | 2 ++ plugins/modules/cloudflare_dns.py | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 changelogs/fragments/9818-cloudflare-dns-exhausted-response.yml diff --git a/changelogs/fragments/9818-cloudflare-dns-exhausted-response.yml b/changelogs/fragments/9818-cloudflare-dns-exhausted-response.yml new file mode 100644 index 0000000000..a60f3145b4 --- /dev/null +++ b/changelogs/fragments/9818-cloudflare-dns-exhausted-response.yml @@ -0,0 +1,2 @@ +bugfixes: + - cloudlare_dns - handle exhausted response stream in case of HTTP errors to show nice error message to the user (https://github.com/ansible-collections/community.general/issues/9782, https://github.com/ansible-collections/community.general/pull/9818). diff --git a/plugins/modules/cloudflare_dns.py b/plugins/modules/cloudflare_dns.py index c70f5557c2..3c0fe5f942 100644 --- a/plugins/modules/cloudflare_dns.py +++ b/plugins/modules/cloudflare_dns.py @@ -511,6 +511,9 @@ class CloudflareAPI(object): try: content = resp.read() except AttributeError: + content = None + + if not content: if info['body']: content = info['body'] else: