Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2245 from vrtdev/bugfix/r53-delete-type

Browse Source 
Route53 Delete: respect the given Type
This commit is contained in:
Steve Pulec 2019-07-06 17:29:19 -05:00 committed by GitHub
commit 574055da2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moto/route53/models.py
View File

@ -119,7 +119,7 @@ class RecordSet(BaseModel):
properties["HostedZoneId"]) properties["HostedZoneId"])
try: try:
hosted_zone.delete_rrset_by_name(resource_name) hosted_zone.delete_rrset({'Name': resource_name})
except KeyError: except KeyError:
pass pass
@ -162,7 +162,7 @@ class RecordSet(BaseModel):
self.hosted_zone_name) self.hosted_zone_name)
if not hosted_zone: if not hosted_zone:
hosted_zone = route53_backend.get_hosted_zone(self.hosted_zone_id) 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_})
def reverse_domain_name(domain_name): def reverse_domain_name(domain_name):
@ -196,9 +196,13 @@ class FakeZone(BaseModel):
self.rrsets.append(new_rrset) self.rrsets.append(new_rrset)
return new_rrset return new_rrset
def delete_rrset_by_name(self, name): def delete_rrset(self, rrset):
self.rrsets = [ self.rrsets = [
record_set for record_set in self.rrsets if record_set.name != name] record_set
for record_set in self.rrsets
if record_set.name != rrset['Name'] or
(rrset.get('Type') is not None and record_set.type_ != rrset['Type'])
]
def delete_rrset_by_id(self, set_identifier): def delete_rrset_by_id(self, set_identifier):
self.rrsets = [ self.rrsets = [

2
moto/route53/responses.py
View File

@ -147,7 +147,7 @@ class Route53(BaseResponse):
the_zone.delete_rrset_by_id( the_zone.delete_rrset_by_id(
record_set["SetIdentifier"]) record_set["SetIdentifier"])
else: else:
the_zone.delete_rrset_by_name(record_set["Name"]) the_zone.delete_rrset(record_set)
return 200, headers, CHANGE_RRSET_RESPONSE return 200, headers, CHANGE_RRSET_RESPONSE

20
tests/test_route53/test_route53.py
View File

@ -110,6 +110,7 @@ def test_rrset():
changes = ResourceRecordSets(conn, zoneid) changes = ResourceRecordSets(conn, zoneid)
changes.add_change("DELETE", "foo.bar.testdns.aws.com", "A") changes.add_change("DELETE", "foo.bar.testdns.aws.com", "A")
changes.add_change("DELETE", "foo.bar.testdns.aws.com", "TXT")
changes.commit() changes.commit()
changes = ResourceRecordSets(conn, zoneid) changes = ResourceRecordSets(conn, zoneid)
@ -582,7 +583,7 @@ def test_change_resource_record_sets_crud_valid():
cname_record_detail['TTL'].should.equal(60) cname_record_detail['TTL'].should.equal(60)
cname_record_detail['ResourceRecords'].should.equal([{'Value': '192.168.1.1'}]) cname_record_detail['ResourceRecords'].should.equal([{'Value': '192.168.1.1'}])
# Delete record. # Delete record with wrong type.
delete_payload = { delete_payload = {
'Comment': 'delete prod.redis.db', 'Comment': 'delete prod.redis.db',
'Changes': [ 'Changes': [
@ -597,6 +598,23 @@ def test_change_resource_record_sets_crud_valid():
} }
conn.change_resource_record_sets(HostedZoneId=hosted_zone_id, ChangeBatch=delete_payload) conn.change_resource_record_sets(HostedZoneId=hosted_zone_id, ChangeBatch=delete_payload)
response = conn.list_resource_record_sets(HostedZoneId=hosted_zone_id) response = conn.list_resource_record_sets(HostedZoneId=hosted_zone_id)
len(response['ResourceRecordSets']).should.equal(1)
# Delete record.
delete_payload = {
'Comment': 'delete prod.redis.db',
'Changes': [
{
'Action': 'DELETE',
'ResourceRecordSet': {
'Name': 'prod.redis.db',
'Type': 'A',
}
}
]
}
conn.change_resource_record_sets(HostedZoneId=hosted_zone_id, ChangeBatch=delete_payload)
response = conn.list_resource_record_sets(HostedZoneId=hosted_zone_id)
len(response['ResourceRecordSets']).should.equal(0) len(response['ResourceRecordSets']).should.equal(0)