mirror of
https://github.com/github/octodns.git
synced 2024-05-11 05:55:00 +00:00
Implement Zone.add_record lenient across our providers
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user