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

Switch to named params in _extra_changes

Browse Source
This commit is contained in:
Ross McFarland
2018-03-31 12:39:32 -07:00
parent 182c953875
commit 5372e86e1c
7 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
octodns/provider/base.py
View File

@@ -64,7 +64,8 @@ class BaseProvider(BaseSource):
self.log.info('plan: filtered out %s changes', before - after) self.log.info('plan: filtered out %s changes', before - after)
# allow the provider to add extra changes it needs # allow the provider to add extra changes it needs
extra = self._extra_changes(existing, desired, changes) extra = self._extra_changes(existing=existing, desired=desired,
changes=changes)
if extra: if extra:
self.log.info('plan: extra changes\n %s', '\n ' self.log.info('plan: extra changes\n %s', '\n '
.join([unicode(c) for c in extra])) .join([unicode(c) for c in extra]))

2
octodns/provider/dyn.py
View File

@@ -454,7 +454,7 @@ class DynProvider(BaseProvider):
len(zone.records) - before, exists) len(zone.records) - before, exists)
return exists return exists
def _extra_changes(self, _, desired, changes): def _extra_changes(self, desired, changes, **kwargs):
self.log.debug('_extra_changes: desired=%s', desired.name) self.log.debug('_extra_changes: desired=%s', desired.name)
changed = set([c.record for c in changes]) changed = set([c.record for c in changes])

2
octodns/provider/powerdns.py
View File

@@ -289,7 +289,7 @@ class PowerDnsBaseProvider(BaseProvider):
def _get_nameserver_record(self, existing): def _get_nameserver_record(self, existing):
return None return None
def _extra_changes(self, existing, _, __): def _extra_changes(self, existing, **kwargs):
self.log.debug('_extra_changes: zone=%s', existing.name) self.log.debug('_extra_changes: zone=%s', existing.name)
ns = self._get_nameserver_record(existing) ns = self._get_nameserver_record(existing)

2
octodns/provider/route53.py
View File

@@ -673,7 +673,7 @@ class Route53Provider(BaseProvider):
self._gc_health_checks(change.existing, []) self._gc_health_checks(change.existing, [])
return self._gen_mods('DELETE', existing_records) return self._gen_mods('DELETE', existing_records)
def _extra_changes(self, existing, desired, changes): def _extra_changes(self, desired, changes, **kwargs):
self.log.debug('_extra_changes: desired=%s', desired.name) self.log.debug('_extra_changes: desired=%s', desired.name)
zone_id = self._get_zone_id(desired.name) zone_id = self._get_zone_id(desired.name)
if not zone_id: if not zone_id:

2
tests/test_octodns_provider_base.py
View File

@@ -35,7 +35,7 @@ class HelperProvider(BaseProvider):
return not self.include_change_callback or \ return not self.include_change_callback or \
self.include_change_callback(change) self.include_change_callback(change)
def _extra_changes(self, existing, desired, changes): def _extra_changes(self, **kwargs):
return self.__extra_changes return self.__extra_changes
def _apply(self, plan): def _apply(self, plan):

12
tests/test_octodns_provider_dyn.py
View File

