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

Handle the MX special case around content

Browse Source
This commit is contained in:
Ross McFarland
2018-10-15 20:18:14 -07:00
parent db8e291d53
commit 0c33d3acac
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
octodns/provider/cloudflare.py
View File

@@ -340,14 +340,7 @@ class CloudflareProvider(BaseProvider):
}) })
yield content yield content
def _apply_Create(self, change): def _gen_key(self, data):
new = change.new
zone_id = self.zones[new.zone.name]
path = '/zones/{}/dns_records'.format(zone_id)
for content in self._gen_data(new):
self._request('POST', path, data=content)
def _apply_Update(self, change):
# Note that all CF records have a `content` field the value of which # Note that all CF records have a `content` field the value of which
# appears to be a unique/hashable string for the record's. It includes # appears to be a unique/hashable string for the record's. It includes
# all the "value" bits, but not the secondary stuff like TTL's. E.g. # all the "value" bits, but not the secondary stuff like TTL's. E.g.
@@ -356,7 +349,21 @@ class CloudflareProvider(BaseProvider):
# old & new records cleanly. In general when there are multiple records # old & new records cleanly. In general when there are multiple records
# for a name & type each will have a distinct/consistent `content` that # for a name & type each will have a distinct/consistent `content` that
# can serve as a unique identifier. # can serve as a unique identifier.
# BUT... there's an exception. For some reason MX doesn't include
# priority in its `content` so it's an odd-ball. I haven't found any
# others so hopefully they don't exist :-(
if data['type'] == 'MX':
return '{} {}'.format(data['priority'], data['content'])
return data['content']
def _apply_Create(self, change):
new = change.new
zone_id = self.zones[new.zone.name]
path = '/zones/{}/dns_records'.format(zone_id)
for content in self._gen_data(new):
self._request('POST', path, data=content)
def _apply_Update(self, change):
zone = change.new.zone zone = change.new.zone
zone_id = self.zones[zone.name] zone_id = self.zones[zone.name]
hostname = zone.hostname_from_fqdn(change.new.fqdn[:-1]) hostname = zone.hostname_from_fqdn(change.new.fqdn[:-1])
@@ -376,14 +383,15 @@ class CloudflareProvider(BaseProvider):
data = self._gen_data(r).next() data = self._gen_data(r).next()
# Record the record_id and data for this existing record # Record the record_id and data for this existing record
existing[data['content']] = { key = self._gen_key(data)
existing[key] = {
'record_id': record['id'], 'record_id': record['id'],
'data': data, 'data': data,
} }
# Build up a list of new CF records for this Update # Build up a list of new CF records for this Update
new = { new = {
d['content']: d for d in self._gen_data(change.new) self._gen_key(d): d for d in self._gen_data(change.new)
} }
# OK we now have a picture of the old & new CF records, our next step # OK we now have a picture of the old & new CF records, our next step

14
tests/test_octodns_provider_cloudflare.py
View File

@@ -536,6 +536,20 @@ class TestCloudflareProvider(TestCase):
'type': 'CNAME' 'type': 'CNAME'
}, list(contents)[0]) }, list(contents)[0])
def test_gen_key(self):
provider = CloudflareProvider('test', 'email', 'token')
self.assertEqual('10 foo.bar.com.', provider._gen_key({
'content': 'foo.bar.com.',
'priority': 10,
'type': 'MX',
}))
self.assertEqual('foo.bar.com.', provider._gen_key({
'content': 'foo.bar.com.',
'type': 'CNAME',
}))
def test_cdn(self): def test_cdn(self):
provider = CloudflareProvider('test', 'email', 'token', True) provider = CloudflareProvider('test', 'email', 'token', True)