add new parameter SUPPORTS_ROOT_NS to providers

rebuild check to support new parameter ...
use upsert instead of create for root NS records in route53
github · joschi36 · joschi36 · joschi36 · Dec 11, 2019 · ross
diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py
@@ -1349,6 +1350,10 @@ def _apply(self, plan):
            mod_type = getattr(self, '_mod_{}'.format(c.__class__.__name__))
            mods = mod_type(c, zone_id, existing_rrsets)

+            # Rewrite NS Record to UPSERT because it always exists.
diff --git a/octodns/provider/base.py b/octodns/provider/base.py
@@ -60,7 +72,8 @@ def plan(self, desired):

        # allow the provider to filter out false positives
        before = len(changes)
-        changes = [c for c in changes if self._include_change(c)]
+        changes = [c for c in changes if self._include_change(c) and
+                   self._check_root_ns(c)]
diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py
@@ -600,6 +600,9 @@ class Route53Provider(BaseProvider):
        # The AWS session token (optional)
        # Only needed if using temporary security credentials
        session_token:
+        # Needed if you want to manage your root NS records with octodns
+        # When you enable this you MUST specify a root NS.
+        manage_root_ns:
-        manage_root_ns:
+        manage_root_ns: true
diff --git a/octodns/provider/yaml.py b/octodns/provider/yaml.py
@@ -46,6 +47,7 @@ def __init__(self, id, directory, default_ttl=3600, enforce_order=True,
        self.directory = directory
        self.default_ttl = default_ttl
        self.enforce_order = enforce_order
+        self.manage_root_ns = True
diff --git a/octodns/source/tinydns.py b/octodns/source/tinydns.py
    SUPPORTS = set(('A', 'CNAME', 'MX', 'NS', 'TXT', 'AAAA'))

    split_re = re.compile(r':+')

    def __init__(self, id, default_ttl=3600):
        super(TinyDnsBaseSource, self).__init__(id)
        self.default_ttl = default_ttl
+        self.manage_root_ns = True
diff --git a/octodns/provider/ns1.py b/octodns/provider/ns1.py
@@ -175,9 +175,13 @@ class Ns1Provider(BaseProvider):
    ns1:
        class: octodns.provider.ns1.Ns1Provider
        api_key: env/NS1_API_KEY
+        # Needed if you want to manage your root NS records with octodns
+        # When you enable this you MUST specify a root NS.
+        manage_root_ns:
-        manage_root_ns:
+        manage_root_ns: true
diff --git a/octodns/provider/ns1.py b/octodns/provider/ns1.py
@@ -224,11 +228,13 @@ class Ns1Provider(BaseProvider):
        'NA': ('US-CENTRAL', 'US-EAST', 'US-WEST'),
    }

-    def __init__(self, id, api_key, retry_count=4, *args, **kwargs):
+    def __init__(self, id, api_key, retry_count=4, manage_root_ns=False, *args,
+                 **kwargs):
diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py
@@ -618,7 +622,7 @@ 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, *args, **kwargs):
+                 session_token=None, manage_root_ns=False, *args, **kwargs):
diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py
@@ -1349,6 +1350,10 @@ def _apply(self, plan):
            mod_type = getattr(self, '_mod_{}'.format(c.__class__.__name__))
            mods = mod_type(c, zone_id, existing_rrsets)

+            # Rewrite NS Record to UPSERT because it always exists.
diff --git a/tests/test_octodns_provider_cloudflare.py b/tests/test_octodns_provider_cloudflare.py
@@ -153,7 +153,7 @@ def test_populate(self):

            changes = self.expected.changes(zone, provider)

-            self.assertEquals(0, len(changes))
+            self.assertEquals(1, len(changes))