@@ -882,7 +882,8 @@ class TestDynProviderGeo(TestCase):
'value': '1.2.3.4', 'value': '1.2.3.4',
}) })
desired.add_record(record) desired.add_record(record)
extra = provider._extra_changes(None, desired, [Create(record)]) extra = provider._extra_changes(desired=desired,
changes=[Create(record)])
self.assertEquals(0, len(extra)) self.assertEquals(0, len(extra))
# in changes, noop # in changes, noop
@@ -896,11 +897,12 @@ class TestDynProviderGeo(TestCase):
'value': '1.2.3.4', 'value': '1.2.3.4',
}) })
desired.add_record(record) desired.add_record(record)
extra = provider._extra_changes(None, desired, [Create(record)]) extra = provider._extra_changes(desired=desired,
changes=[Create(record)])
self.assertEquals(0, len(extra)) self.assertEquals(0, len(extra))
# no diff, no extra # no diff, no extra
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(0, len(extra)) self.assertEquals(0, len(extra))
# monitors should have been fetched now # monitors should have been fetched now
@@ -923,7 +925,7 @@ class TestDynProviderGeo(TestCase):
'value': '1.2.3.4', 'value': '1.2.3.4',
}) })
desired.add_record(record) desired.add_record(record)
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(1, len(extra)) self.assertEquals(1, len(extra))
extra = extra[0] extra = extra[0]
self.assertIsInstance(extra, Update) self.assertIsInstance(extra, Update)
@@ -940,7 +942,7 @@ class TestDynProviderGeo(TestCase):
'value': '1.2.3.4', 'value': '1.2.3.4',
}) })
desired.add_record(record) desired.add_record(record)
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(1, len(extra)) self.assertEquals(1, len(extra))
extra = extra[0] extra = extra[0]
self.assertIsInstance(extra, Update) self.assertIsInstance(extra, Update)

18
tests/test_octodns_provider_route53.py
View File

@@ -970,7 +970,7 @@ class TestRoute53Provider(TestCase):
# empty is empty # empty is empty
desired = Zone('unit.tests.', []) desired = Zone('unit.tests.', [])
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals([], extra) self.assertEquals([], extra)
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
@@ -982,13 +982,13 @@ class TestRoute53Provider(TestCase):
'value': '1.2.3.4', 'value': '1.2.3.4',
}) })
desired.add_record(record) desired.add_record(record)
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals([], extra) self.assertEquals([], extra)
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
# short-circuit for unknown zone # short-circuit for unknown zone
other = Zone('other.tests.', []) other = Zone('other.tests.', [])
extra = provider._extra_changes(None, other, []) extra = provider._extra_changes(desired=other, changes=[])
self.assertEquals([], extra) self.assertEquals([], extra)
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
@@ -1036,7 +1036,7 @@ class TestRoute53Provider(TestCase):
stubber.add_response('list_resource_record_sets', stubber.add_response('list_resource_record_sets',
list_resource_record_sets_resp, list_resource_record_sets_resp,
{'HostedZoneId': 'z42'}) {'HostedZoneId': 'z42'})
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(1, len(extra)) self.assertEquals(1, len(extra))
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
@@ -1101,12 +1101,12 @@ class TestRoute53Provider(TestCase):
'MaxItems': '100', 'MaxItems': '100',
'Marker': '', 'Marker': '',
}) })
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(1, len(extra)) self.assertEquals(1, len(extra))
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
for change in (Create(record), Update(record, record), Delete(record)): for change in (Create(record), Update(record, record), Delete(record)):
extra = provider._extra_changes(None, desired, [change]) extra = provider._extra_changes(desired=desired, changes=[change])
self.assertEquals(0, len(extra)) self.assertEquals(0, len(extra))
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
@@ -1202,7 +1202,7 @@ class TestRoute53Provider(TestCase):
'MaxItems': '100', 'MaxItems': '100',
'Marker': '', 'Marker': '',
}) })
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(0, len(extra)) self.assertEquals(0, len(extra))
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
@@ -1210,7 +1210,7 @@ class TestRoute53Provider(TestCase):
record._octodns['healthcheck'] = { record._octodns['healthcheck'] = {
'path': '/_ready' 'path': '/_ready'
} }
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(1, len(extra)) self.assertEquals(1, len(extra))
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()
@@ -1218,7 +1218,7 @@ class TestRoute53Provider(TestCase):
record._octodns['healthcheck'] = { record._octodns['healthcheck'] = {
'host': 'foo.bar.io' 'host': 'foo.bar.io'
} }
extra = provider._extra_changes(None, desired, []) extra = provider._extra_changes(desired=desired, changes=[])
self.assertEquals(1, len(extra)) self.assertEquals(1, len(extra))
stubber.assert_no_pending_responses() stubber.assert_no_pending_responses()