Merge pull request #132 from octodns/missing-nameservers

handle zone lists w/o nameservers and more thoroughly test

Author: ross

CHANGELOG.md

@@ -1,8 +1,6 @@
-## v0.0.8 - 2025-02-06 - More options
+## v0.0.9 - 2025-02-06 - Unknown nameservers are a thing
 
-* Add support for optionally retrying requests that hit 403 errors
-* Add a zone_id lookup fallback when deleting records
-* Add support for setting Cloudflare plan type for zones
+* Handle cases where Cloudflare doesn't return a zones name servers.
 
 ## v0.0.7 - 2024-08-20 - DS always come second
 

octodns_cloudflare/__init__.py

@@ -245,7 +245,7 @@ def zones(self):
                         'cloudflare_plan': z.get('plan', {}).get(
                             'legacy_id', None
                         ),
-                        'name_servers': z['name_servers'],
+                        'name_servers': z.get('name_servers', []),
                     }
                     for z in zones
                 }
@@ -1299,7 +1299,7 @@ def _apply(self, plan):
             self.zones[zone_name] = {
                 'id': zone['id'],
                 'cloudflare_plan': zone.get('plan', {}).get('legacy_id', None),
-                'name_servers': zone['name_servers'],
+                'name_servers': zone.get('name_servers', []),
             }
             self._zone_records[zone_name] = {}
 

tests/fixtures/cloudflare-zones-page-2.json

@@ -7,10 +7,6 @@
       "paused": false,
       "type": "full",
       "development_mode": 0,
-      "name_servers": [
-        "alice.ns.cloudflare.com",
-        "tom.ns.cloudflare.com"
-      ],
       "original_name_servers": [],
       "original_registrar": null,
       "original_dnshost": null,

tests/test_octodns_provider_cloudflare.py

@@ -292,7 +292,7 @@ def test_apply(self):
 
         provider._request.side_effect = [
             self.empty,  # no zones
-            {'result': {'id': 42, 'name_servers': ['foo']}},  # zone create
+            {'result': {'id': 42}},  # zone create
         ] + [
             None
         ] * 34  # individual record creates
@@ -803,7 +803,7 @@ def test_apply(self):
             'unit.tests.': {
                 'id': '42',
                 'cloudflare_plan': 'pro',
-                'name_servers': ['foo'],
+                'name_servers': [],
             }
         }