Skip to content

Commit 6a7f04a

Browse files
micafermicafer
authored
Merge pull request #2068 from cha0tic87/bugfix/cloudflare-dns-driver
Removal of zone_name from Cloudflare record response following API deprecation
2 parents 2b978cd + c30edf1 commit 6a7f04a

8 files changed

Lines changed: 8 additions & 40 deletions

File tree

‎libcloud/dns/drivers/cloudflare.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,6 @@ def _to_zone(self, item):
516516

517517
def _to_record(self, zone, item):
518518
name = item["name"]
519-
name = name.replace("." + item["zone_name"], "")
520-
name = name.replace(item["zone_name"], "")
521519
name = name or None
522520

523521
ttl = item.get("ttl")

‎libcloud/test/dns/fixtures/cloudflare/record_GET.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
"proxied": true,
99
"ttl": 1,
1010
"locked": false,
11-
"zone_id": "1234",
12-
"zone_name": "example.com",
1311
"modified_on": "2018-12-22T21:28:00.801892Z",
1412
"created_on": "2018-12-22T21:28:00.801892Z",
1513
"meta": {

‎libcloud/test/dns/fixtures/cloudflare/record_PUT.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
"proxied": true,
99
"ttl": 1,
1010
"locked": false,
11-
"zone_id": "1234",
12-
"zone_name": "example.com",
1311
"modified_on": "2018-12-22T21:28:00.801892Z",
1412
"created_on": "2018-12-22T21:28:00.801892Z",
1513
"meta": {

‎libcloud/test/dns/fixtures/cloudflare/records_GET_1.json‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
"proxied": true,
1010
"ttl": 1,
1111
"locked": false,
12-
"zone_id": "1234",
13-
"zone_name": "example.com",
1412
"modified_on": "2018-12-22T21:28:00.801892Z",
1513
"created_on": "2018-12-22T21:28:00.801892Z",
1614
"meta": {
@@ -28,8 +26,6 @@
2826
"proxied": true,
2927
"ttl": 1,
3028
"locked": false,
31-
"zone_id": "1234",
32-
"zone_name": "example.com",
3329
"modified_on": "2018-12-22T21:28:03.346998Z",
3430
"created_on": "2018-12-22T21:28:03.346998Z",
3531
"meta": {
@@ -47,8 +43,6 @@
4743
"proxied": false,
4844
"ttl": 1,
4945
"locked": false,
50-
"zone_id": "1234",
51-
"zone_name": "example.com",
5246
"modified_on": "2018-12-22T20:29:48.453923Z",
5347
"created_on": "2018-12-22T20:29:48.453923Z",
5448
"meta": {
@@ -66,8 +60,6 @@
6660
"proxied": false,
6761
"ttl": 1,
6862
"locked": false,
69-
"zone_id": "1234",
70-
"zone_name": "example.com",
7163
"modified_on": "2019-05-30T01:43:01.509188Z",
7264
"created_on": "2019-05-30T01:43:01.509188Z",
7365
"meta": {
@@ -85,8 +77,6 @@
8577
"proxied": true,
8678
"ttl": 1,
8779
"locked": false,
88-
"zone_id": "1234",
89-
"zone_name": "example.com",
9080
"modified_on": "2018-12-22T21:29:46.874918Z",
9181
"created_on": "2018-12-22T21:29:46.874918Z",
9282
"meta": {
@@ -111,9 +101,7 @@
111101
"proxiable": false,
112102
"proxied": false,
113103
"ttl": 1,
114-
"type": "MX",
115-
"zone_id": "1234",
116-
"zone_name": "foo.bar"
104+
"type": "MX"
117105
}
118106
],
119107
"result_info": {

‎libcloud/test/dns/fixtures/cloudflare/records_GET_2.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
"ttl": 1,
1111
"priority": 1,
1212
"locked": false,
13-
"zone_id": "1234",
14-
"zone_name": "example.com",
1513
"modified_on": "2018-12-22T20:29:48.532399Z",
1614
"created_on": "2018-12-22T20:29:48.532399Z",
1715
"meta": {
@@ -30,8 +28,6 @@
3028
"ttl": 1,
3129
"priority": 2,
3230
"locked": false,
33-
"zone_id": "1234",
34-
"zone_name": "example.com",
3531
"modified_on": "2018-12-22T20:29:48.540671Z",
3632
"created_on": "2018-12-22T20:29:48.540671Z",
3733
"meta": {
@@ -49,8 +45,6 @@
4945
"proxied": false,
5046
"ttl": 1,
5147
"locked": false,
52-
"zone_id": "1234",
53-
"zone_name": "example.com",
5448
"modified_on": "2018-12-22T20:29:48.512931Z",
5549
"created_on": "2018-12-22T20:29:48.512931Z",
5650
"meta": {
@@ -68,8 +62,6 @@
6862
"proxied": false,
6963
"ttl": 1,
7064
"locked": false,
71-
"zone_id": "1234",
72-
"zone_name": "example.com",
7365
"modified_on": "2018-12-22T20:29:48.523230Z",
7466
"created_on": "2018-12-22T20:29:48.523230Z",
7567
"meta": {
@@ -80,8 +72,6 @@
8072
},
8173
{
8274
"id": "r8",
83-
"zone_id": "1234",
84-
"zone_name": "foo.bar",
8575
"name": "test1",
8676
"type": "CAA",
8777
"content": "0\tissue\ttest.example.com",

‎libcloud/test/dns/fixtures/cloudflare/records_POST.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
"proxied": true,
99
"ttl": 1,
1010
"locked": false,
11-
"zone_id": "1234",
12-
"zone_name": "example.com",
1311
"modified_on": "2018-12-22T21:28:00.801892Z",
1412
"created_on": "2018-12-22T21:28:00.801892Z",
1513
"meta": {

‎libcloud/test/dns/fixtures/cloudflare/records_POST_sshfp.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
"proxied": true,
99
"ttl": 1,
1010
"locked": false,
11-
"zone_id": "1234",
12-
"zone_name": "example.com",
1311
"modified_on": "2018-12-22T21:28:00.801892Z",
1412
"created_on": "2018-12-22T21:28:00.801892Z",
1513
"meta": {

‎libcloud/test/dns/test_cloudflare.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_get_record(self):
7070
record = self.driver.get_record("1234", "364797364")
7171

7272
self.assertEqual(record.id, "364797364")
73-
self.assertIsNone(record.name)
73+
self.assertEqual(record.name, "example.com")
7474
self.assertEqual(record.type, "A")
7575
self.assertEqual(record.data, "192.30.252.153")
7676

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

9090
record = records[0]
9191
self.assertEqual(record.id, "364797364")
92-
self.assertIsNone(record.name)
92+
self.assertEqual(record.name, "example.com")
9393
self.assertEqual(record.type, "A")
9494
self.assertEqual(record.data, "192.30.252.153")
9595
self.assertEqual(record.extra["priority"], None)
@@ -108,7 +108,7 @@ def test_list_records(self):
108108

109109
record = [r for r in records if r.type == "MX"][0]
110110
self.assertEqual(record.id, "78526")
111-
self.assertIsNone(record.name)
111+
self.assertEqual(record.name, "foo.bar")
112112
self.assertEqual(record.type, "MX")
113113
self.assertEqual(record.data, "aspmx3.googlemail.com")
114114
self.assertEqual(record.extra["priority"], 30)
@@ -143,7 +143,7 @@ def test_create_record(self):
143143
extra={"proxied": True},
144144
)
145145
self.assertEqual(record.id, "412561327")
146-
self.assertEqual(record.name, "test5")
146+
self.assertEqual(record.name, "test5.example.com")
147147
self.assertEqual(record.type, "A")
148148
self.assertEqual(record.data, "127.0.0.3")
149149

@@ -155,7 +155,7 @@ def test_create_record_SSHFP_record_type(self):
155155
name="test_sshfp", zone=zone, type=RecordType.SSHFP, data="2 1 ABCDEF12345"
156156
)
157157
self.assertEqual(record.id, "200")
158-
self.assertEqual(record.name, "test_sshfp")
158+
self.assertEqual(record.name, "test_sshfp.example.com")
159159
self.assertEqual(record.type, "SSHFP")
160160
self.assertEqual(record.data, "2 1 ABCDEF12345")
161161

@@ -167,7 +167,7 @@ def test_create_record_CAA_record_type(self):
167167
name="test5", zone=zone, type=RecordType.CAA, data="0 issue caa.example.com"
168168
)
169169
self.assertEqual(record.id, "412561327")
170-
self.assertEqual(record.name, "test5")
170+
self.assertEqual(record.name, "test5.example.com")
171171
self.assertEqual(record.type, "A")
172172
self.assertEqual(record.data, "127.0.0.3")
173173

@@ -214,7 +214,7 @@ def test_update_record(self):
214214
extra={"proxied": True},
215215
)
216216

217-
self.assertEqual(updated_record.name, "test6")
217+
self.assertEqual(updated_record.name, "test6.example.com")
218218
self.assertEqual(updated_record.type, "A")
219219
self.assertEqual(updated_record.data, "127.0.0.4")
220220
self.assertEqual(updated_record.extra["proxied"], True)

0 commit comments

Comments
 (0)