From 7c44e5eedc4e4db60fae15298e52d3692b9aee6e Mon Sep 17 00:00:00 2001 From: Ricard Bejarano Date: Wed, 14 Apr 2021 06:59:34 +0200 Subject: [PATCH 1/4] fixed DigitalOcean provider issue with CAA records as reported here: https://github.com/octodns/octodns/pull/691#issuecomment-819228150 --- octodns/provider/digitalocean.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octodns/provider/digitalocean.py b/octodns/provider/digitalocean.py index 6ccee1d..41e6b6b 100644 --- a/octodns/provider/digitalocean.py +++ b/octodns/provider/digitalocean.py @@ -262,7 +262,7 @@ class DigitalOceanProvider(BaseProvider): def _params_for_CAA(self, record): for value in record.values: yield { - 'data': '{}.'.format(value.value), + 'data': '{}'.format(value.value), 'flags': value.flags, 'name': record.name, 'tag': value.tag, From 2351c406f6d20f478c2e16b94829b286b6390aaa Mon Sep 17 00:00:00 2001 From: Ricard Bejarano Date: Wed, 28 Apr 2021 16:26:49 +0200 Subject: [PATCH 2/4] fixed DigitalOcean tests (no need for final dot on CAA records) --- tests/test_octodns_provider_digitalocean.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_octodns_provider_digitalocean.py b/tests/test_octodns_provider_digitalocean.py index affd140..4b04d54 100644 --- a/tests/test_octodns_provider_digitalocean.py +++ b/tests/test_octodns_provider_digitalocean.py @@ -186,7 +186,7 @@ class TestDigitalOceanProvider(TestCase): 'name': '@', 'ttl': 300, 'type': 'A'}), call('POST', '/domains/unit.tests/records', data={ - 'data': 'ca.unit.tests.', + 'data': 'ca.unit.tests', 'flags': 0, 'name': '@', 'tag': 'issue', 'ttl': 3600, 'type': 'CAA'}), From f8aa4c8df5938cc80cc5a0944dfab5989c010077 Mon Sep 17 00:00:00 2001 From: Ricard Bejarano Date: Wed, 28 Apr 2021 16:30:52 +0200 Subject: [PATCH 3/4] minor correctness change (unnecessary .format() call) --- octodns/provider/digitalocean.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octodns/provider/digitalocean.py b/octodns/provider/digitalocean.py index 41e6b6b..9499009 100644 --- a/octodns/provider/digitalocean.py +++ b/octodns/provider/digitalocean.py @@ -262,7 +262,7 @@ class DigitalOceanProvider(BaseProvider): def _params_for_CAA(self, record): for value in record.values: yield { - 'data': '{}'.format(value.value), + 'data': value.value, 'flags': value.flags, 'name': record.name, 'tag': value.tag, From 2cf52180acf489bb67ea6d0dcf1a52f461d44ed0 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Mon, 13 Sep 2021 19:09:05 -0700 Subject: [PATCH 4/4] Add lenient config support to validate(_configs) --- octodns/manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/octodns/manager.py b/octodns/manager.py index 104e445..0ce425b 100644 --- a/octodns/manager.py +++ b/octodns/manager.py @@ -552,6 +552,7 @@ class Manager(object): source_zone = source_zone continue + lenient = config.get('lenient', False) try: sources = config['sources'] except KeyError: @@ -572,7 +573,7 @@ class Manager(object): for source in sources: if isinstance(source, YamlProvider): - source.populate(zone) + source.populate(zone, lenient=lenient) # check that processors are in order if any are specified processors = config.get('processors', [])