From cee7677ae4738f2f5518dd1d13c0c98047b82f68 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 30 May 2018 12:41:59 -0700 Subject: [PATCH] Implement Zone.add_record lenient across our providers --- octodns/provider/azuredns.py | 2 +- octodns/provider/cloudflare.py | 2 +- octodns/provider/digitalocean.py | 2 +- octodns/provider/dnsimple.py | 2 +- octodns/provider/dnsmadeeasy.py | 2 +- octodns/provider/dyn.py | 8 ++++---- octodns/provider/googlecloud.py | 2 +- octodns/provider/ns1.py | 2 +- octodns/provider/ovh.py | 2 +- octodns/provider/powerdns.py | 2 +- octodns/provider/rackspace.py | 2 +- octodns/provider/route53.py | 2 +- octodns/provider/yaml.py | 2 +- octodns/source/tinydns.py | 4 ++-- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/octodns/provider/azuredns.py b/octodns/provider/azuredns.py index 1f14c4b..b3bff6c 100644 --- a/octodns/provider/azuredns.py +++ b/octodns/provider/azuredns.py @@ -345,7 +345,7 @@ class AzureProvider(BaseProvider): data['type'] = typ data['ttl'] = azrecord.ttl record = Record.new(zone, record_name, data, source=self) - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) diff --git a/octodns/provider/cloudflare.py b/octodns/provider/cloudflare.py index c51e61c..ecf3e3f 100644 --- a/octodns/provider/cloudflare.py +++ b/octodns/provider/cloudflare.py @@ -253,7 +253,7 @@ class CloudflareProvider(BaseProvider): self.log.info('CDN rewrite %s already in zone', name) continue - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) diff --git a/octodns/provider/digitalocean.py b/octodns/provider/digitalocean.py index e71e87f..84116a0 100644 --- a/octodns/provider/digitalocean.py +++ b/octodns/provider/digitalocean.py @@ -230,7 +230,7 @@ class DigitalOceanProvider(BaseProvider): data_for = getattr(self, '_data_for_{}'.format(_type)) record = Record.new(zone, name, data_for(_type, records), source=self, lenient=lenient) - zone.add_record(record) + zone.add_record(record, lenient=lenient) exists = zone.name in self._zone_records self.log.info('populate: found %s records, exists=%s', diff --git a/octodns/provider/dnsimple.py b/octodns/provider/dnsimple.py index b696f75..7a9db50 100644 --- a/octodns/provider/dnsimple.py +++ b/octodns/provider/dnsimple.py @@ -270,7 +270,7 @@ class DnsimpleProvider(BaseProvider): data_for = getattr(self, '_data_for_{}'.format(_type)) record = Record.new(zone, name, data_for(_type, records), source=self, lenient=lenient) - zone.add_record(record) + zone.add_record(record, lenient=lenient) exists = zone.name in self._zone_records self.log.info('populate: found %s records, exists=%s', diff --git a/octodns/provider/dnsmadeeasy.py b/octodns/provider/dnsmadeeasy.py index b439931..f8cee1c 100644 --- a/octodns/provider/dnsmadeeasy.py +++ b/octodns/provider/dnsmadeeasy.py @@ -263,7 +263,7 @@ class DnsMadeEasyProvider(BaseProvider): data_for = getattr(self, '_data_for_{}'.format(_type)) record = Record.new(zone, name, data_for(_type, records), source=self, lenient=lenient) - zone.add_record(record) + zone.add_record(record, lenient=lenient) exists = zone.name in self._zone_records self.log.info('populate: found %s records, exists=%s', diff --git a/octodns/provider/dyn.py b/octodns/provider/dyn.py index de430db..166227b 100644 --- a/octodns/provider/dyn.py +++ b/octodns/provider/dyn.py @@ -399,7 +399,7 @@ class DynProvider(BaseProvider): return self._traffic_directors - def _populate_traffic_directors(self, zone): + def _populate_traffic_directors(self, zone, lenient): self.log.debug('_populate_traffic_directors: zone=%s', zone.name) td_records = set() for fqdn, types in self.traffic_directors.items(): @@ -444,7 +444,7 @@ class DynProvider(BaseProvider): name = zone.hostname_from_fqdn(fqdn) record = Record.new(zone, name, data, source=self) - zone.add_record(record) + zone.add_record(record, lenient=lenient) td_records.add(record) return td_records @@ -460,7 +460,7 @@ class DynProvider(BaseProvider): td_records = set() if self.traffic_directors_enabled: - td_records = self._populate_traffic_directors(zone) + td_records = self._populate_traffic_directors(zone, lenient) exists = True dyn_zone = _CachingDynZone.get(zone.name[:-1]) @@ -483,7 +483,7 @@ class DynProvider(BaseProvider): record = Record.new(zone, name, data, source=self, lenient=lenient) if record not in td_records: - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) diff --git a/octodns/provider/googlecloud.py b/octodns/provider/googlecloud.py index 82a4fcf..74c17a4 100644 --- a/octodns/provider/googlecloud.py +++ b/octodns/provider/googlecloud.py @@ -230,7 +230,7 @@ class GoogleCloudProvider(BaseProvider): self.log.debug('populate: adding record {} records: {!s}' .format(record_name, data)) record = Record.new(zone, record_name, data, source=self) - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) diff --git a/octodns/provider/ns1.py b/octodns/provider/ns1.py index 37b8d77..31aff47 100644 --- a/octodns/provider/ns1.py +++ b/octodns/provider/ns1.py @@ -211,7 +211,7 @@ class Ns1Provider(BaseProvider): record = Record.new(zone, name, data_for(_type, record), source=self, lenient=lenient) zone_hash[(_type, name)] = record - [zone.add_record(r) for r in zone_hash.values()] + [zone.add_record(r, lenient=lenient) for r in zone_hash.values()] self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) return exists diff --git a/octodns/provider/ovh.py b/octodns/provider/ovh.py index ee1cef9..a74a3cd 100644 --- a/octodns/provider/ovh.py +++ b/octodns/provider/ovh.py @@ -82,7 +82,7 @@ class OvhProvider(BaseProvider): data_for = getattr(self, '_data_for_{}'.format(_type)) record = Record.new(zone, name, data_for(_type, records), source=self, lenient=lenient) - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) diff --git a/octodns/provider/powerdns.py b/octodns/provider/powerdns.py index 02319e5..30cd01e 100644 --- a/octodns/provider/powerdns.py +++ b/octodns/provider/powerdns.py @@ -199,7 +199,7 @@ class PowerDnsBaseProvider(BaseProvider): record_name = zone.hostname_from_fqdn(rrset['name']) record = Record.new(zone, record_name, data_for(rrset), source=self, lenient=lenient) - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) diff --git a/octodns/provider/rackspace.py b/octodns/provider/rackspace.py index b9912a3..d2b85f3 100644 --- a/octodns/provider/rackspace.py +++ b/octodns/provider/rackspace.py @@ -215,7 +215,7 @@ class RackspaceProvider(BaseProvider): record = Record.new(zone, record_name, data_for(record_set), source=self) - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=True', len(zone.records) - before) diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py index 5fc0faa..502fa9f 100644 --- a/octodns/provider/route53.py +++ b/octodns/provider/route53.py @@ -489,7 +489,7 @@ class Route53Provider(BaseProvider): data = data[0] record = Record.new(zone, name, data, source=self, lenient=lenient) - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=%s', len(zone.records) - before, exists) diff --git a/octodns/provider/yaml.py b/octodns/provider/yaml.py index 0241d50..287fd3b 100644 --- a/octodns/provider/yaml.py +++ b/octodns/provider/yaml.py @@ -67,7 +67,7 @@ class YamlProvider(BaseProvider): d['ttl'] = self.default_ttl record = Record.new(zone, name, d, source=self, lenient=lenient) - zone.add_record(record) + zone.add_record(record, lenient=lenient) self.log.info('populate: found %s records, exists=False', len(zone.records) - before) diff --git a/octodns/source/tinydns.py b/octodns/source/tinydns.py index 8013cd4..7b06527 100644 --- a/octodns/source/tinydns.py +++ b/octodns/source/tinydns.py @@ -134,7 +134,7 @@ class TinyDnsBaseSource(BaseSource): record = Record.new(zone, name, data, source=self, lenient=lenient) try: - zone.add_record(record) + zone.add_record(record, lenient=lenient) except SubzoneRecordException: self.log.debug('_populate_normal: skipping subzone ' 'record=%s', record) @@ -175,7 +175,7 @@ class TinyDnsBaseSource(BaseSource): 'value': value }, source=self, lenient=lenient) try: - zone.add_record(record) + zone.add_record(record, lenient=lenient) except DuplicateRecordException: self.log.warn('Duplicate PTR record for {}, ' 'skipping'.format(addr))