mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Merge branch 'master' into py3-f-strings

Browse Source
This commit is contained in:
Ross McFarland
2021-09-15 18:34:53 -07:00
committed by GitHub
parent bfbaf16d6a da391f643e
commit 953a3bb88e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
octodns/manager.py
View File

@@ -547,6 +547,7 @@ class Manager(object):
source_zone = source_zone source_zone = source_zone
continue continue
lenient = config.get('lenient', False)
try: try:
sources = config['sources'] sources = config['sources']
except KeyError: except KeyError:
@@ -566,7 +567,7 @@ class Manager(object):
for source in sources: for source in sources:
if isinstance(source, YamlProvider): if isinstance(source, YamlProvider):
source.populate(zone) source.populate(zone, lenient=lenient)
# check that processors are in order if any are specified # check that processors are in order if any are specified
processors = config.get('processors', []) processors = config.get('processors', [])

2
octodns/provider/digitalocean.py
View File

@@ -259,7 +259,7 @@ class DigitalOceanProvider(BaseProvider):
def _params_for_CAA(self, record): def _params_for_CAA(self, record):
for value in record.values: for value in record.values:
yield { yield {
'data': f'{value.value}.', 'data': value.value,
'flags': value.flags, 'flags': value.flags,
'name': record.name, 'name': record.name,
'tag': value.tag, 'tag': value.tag,

2
tests/test_octodns_provider_digitalocean.py
View File

@@ -186,7 +186,7 @@ class TestDigitalOceanProvider(TestCase):
'name': '@', 'name': '@',
'ttl': 300, 'type': 'A'}), 'ttl': 300, 'type': 'A'}),
call('POST', '/domains/unit.tests/records', data={ call('POST', '/domains/unit.tests/records', data={
'data': 'ca.unit.tests.', 'data': 'ca.unit.tests',
'flags': 0, 'name': '@', 'flags': 0, 'name': '@',
'tag': 'issue', 'tag': 'issue',
'ttl': 3600, 'type': 'CAA'}), 'ttl': 3600, 'type': 'CAA'}),