Skip to content

Commit

Permalink
Fix state=get on route53 module (Issue ansible-collections#423) (ansi…
Browse files Browse the repository at this point in the history
…ble-collections#424)

* Fix state=get on route53 module

This bug was introduced when refactoring from boto to boto3 library. This happens because the method "get_hosted_zone" only returns the DelegationSet when the DNS zone is external. Therefore this breaks when trying to get internal records.

The solution is to search for getting DNS records of type ''NS'' with the same name as the hosted zone.

* Update changelogs/fragments/406-route53-state-get.yml

Co-authored-by: Mark Chappell <[email protected]>
  • Loading branch information
pjrm and tremble authored Mar 11, 2021
1 parent 6a5a96c commit da184fc
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion route53.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,17 @@ def get_zone_id_by_name(route53, module, zone_name, want_private, want_vpc_id):
return None


def get_hosted_zone_nameservers(route53, zone_id):
hosted_zone_name = route53.get_hosted_zone(aws_retry=True, Id=zone_id)['HostedZone']['Name']
resource_records_sets = _list_record_sets(route53, HostedZoneId=zone_id)

nameservers_records = list(
filter(lambda record: record['Name'] == hosted_zone_name and record['Type'] == 'NS', resource_records_sets)
)[0]['ResourceRecords']

return [ns_record['Value'] for ns_record in nameservers_records]


def main():
argument_spec = dict(
state=dict(type='str', required=True, choices=['absent', 'create', 'delete', 'get', 'present'], aliases=['command']),
Expand Down Expand Up @@ -565,7 +576,7 @@ def main():
ns = aws_record.get('values', [])
else:
# Retrieve name servers associated to the zone.
ns = route53.get_hosted_zone(aws_retry=True, Id=zone_id)['DelegationSet']['NameServers']
ns = get_hosted_zone_nameservers(route53, zone_id)

module.exit_json(changed=False, set=aws_record, nameservers=ns)

Expand Down

0 comments on commit da184fc

Please sign in to comment.