Skip to content

Removal of zone_name from Cloudflare record response following API deprecation #2068

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

Merged
micafer merged 4 commits into from
Feb 11, 2026
+8 −40
Merged

Removal of zone_name from Cloudflare record response following API deprecation #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc40b93
Remove zone_name from Cloudflare record response
chrissmith51 Apr 16, 2025
cbef947
Merge branch 'trunk' into bugfix/cloudflare-dns-driver
micafer Feb 11, 2026
ed63d99
Update tests
micafer Feb 11, 2026
c30edf1
Merge branch 'trunk' into bugfix/cloudflare-dns-driver
micafer Feb 11, 2026
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: 0 additions & 2 deletions libcloud/dns/drivers/cloudflare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,6 @@ def _to_zone(self, item):

def _to_record(self, zone, item):
name = item["name"]
name = name.replace("." + item["zone_name"], "")
name = name.replace(item["zone_name"], "")
name = name or None

ttl = item.get("ttl")
Expand Down
2 changes: 0 additions & 2 deletions libcloud/test/dns/fixtures/cloudflare/record_GET.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"proxied": true,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T21:28:00.801892Z",
"created_on": "2018-12-22T21:28:00.801892Z",
"meta": {
Expand Down
2 changes: 0 additions & 2 deletions libcloud/test/dns/fixtures/cloudflare/record_PUT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"proxied": true,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T21:28:00.801892Z",
"created_on": "2018-12-22T21:28:00.801892Z",
"meta": {
Expand Down
14 changes: 1 addition & 13 deletions libcloud/test/dns/fixtures/cloudflare/records_GET_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
"proxied": true,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T21:28:00.801892Z",
"created_on": "2018-12-22T21:28:00.801892Z",
"meta": {
Expand All @@ -28,8 +26,6 @@
"proxied": true,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T21:28:03.346998Z",
"created_on": "2018-12-22T21:28:03.346998Z",
"meta": {
Expand All @@ -47,8 +43,6 @@
"proxied": false,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T20:29:48.453923Z",
"created_on": "2018-12-22T20:29:48.453923Z",
"meta": {
Expand All @@ -66,8 +60,6 @@
"proxied": false,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2019-05-30T01:43:01.509188Z",
"created_on": "2019-05-30T01:43:01.509188Z",
"meta": {
Expand All @@ -85,8 +77,6 @@
"proxied": true,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T21:29:46.874918Z",
"created_on": "2018-12-22T21:29:46.874918Z",
"meta": {
Expand All @@ -111,9 +101,7 @@
"proxiable": false,
"proxied": false,
"ttl": 1,
"type": "MX",
"zone_id": "1234",
"zone_name": "foo.bar"
"type": "MX"
}
],
"result_info": {
Expand Down
10 changes: 0 additions & 10 deletions libcloud/test/dns/fixtures/cloudflare/records_GET_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
"ttl": 1,
"priority": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T20:29:48.532399Z",
"created_on": "2018-12-22T20:29:48.532399Z",
"meta": {
Expand All @@ -30,8 +28,6 @@
"ttl": 1,
"priority": 2,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T20:29:48.540671Z",
"created_on": "2018-12-22T20:29:48.540671Z",
"meta": {
Expand All @@ -49,8 +45,6 @@
"proxied": false,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T20:29:48.512931Z",
"created_on": "2018-12-22T20:29:48.512931Z",
"meta": {
Expand All @@ -68,8 +62,6 @@
"proxied": false,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T20:29:48.523230Z",
"created_on": "2018-12-22T20:29:48.523230Z",
"meta": {
Expand All @@ -80,8 +72,6 @@
},
{
"id": "r8",
"zone_id": "1234",
"zone_name": "foo.bar",
"name": "test1",
"type": "CAA",
"content": "0\tissue\ttest.example.com",
Expand Down
2 changes: 0 additions & 2 deletions libcloud/test/dns/fixtures/cloudflare/records_POST.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"proxied": true,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T21:28:00.801892Z",
"created_on": "2018-12-22T21:28:00.801892Z",
"meta": {
Expand Down
2 changes: 0 additions & 2 deletions libcloud/test/dns/fixtures/cloudflare/records_POST_sshfp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"proxied": true,
"ttl": 1,
"locked": false,
"zone_id": "1234",
"zone_name": "example.com",
"modified_on": "2018-12-22T21:28:00.801892Z",
"created_on": "2018-12-22T21:28:00.801892Z",
"meta": {
Expand Down
14 changes: 7 additions & 7 deletions libcloud/test/dns/test_cloudflare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_get_record(self):
record = self.driver.get_record("1234", "364797364")

self.assertEqual(record.id, "364797364")
self.assertIsNone(record.name)
self.assertEqual(record.name, "example.com")
self.assertEqual(record.type, "A")
self.assertEqual(record.data, "192.30.252.153")

Expand All @@ -89,7 +89,7 @@ def test_list_records(self):

record = records[0]
self.assertEqual(record.id, "364797364")
self.assertIsNone(record.name)
self.assertEqual(record.name, "example.com")
self.assertEqual(record.type, "A")
self.assertEqual(record.data, "192.30.252.153")
self.assertEqual(record.extra["priority"], None)
Expand All @@ -108,7 +108,7 @@ def test_list_records(self):

record = [r for r in records if r.type == "MX"][0]
self.assertEqual(record.id, "78526")
self.assertIsNone(record.name)
self.assertEqual(record.name, "foo.bar")
self.assertEqual(record.type, "MX")
self.assertEqual(record.data, "aspmx3.googlemail.com")
self.assertEqual(record.extra["priority"], 30)
Expand Down Expand Up @@ -143,7 +143,7 @@ def test_create_record(self):
extra={"proxied": True},
)
self.assertEqual(record.id, "412561327")
self.assertEqual(record.name, "test5")
self.assertEqual(record.name, "test5.example.com")
self.assertEqual(record.type, "A")
self.assertEqual(record.data, "127.0.0.3")

Expand All @@ -155,7 +155,7 @@ def test_create_record_SSHFP_record_type(self):
name="test_sshfp", zone=zone, type=RecordType.SSHFP, data="2 1 ABCDEF12345"
)
self.assertEqual(record.id, "200")
self.assertEqual(record.name, "test_sshfp")
self.assertEqual(record.name, "test_sshfp.example.com")
self.assertEqual(record.type, "SSHFP")
self.assertEqual(record.data, "2 1 ABCDEF12345")

Expand All @@ -167,7 +167,7 @@ def test_create_record_CAA_record_type(self):
name="test5", zone=zone, type=RecordType.CAA, data="0 issue caa.example.com"
)
self.assertEqual(record.id, "412561327")
self.assertEqual(record.name, "test5")
self.assertEqual(record.name, "test5.example.com")
self.assertEqual(record.type, "A")
self.assertEqual(record.data, "127.0.0.3")

Expand Down Expand Up @@ -214,7 +214,7 @@ def test_update_record(self):
extra={"proxied": True},
)

self.assertEqual(updated_record.name, "test6")
self.assertEqual(updated_record.name, "test6.example.com")
self.assertEqual(updated_record.type, "A")
self.assertEqual(updated_record.data, "127.0.0.4")
self.assertEqual(updated_record.extra["proxied"], True)
Expand Down