Merge branch 'master' into pool-value-up

octodns/provider/route53.py

@@ -608,9 +608,11 @@ class Route53Provider(BaseProvider):
 
     def __init__(self, id, access_key_id=None, secret_access_key=None,
                  max_changes=1000, client_max_attempts=None,
-                 session_token=None, delegation_set_id=None, *args, **kwargs):
+                 session_token=None, delegation_set_id=None,
+                 get_zones_by_name=False, *args, **kwargs):
         self.max_changes = max_changes
         self.delegation_set_id = delegation_set_id
+        self.get_zones_by_name = get_zones_by_name
         _msg = f'access_key_id={access_key_id}, secret_access_key=***, ' \
                'session_token=***'
         use_fallback_auth = access_key_id is None and \
@@ -639,28 +641,49 @@ class Route53Provider(BaseProvider):
         self._r53_rrsets = {}
         self._health_checks = None
 
-    @property
-    def r53_zones(self):
-        if self._r53_zones is None:
-            self.log.debug('r53_zones: loading')
-            zones = {}
-            more = True
-            start = {}
-            while more:
-                resp = self._conn.list_hosted_zones(**start)
-                for z in resp['HostedZones']:
-                    zones[z['Name']] = z['Id']
-                more = resp['IsTruncated']
-                start['Marker'] = resp.get('NextMarker', None)
-
-            self._r53_zones = zones
+    def _get_zone_id_by_name(self, name):
+        # attempt to get zone by name
+        # limited to one as this should be unique
+        id = None
+        resp = self._conn.list_hosted_zones_by_name(
+            DNSName=name, MaxItems="1"
+        )
+        if len(resp['HostedZones']) != 0:
+            # if there is a response that starts with the name
+            if resp['HostedZones'][0]['Name'].startswith(name):
+                id = resp['HostedZones'][0]['Id']
+                self.log.debug('get_zones_by_name:   id=%s', id)
+        return id
 
-        return self._r53_zones
+    def update_r53_zones(self, name):
+        if self._r53_zones is None:
+            if self.get_zones_by_name:
+                id = self._get_zone_id_by_name(name)
+                zones = {}
+                zones[name] = id
+                self._r53_zones = zones
+            else:
+                self.log.debug('r53_zones: loading')
+                zones = {}
+                more = True
+                start = {}
+                while more:
+                    resp = self._conn.list_hosted_zones(**start)
+                    for z in resp['HostedZones']:
+                        zones[z['Name']] = z['Id']
+                    more = resp['IsTruncated']
+                    start['Marker'] = resp.get('NextMarker', None)
+                self._r53_zones = zones
+        else:
+            if name not in self._r53_zones and self.get_zones_by_name:
+                id = self._get_zone_id_by_name(name)
+                self._r53_zones[name] = id
 
     def _get_zone_id(self, name, create=False):
         self.log.debug('_get_zone_id: name=%s', name)
-        if name in self.r53_zones:
-            id = self.r53_zones[name]
+        self.update_r53_zones(name)
+        if name in self._r53_zones:
+            id = self._r53_zones[name]
             self.log.debug('_get_zone_id:   id=%s', id)
             return id
         if create:
@@ -675,7 +698,7 @@ class Route53Provider(BaseProvider):
             else:
                 resp = self._conn.create_hosted_zone(Name=name,
                                                      CallerReference=ref)
-            self.r53_zones[name] = id = resp['HostedZone']['Id']
+            self._r53_zones[name] = id = resp['HostedZone']['Id']
             return id
         return None
 

tests/test_octodns_provider_route53.py

@@ -1744,6 +1744,136 @@ class TestRoute53Provider(TestCase):
         self.assertEquals([], extra)
         stubber.assert_no_pending_responses()
 
