Switch to named params in _extra_changes

octodns/provider/base.py

@@ -64,7 +64,8 @@ class BaseProvider(BaseSource):
             self.log.info('plan:   filtered out %s changes', before - after)
 
         # 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:
             self.log.info('plan:   extra changes\n  %s', '\n  '
                           .join([unicode(c) for c in extra]))

octodns/provider/dyn.py

@@ -454,7 +454,7 @@ class DynProvider(BaseProvider):
                       len(zone.records) - before, 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)
 
         changed = set([c.record for c in changes])

octodns/provider/powerdns.py

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

octodns/provider/route53.py

@@ -673,7 +673,7 @@ class Route53Provider(BaseProvider):
         self._gc_health_checks(change.existing, [])
         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)
         zone_id = self._get_zone_id(desired.name)
         if not zone_id:

tests/test_octodns_provider_base.py

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

tests/test_octodns_provider_dyn.py

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

tests/test_octodns_provider_route53.py

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