Skip to content

Commit 6e2579e

Browse files
committed
Route53: resolve record set metadata before multi value update/delete
Records which did not come from list_records()/get_record() carry no _multi_value or _other_records metadata, so update_record() and delete_record() would build a changeset with a single value and Route53 would reject it. Look the record set up when the metadata is missing.
1 parent 6676a7d commit 6e2579e

2 files changed

Lines changed: 84 additions & 1 deletion

File tree

‎libcloud/dns/drivers/route53.py‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,39 @@ def create_record(self, name, zone, type, data, extra=None):
199199
extra=extra,
200200
)
201201

202+
def _with_record_set_metadata(self, record):
203+
# ``_multi_value`` / ``_other_records`` are attached by ``_to_records``,
204+
# so records which did not come from ``list_records`` / ``get_record``
205+
# (e.g. the ones returned by ``create_record`` or
206+
# ``ex_create_multi_value_record``, or user constructed ones) carry no
207+
# information about the rest of their record set. Re-fetch the record
208+
# set in that case so multi value updates and deletes work regardless
209+
# of how the record was obtained.
210+
211+
if "_multi_value" in record.extra:
212+
return record
213+
214+
try:
215+
fetched = self.list_records(zone=record.zone)
216+
except Exception:
217+
return record
218+
219+
for candidate in fetched:
220+
if (
221+
candidate.name == record.name
222+
and candidate.type == record.type
223+
and candidate.data == record.data
224+
):
225+
extra = copy.deepcopy(candidate.extra)
226+
extra.update({k: v for k, v in record.extra.items() if not k.startswith("_")})
227+
record.extra = extra
228+
229+
break
230+
231+
return record
232+
202233
def update_record(self, record, name=None, type=None, data=None, extra=None):
234+
record = self._with_record_set_metadata(record)
203235
name = name or record.name
204236
type = type or record.type
205237
extra = extra or record.extra
@@ -236,7 +268,7 @@ def update_record(self, record, name=None, type=None, data=None, extra=None):
236268

237269
def delete_record(self, record):
238270
try:
239-
r = record
271+
r = self._with_record_set_metadata(record)
240272

241273
# Multiple value records need to be handled specially - Route53
242274
# only accepts a DELETE for a record set which lists every value

‎libcloud/test/dns/test_route53.py‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import unittest
1919

2020
from libcloud.test import MockHttp
21+
from libcloud.dns.base import Record
2122
from libcloud.dns.types import RecordType, ZoneDoesNotExistError, RecordDoesNotExistError
2223
from libcloud.utils.py3 import httplib
2324
from libcloud.test.secrets import DNS_PARAMS_ROUTE53
@@ -322,6 +323,56 @@ def record_request(uri, *args, **kwargs):
322323
],
323324
)
324325

326+
def test_delete_multi_value_record_without_record_set_metadata(self):
327+
# Records which did not come from list_records()/get_record() (e.g. the
328+
# ones returned by create_record()) carry no _multi_value metadata, so
329+
# the record set has to be re-fetched for the DELETE to be valid.
330+
zone = self.driver.list_zones()[0]
331+
listed = [r for r in self.driver.list_records(zone=zone) if r.type == RecordType.MX][0]
332+
333+
record = Record(
334+
id=listed.id,
335+
name=listed.name,
336+
type=listed.type,
337+
data=listed.data,
338+
zone=zone,
339+
driver=self.driver,
340+
ttl=listed.extra.get("ttl"),
341+
extra={"ttl": listed.extra.get("ttl"), "priority": listed.extra.get("priority")},
342+
)
343+
344+
sent = {}
345+
original_request = self.driver.connection.request
346+
347+
def record_request(uri, *args, **kwargs):
348+
if kwargs.get("method") == "POST":
349+
sent["data"] = kwargs.get("data")
350+
351+
return original_request(uri, *args, **kwargs)
352+
353+
self.driver.connection.request = record_request
354+
status = self.driver.delete_record(record=record)
355+
self.assertTrue(status)
356+
357+
data = sent["data"]
358+
359+
if not isinstance(data, str):
360+
data = data.decode("utf-8")
361+
362+
values = re.findall(r"<Value>(.*?)</Value>", data)
363+
self.assertEqual(
364+
sorted(values),
365+
sorted(
366+
[
367+
"1 ASPMX.L.GOOGLE.COM.",
368+
"5 ALT1.ASPMX.L.GOOGLE.COM.",
369+
"5 ALT2.ASPMX.L.GOOGLE.COM.",
370+
"10 ASPMX2.GOOGLEMAIL.COM.",
371+
"10 ASPMX3.GOOGLEMAIL.COM.",
372+
]
373+
),
374+
)
375+
325376
def test_delete_record_does_not_exist(self):
326377
zone = self.driver.list_zones()[0]
327378
record = self.driver.list_records(zone=zone)[0]

0 commit comments

Comments
 (0)