+    def test_no_changes_with_get_zones_by_name(self):
+        provider = Route53Provider(
+            'test', 'abc', '123', get_zones_by_name=True)
+
+        # Use the stubber
+        stubber = Stubber(provider._conn)
+        stubber.activate()
+
+        list_hosted_zones_by_name_resp_1 = {
+            'HostedZones': [{
+                'Id': 'z42',
+                'Name': 'unit.tests.',
+                'CallerReference': 'abc',
+                'Config': {
+                    'Comment': 'string',
+                    'PrivateZone': False
+                },
+                'ResourceRecordSetCount': 123,
+            }, ],
+            'DNSName': 'unit.tests.',
+            'HostedZoneId': 'z42',
+            'IsTruncated': False,
+            'MaxItems': 'string'
+        }
+
+        list_hosted_zones_by_name_resp_2 = {
+            'HostedZones': [{
+                'Id': 'z43',
+                'Name': 'unit2.tests.',
+                'CallerReference': 'abc',
+                'Config': {
+                    'Comment': 'string',
+                    'PrivateZone': False
+                },
+                'ResourceRecordSetCount': 123,
+            }, ],
+            'DNSName': 'unit2.tests.',
+            'HostedZoneId': 'z43',
+            'IsTruncated': False,
+            'MaxItems': 'string'
+        }
+
+        stubber.add_response(
+            'list_hosted_zones_by_name',
+            list_hosted_zones_by_name_resp_1,
+            {'DNSName': 'unit.tests.', 'MaxItems': '1'}
+        )
+
+        # empty is empty
+        desired = Zone('unit.tests.', [])
+        extra = provider._extra_changes(desired=desired, changes=[])
+        self.assertEquals([], extra)
+        stubber.assert_no_pending_responses()
+
+        stubber.add_response(
+            'list_hosted_zones_by_name',
+            list_hosted_zones_by_name_resp_2,
+            {'DNSName': 'unit2.tests.', 'MaxItems': '1'}
+        )
+
+        # empty is empty
+        desired = Zone('unit2.tests.', [])
+        extra = provider._extra_changes(desired=desired, changes=[])
+        self.assertEquals([], extra)
+        stubber.assert_no_pending_responses()
+
+    def test_zone_not_found_get_zones_by_name(self):
+        provider = Route53Provider(
+            'test', 'abc', '123', get_zones_by_name=True)
+
+        # Use the stubber
+        stubber = Stubber(provider._conn)
+        stubber.activate()
+
+        list_hosted_zones_by_name_resp = {
+            'HostedZones': [{
+                'Id': 'z43',
+                'Name': 'bad.tests.',
+                'CallerReference': 'abc',
+                'Config': {
+                    'Comment': 'string',
+                    'PrivateZone': False
+                },
+                'ResourceRecordSetCount': 123,
+            }, ],
+            'DNSName': 'unit.tests.',
+            'HostedZoneId': 'z42',
+            'IsTruncated': False,
+            'MaxItems': 'string'
+        }
+
+        stubber.add_response(
+            'list_hosted_zones_by_name',
+            list_hosted_zones_by_name_resp,
+            {'DNSName': 'unit.tests.', 'MaxItems': '1'}
+        )
+
+        # empty is empty
+        desired = Zone('unit.tests.', [])
+        extra = provider._extra_changes(desired=desired, changes=[])
+        self.assertEquals([], extra)
+        stubber.assert_no_pending_responses()
+
+    def test_plan_with_get_zones_by_name(self):
+        provider = Route53Provider(
+            'test', 'abc', '123', get_zones_by_name=True)
+
+        # Use the stubber
+        stubber = Stubber(provider._conn)
+        stubber.activate()
+
+        # this is an empty response
+        # zone name not found
+        list_hosted_zones_by_name_resp = {
+            'HostedZones': [],
+            'DNSName': 'unit.tests.',
+            'HostedZoneId': 'z42',
+            'IsTruncated': False,
+            'MaxItems': 'string'
+        }
+
+        stubber.add_response(
+            'list_hosted_zones_by_name',
+            list_hosted_zones_by_name_resp,
+            {'DNSName': 'unit.tests.', 'MaxItems': '1'}
+        )
+
+        plan = provider.plan(self.expected)
+        self.assertEquals(9, len(plan.changes))
+
     def test_extra_change_no_health_check(self):
         provider, stubber = self._get_stubbed_provider()