ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix cloudflare_dns proxied change detection (#43096)

Browse source 
Resolves #35190
This commit is contained in:
Andreas Olsson 2018-07-27 05:57:05 +02:00 committed by Abhijeet Kasurde
parent 604fcb55ae
commit ab41fb9cd4
3 changed files with 302 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/net_tools/cloudflare_dns.py
View file

@ -557,6 +557,8 @@ class CloudflareAPI(object):
do_update = True do_update = True
if (params['priority'] is not None) and ('priority' in cur_record) and (cur_record['priority'] != params['priority']): if (params['priority'] is not None) and ('priority' in cur_record) and (cur_record['priority'] != params['priority']):
do_update = True do_update = True
if ('proxied' in new_record) and ('proxied' in cur_record) and (cur_record['proxied'] != params['proxied']):
do_update = True
if ('data' in new_record) and ('data' in cur_record): if ('data' in new_record) and ('data' in cur_record):
if (cur_record['data'] != new_record['data']): if (cur_record['data'] != new_record['data']):
do_update = True do_update = True

150
test/legacy/roles/test_cloudflare_dns/tasks/a_record.yml
View file

@ -178,3 +178,153 @@
that: that:
- cloudflare_dns is successful - cloudflare_dns is successful
- cloudflare_dns is not changed - cloudflare_dns is not changed
- name: "Test: proxiable A record creation"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
value: 192.0.2.47
ttl: 150
register: cloudflare_dns
- name: "Validate: proxiable A record creation"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- cloudflare_dns.result.record.content == '192.0.2.47'
- cloudflare_dns.result.record.proxiable == true
- cloudflare_dns.result.record.ttl == 150
- cloudflare_dns.result.record.type == 'A'
- cloudflare_dns.result.record.name == "{{ cloudflare_dns_record }}.{{ cloudflare_zone }}"
- cloudflare_dns.result.record.zone_name == "{{ cloudflare_zone }}"
- name: "Test: proxiable A record creation succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
value: 192.0.2.47
ttl: 150
register: cloudflare_dns
- name: "Validate: proxiable A record creation succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed
- name: "Test: Enable A record proxied status"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
value: 192.0.2.47
proxied: yes
register: cloudflare_dns
- name: "Validate: Enable A record proxied status"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- cloudflare_dns.result.record.content == '192.0.2.47'
- cloudflare_dns.result.record.proxied == true
- cloudflare_dns.result.record.type == 'A'
- cloudflare_dns.result.record.name == "{{ cloudflare_dns_record }}.{{ cloudflare_zone }}"
- cloudflare_dns.result.record.zone_name == "{{ cloudflare_zone }}"
- name: "Test: Enable A record proxied status succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
value: 192.0.2.47
proxied: yes
register: cloudflare_dns
- name: "Validate: Enable A record proxied status succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed
- name: "Test: Disable A record proxied status"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
value: 192.0.2.47
proxied: no
register: cloudflare_dns
- name: "Validate: Enable A record proxied status"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- cloudflare_dns.result.record.content == '192.0.2.47'
- cloudflare_dns.result.record.proxied == false
- cloudflare_dns.result.record.type == 'A'
- cloudflare_dns.result.record.name == "{{ cloudflare_dns_record }}.{{ cloudflare_zone }}"
- cloudflare_dns.result.record.zone_name == "{{ cloudflare_zone }}"
- name: "Test: Disable A record proxied status succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
value: 192.0.2.47
proxied: no
register: cloudflare_dns
- name: "Validate: Enable A record proxied status succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed
- name: "Test: Full A record deletion"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
state: absent
register: cloudflare_dns
- name: "Validate: Full A record deletion"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- name: "Test: Full A record deletion succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: A
state: absent
register: cloudflare_dns
- name: "Validate: Full A record deletion succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed

150
test/legacy/roles/test_cloudflare_dns/tasks/aaaa_record.yml
View file

@ -178,3 +178,153 @@
that: that:
- cloudflare_dns is successful - cloudflare_dns is successful
- cloudflare_dns is not changed - cloudflare_dns is not changed
- name: "Test: proxiable AAAA record creation"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
value: 2001:db8::47
ttl: 150
register: cloudflare_dns
- name: "Validate: proxiable AAAA record creation"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- cloudflare_dns.result.record.content == '2001:db8::47'
- cloudflare_dns.result.record.proxiable == true
- cloudflare_dns.result.record.ttl == 150
- cloudflare_dns.result.record.type == 'AAAA'
- cloudflare_dns.result.record.name == "{{ cloudflare_dns_record }}.{{ cloudflare_zone }}"
- cloudflare_dns.result.record.zone_name == "{{ cloudflare_zone }}"
- name: "Test: proxiable AAAA record creation succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
value: 2001:db8::47
ttl: 150
register: cloudflare_dns
- name: "Validate: proxiable AAAA record creation succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed
- name: "Test: Enable AAAA record proxied status"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
value: 2001:db8::47
proxied: yes
register: cloudflare_dns
- name: "Validate: Enable AAAA record proxied status"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- cloudflare_dns.result.record.content == '2001:db8::47'
- cloudflare_dns.result.record.proxied == true
- cloudflare_dns.result.record.type == 'AAAA'
- cloudflare_dns.result.record.name == "{{ cloudflare_dns_record }}.{{ cloudflare_zone }}"
- cloudflare_dns.result.record.zone_name == "{{ cloudflare_zone }}"
- name: "Test: Enable AAAA record proxied status succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
value: 2001:db8::47
proxied: yes
register: cloudflare_dns
- name: "Validate: Enable AAAA record proxied status succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed
- name: "Test: Disable AAAA record proxied status"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
value: 2001:db8::47
proxied: no
register: cloudflare_dns
- name: "Validate: Enable AAAA record proxied status"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- cloudflare_dns.result.record.content == '2001:db8::47'
- cloudflare_dns.result.record.proxied == false
- cloudflare_dns.result.record.type == 'AAAA'
- cloudflare_dns.result.record.name == "{{ cloudflare_dns_record }}.{{ cloudflare_zone }}"
- cloudflare_dns.result.record.zone_name == "{{ cloudflare_zone }}"
- name: "Test: Disable AAAA record proxied status succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
value: 2001:db8::47
proxied: no
register: cloudflare_dns
- name: "Validate: Enable AAAA record proxied status succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed
- name: "Test: Full AAAA record deletion"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
state: absent
register: cloudflare_dns
- name: "Validate: Full AAAA record deletion"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is changed
- name: "Test: Full AAAA record deletion succeeded"
cloudflare_dns:
account_email: "{{ cloudflare_email }}"
account_api_token: "{{ cloudflare_api_token }}"
zone: "{{ cloudflare_zone }}"
record: "{{ cloudflare_dns_record }}"
type: AAAA
state: absent
register: cloudflare_dns
- name: "Validate: Full AAAA record deletion succeeded"
assert:
that:
- cloudflare_dns is successful
- cloudflare_dns is not changed