From a5d1b22534b4b16e39be5004012bd95ad895a645 Mon Sep 17 00:00:00 2001 From: Niels Laukens Date: Tue, 18 Jun 2019 11:03:28 +0200 Subject: [PATCH] Fix CloudFormation usage --- moto/route53/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/moto/route53/models.py b/moto/route53/models.py index ac19c04d9..9961f4157 100644 --- a/moto/route53/models.py +++ b/moto/route53/models.py @@ -119,7 +119,7 @@ class RecordSet(BaseModel): properties["HostedZoneId"]) try: - hosted_zone.delete_rrset_by_name(resource_name) + hosted_zone.delete_rrset({'Name': resource_name}) except KeyError: pass @@ -162,7 +162,7 @@ class RecordSet(BaseModel): self.hosted_zone_name) if not hosted_zone: hosted_zone = route53_backend.get_hosted_zone(self.hosted_zone_id) - hosted_zone.delete_rrset_by_name(self.name) + hosted_zone.delete_rrset({'Name': self.name, 'Type': self.type_}) class FakeZone(BaseModel): @@ -195,7 +195,7 @@ class FakeZone(BaseModel): record_set for record_set in self.rrsets if record_set.name != rrset['Name'] or - record_set.type_ != rrset['Type'] + (rrset.get('Type') is not None and record_set.type_ != rrset['Type']) ] def delete_rrset_by_id(self, set_identifier):