Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cloudflare_dns: fix crash when deleting a DNS record or when updating a record with solo=true #9649

Merged
merged 4 commits into from
Jan 31, 2025
Merged

cloudflare_dns: fix crash when deleting a DNS record or when updating a record with solo=true #9649

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c13f50
cloudflare_dns: fix crash when deleting a DNS record or when updating…
valievkarim Jan 30, 2025
f2aabe5
Add changelog fragment
valievkarim Jan 30, 2025
e7b5985
Update changelogs/fragments/9649-cloudflare_dns-fix-crash-when-deleti…
valievkarim Jan 30, 2025
63f3697
Update changelogs/fragments/9649-cloudflare_dns-fix-crash-when-deleti…
valievkarim Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/9649-cloudflare_dns-fix-crash-when-deleting-record.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- cloudflare_dns - fix crash when deleting a DNS record or when updating a record with `solo=true` (https://github.com/ansible-collections/community.general/pull/9649).
valievkarim marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 3 additions & 2 deletions plugins/modules/cloudflare_dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,18 +685,19 @@ def delete_dns_records(self, **kwargs):
else:
search_value = content

zone_id = self._get_zone_id(params['zone'])
records = self.get_dns_records(params['zone'], params['type'], search_record, search_value)

for rr in records:
if params['solo']:
if not ((rr['type'] == params['type']) and (rr['name'] == search_record) and (rr['content'] == content)):
self.changed = True
if not self.module.check_mode:
result, info = self._cf_api_call('/zones/{0}/dns_records/{1}'.format(rr['zone_id'], rr['id']), 'DELETE')
result, info = self._cf_api_call('/zones/{0}/dns_records/{1}'.format(zone_id, rr['id']), 'DELETE')
else:
self.changed = True
if not self.module.check_mode:
result, info = self._cf_api_call('/zones/{0}/dns_records/{1}'.format(rr['zone_id'], rr['id']), 'DELETE')
result, info = self._cf_api_call('/zones/{0}/dns_records/{1}'.format(zone_id, rr['id']), 'DELETE')
return self.changed

def ensure_dns_record(self, **kwargs):
Expand Down