mirror of
https://github.com/github/octodns.git
synced 2024-05-11 05:55:00 +00:00
Merge branch 'master' into refactor-azuredns
This commit is contained in:
Viranch Mehta
GitHub
@@ -195,7 +195,7 @@ The above command pulled the existing data out of Route53 and placed the results
|
||||
| [AzureProvider](/octodns/provider/azuredns.py) | azure-identity, azure-mgmt-dns, azure-mgmt-trafficmanager | A, AAAA, CAA, CNAME, MX, NS, PTR, SRV, TXT | Alpha (A, AAAA, CNAME) | |
|
||||
| [Akamai](/octodns/provider/edgedns.py) | edgegrid-python | A, AAAA, CNAME, MX, NAPTR, NS, PTR, SPF, SRV, SSHFP, TXT | No | |
|
||||
| [CloudflareProvider](/octodns/provider/cloudflare.py) | | A, AAAA, ALIAS, CAA, CNAME, LOC, MX, NS, PTR, SPF, SRV, TXT | No | CAA tags restricted |
|
||||
| [ConstellixProvider](/octodns/provider/constellix.py) | | A, AAAA, ALIAS (ANAME), CAA, CNAME, MX, NS, PTR, SPF, SRV, TXT | No | CAA tags restricted |
|
||||
| [ConstellixProvider](/octodns/provider/constellix.py) | | A, AAAA, ALIAS (ANAME), CAA, CNAME, MX, NS, PTR, SPF, SRV, TXT | Yes | CAA tags restricted |
|
||||
| [DigitalOceanProvider](/octodns/provider/digitalocean.py) | | A, AAAA, CAA, CNAME, MX, NS, TXT, SRV | No | CAA tags restricted |
|
||||
| [DnsMadeEasyProvider](/octodns/provider/dnsmadeeasy.py) | | A, AAAA, ALIAS (ANAME), CAA, CNAME, MX, NS, PTR, SPF, SRV, TXT | No | CAA tags restricted |
|
||||
| [DnsimpleProvider](/octodns/provider/dnsimple.py) | | All | No | CAA tags restricted |
|
||||
|
||||
@@ -552,6 +552,7 @@ class Manager(object):
|
||||
source_zone = source_zone
|
||||
continue
|
||||
|
||||
lenient = config.get('lenient', False)
|
||||
try:
|
||||
sources = config['sources']
|
||||
except KeyError:
|
||||
@@ -572,7 +573,7 @@ class Manager(object):
|
||||
|
||||
for source in sources:
|
||||
if isinstance(source, YamlProvider):
|
||||
source.populate(zone)
|
||||
source.populate(zone, lenient=lenient)
|
||||
|
||||
# check that processors are in order if any are specified
|
||||
processors = config.get('processors', [])
|
||||
|
||||
@@ -50,12 +50,25 @@ class BaseProvider(BaseSource):
|
||||
that are made to have them logged or throw errors depending on the
|
||||
provider configuration.
|
||||
'''
|
||||
if self.SUPPORTS_MUTLIVALUE_PTR:
|
||||
# nothing do here
|
||||
return desired
|
||||
|
||||
for record in desired.records:
|
||||
if record._type == 'PTR' and len(record.values) > 1:
|
||||
if record._type not in self.SUPPORTS:
|
||||
msg = '{} records not supported for {}'.format(record._type,
|
||||
record.fqdn)
|
||||
fallback = 'omitting record'
|
||||
self.supports_warn_or_except(msg, fallback)
|
||||
desired.remove_record(record)
|
||||
elif getattr(record, 'dynamic', False) and \
|
||||
not self.SUPPORTS_DYNAMIC:
|
||||
msg = 'dynamic records not supported for {}'\
|
||||
.format(record.fqdn)
|
||||
fallback = 'falling back to simple record'
|
||||
self.supports_warn_or_except(msg, fallback)
|
||||
record = record.copy()
|
||||
record.dynamic = None
|
||||
desired.add_record(record, replace=True)
|
||||
elif record._type == 'PTR' and len(record.values) > 1 and \
|
||||
not self.SUPPORTS_MUTLIVALUE_PTR:
|
||||
# replace with a single-value copy
|
||||
msg = 'multi-value PTR records not supported for {}' \
|
||||
.format(record.fqdn)
|
||||
|
||||
@@ -9,6 +9,7 @@ from collections import defaultdict
|
||||
from requests import Session
|
||||
from base64 import b64encode
|
||||
from six import string_types
|
||||
from pycountry_convert import country_alpha2_to_continent_code
|
||||
import hashlib
|
||||
import hmac
|
||||
import logging
|
||||
@@ -44,7 +45,7 @@ class ConstellixClientNotFound(ConstellixClientException):
|
||||
|
||||
|
||||
class ConstellixClient(object):
|
||||
BASE = 'https://api.dns.constellix.com/v1/domains'
|
||||
BASE = 'https://api.dns.constellix.com/v1'
|
||||
|
||||
def __init__(self, api_key, secret_key, ratelimit_delay=0.0):
|
||||
self.api_key = api_key
|
||||
@@ -53,6 +54,8 @@ class ConstellixClient(object):
|
||||
self._sess = Session()
|
||||
self._sess.headers.update({'x-cnsdns-apiKey': self.api_key})
|
||||
self._domains = None
|
||||
self._pools = {'A': None, 'AAAA': None, 'CNAME': None}
|
||||
self._geofilters = None
|
||||
|
||||
def _current_time(self):
|
||||
return str(int(time.time() * 1000))
|
||||
@@ -88,7 +91,7 @@ class ConstellixClient(object):
|
||||
if self._domains is None:
|
||||
zones = []
|
||||
|
||||
resp = self._request('GET', '').json()
|
||||
resp = self._request('GET', '/domains').json()
|
||||
zones += resp
|
||||
|
||||
self._domains = {'{}.'.format(z['name']): z['id'] for z in zones}
|
||||
@@ -99,19 +102,29 @@ class ConstellixClient(object):
|
||||
zone_id = self.domains.get(name, False)
|
||||
if not zone_id:
|
||||
raise ConstellixClientNotFound()
|
||||
path = '/{}'.format(zone_id)
|
||||
path = f'/domains/{zone_id}'
|
||||
return self._request('GET', path).json()
|
||||
|
||||
def domain_create(self, name):
|
||||
resp = self._request('POST', '/', data={'names': [name]})
|
||||
resp = self._request('POST', '/domains', data={'names': [name]})
|
||||
# Add newly created zone to domain cache
|
||||
self._domains['{}.'.format(name)] = resp.json()[0]['id']
|
||||
self._domains[f'{name}.'] = resp.json()[0]['id']
|
||||
|
||||
def domain_enable_geoip(self, domain_name):
|
||||
domain = self.domain(domain_name)
|
||||
if domain['hasGeoIP'] is False:
|
||||
domain_id = self.domains[domain_name]
|
||||
self._request(
|
||||
'PUT',
|
||||
f'/domains/{domain_id}',
|
||||
data={'hasGeoIP': True}
|
||||
)
|
||||
|
||||
def _absolutize_value(self, value, zone_name):
|
||||
if value == '':
|
||||
value = zone_name
|
||||
elif not value.endswith('.'):
|
||||
value = '{}.{}'.format(value, zone_name)
|
||||
value = f'{value}.{zone_name}'
|
||||
|
||||
return value
|
||||
|
||||
@@ -119,7 +132,7 @@ class ConstellixClient(object):
|
||||
zone_id = self.domains.get(zone_name, False)
|
||||
if not zone_id:
|
||||
raise ConstellixClientNotFound()
|
||||
path = '/{}/records'.format(zone_id)
|
||||
path = f'/domains/{zone_id}/records'
|
||||
|
||||
resp = self._request('GET', path).json()
|
||||
for record in resp:
|
||||
@@ -146,7 +159,7 @@ class ConstellixClient(object):
|
||||
record_type = 'ANAME'
|
||||
|
||||
zone_id = self.domains.get(zone_name, False)
|
||||
path = '/{}/records/{}'.format(zone_id, record_type)
|
||||
path = f'/domains/{zone_id}/records/{record_type}'
|
||||
|
||||
self._request('POST', path, data=params)
|
||||
|
||||
@@ -156,9 +169,108 @@ class ConstellixClient(object):
|
||||
record_type = 'ANAME'
|
||||
|
||||
zone_id = self.domains.get(zone_name, False)
|
||||
path = '/{}/records/{}/{}'.format(zone_id, record_type, record_id)
|
||||
path = f'/domains/{zone_id}/records/{record_type}/{record_id}'
|
||||
self._request('DELETE', path)
|
||||
|
||||
def pools(self, pool_type):
|
||||
if self._pools[pool_type] is None:
|
||||
self._pools[pool_type] = {}
|
||||
path = f'/pools/{pool_type}'
|
||||
response = self._request('GET', path).json()
|
||||
for pool in response:
|
||||
self._pools[pool_type][pool['id']] = pool
|
||||
return self._pools[pool_type].values()
|
||||
|
||||
def pool(self, pool_type, pool_name):
|
||||
pools = self.pools(pool_type)
|
||||
for pool in pools:
|
||||
if pool['name'] == pool_name and pool['type'] == pool_type:
|
||||
return pool
|
||||
return None
|
||||
|
||||
def pool_by_id(self, pool_type, pool_id):
|
||||
pools = self.pools(pool_type)
|
||||
for pool in pools:
|
||||
if pool['id'] == pool_id:
|
||||
return pool
|
||||
|
||||
def pool_create(self, data):
|
||||
path = '/pools/{}'.format(data.get('type'))
|
||||
# This returns a list of items, we want the first one
|
||||
response = self._request('POST', path, data=data).json()
|
||||
|
||||
# Update our cache
|
||||
self._pools[data.get('type')][response[0]['id']] = response[0]
|
||||
return response[0]
|
||||
|
||||
def pool_update(self, pool_id, data):
|
||||
path = '/pools/{}/{}'.format(data.get('type'), pool_id)
|
||||
try:
|
||||
self._request('PUT', path, data=data).json()
|
||||
|
||||
except ConstellixClientBadRequest as e:
|
||||
message = str(e)
|
||||
if not message or "no changes to save" not in message:
|
||||
raise e
|
||||
return data
|
||||
|
||||
def pool_delete(self, pool_type, pool_id):
|
||||
path = f'/pools/{pool_type}/{pool_id}'
|
||||
self._request('DELETE', path)
|
||||
|
||||
# Update our cache
|
||||
if self._pools[pool_type] is not None:
|
||||
self._pools[pool_type].pop(pool_id, None)
|
||||
|
||||
def geofilters(self):
|
||||
if self._geofilters is None:
|
||||
self._geofilters = {}
|
||||
path = '/geoFilters'
|
||||
response = self._request('GET', path).json()
|
||||
for geofilter in response:
|
||||
self._geofilters[geofilter['id']] = geofilter
|
||||
return self._geofilters.values()
|
||||
|
||||
def geofilter(self, geofilter_name):
|
||||
geofilters = self.geofilters()
|
||||
for geofilter in geofilters:
|
||||
if geofilter['name'] == geofilter_name:
|
||||
return geofilter
|
||||
return None
|
||||
|
||||
def geofilter_by_id(self, geofilter_id):
|
||||
geofilters = self.geofilters()
|
||||
for geofilter in geofilters:
|
||||
if geofilter['id'] == geofilter_id:
|
||||
return geofilter
|
||||
|
||||
def geofilter_create(self, data):
|
||||
path = '/geoFilters'
|
||||
response = self._request('POST', path, data=data).json()
|
||||
|
||||
# Update our cache
|
||||
self._geofilters[response[0]['id']] = response[0]
|
||||
return response[0]
|
||||
|
||||
def geofilter_update(self, geofilter_id, data):
|
||||
path = f'/geoFilters/{geofilter_id}'
|
||||
try:
|
||||
self._request('PUT', path, data=data).json()
|
||||
|
||||
except ConstellixClientBadRequest as e:
|
||||
message = str(e)
|
||||
if not message or "no changes to save" not in message:
|
||||
raise e
|
||||
return data
|
||||
|
||||
def geofilter_delete(self, geofilter_id):
|
||||
path = f'/geoFilters/{geofilter_id}'
|
||||
self._request('DELETE', path)
|
||||
|
||||
# Update our cache
|
||||
if self._geofilters is not None:
|
||||
self._geofilters.pop(geofilter_id, None)
|
||||
|
||||
|
||||
class ConstellixProvider(BaseProvider):
|
||||
'''
|
||||
@@ -175,13 +287,13 @@ class ConstellixProvider(BaseProvider):
|
||||
ratelimit_delay: 0.0
|
||||
'''
|
||||
SUPPORTS_GEO = False
|
||||
SUPPORTS_DYNAMIC = False
|
||||
SUPPORTS_DYNAMIC = True
|
||||
SUPPORTS = set(('A', 'AAAA', 'ALIAS', 'CAA', 'CNAME', 'MX',
|
||||
'NS', 'PTR', 'SPF', 'SRV', 'TXT'))
|
||||
|
||||
def __init__(self, id, api_key, secret_key, ratelimit_delay=0.0,
|
||||
*args, **kwargs):
|
||||
self.log = logging.getLogger('ConstellixProvider[{}]'.format(id))
|
||||
self.log = logging.getLogger(f'ConstellixProvider[{id}]')
|
||||
self.log.debug('__init__: id=%s, api_key=***, secret_key=***', id)
|
||||
super(ConstellixProvider, self).__init__(id, *args, **kwargs)
|
||||
self._client = ConstellixClient(api_key, secret_key, ratelimit_delay)
|
||||
@@ -189,12 +301,97 @@ class ConstellixProvider(BaseProvider):
|
||||
|
||||
def _data_for_multiple(self, _type, records):
|
||||
record = records[0]
|
||||
if record['recordOption'] == 'pools':
|
||||
return self._data_for_pool(_type, records)
|
||||
return {
|
||||
'ttl': record['ttl'],
|
||||
'type': _type,
|
||||
'values': record['value']
|
||||
}
|
||||
|
||||
def _data_for_pool(self, _type, records):
|
||||
default_values = []
|
||||
fallback_pool_name = None
|
||||
pools = {}
|
||||
rules = []
|
||||
|
||||
for record in records:
|
||||
# fetch record pool data
|
||||
pool_id = record['pools'][0]
|
||||
pool = self._client.pool_by_id(_type, pool_id)
|
||||
|
||||
geofilter_id = 1
|
||||
if 'geolocation' in record.keys() \
|
||||
and record['geolocation'] is not None:
|
||||
# fetch record geofilter data
|
||||
geofilter_id = record['geolocation']['geoipFilter']
|
||||
geofilter = self._client.geofilter_by_id(geofilter_id)
|
||||
|
||||
pool_name = pool['name'].split(':')[-1]
|
||||
|
||||
# fetch default values from the World Default pool
|
||||
if geofilter_id == 1:
|
||||
fallback_pool_name = pool_name
|
||||
for value in pool['values']:
|
||||
default_values.append(value['value'])
|
||||
|
||||
# populate pools
|
||||
pools[pool_name] = {
|
||||
'fallback': None,
|
||||
'values': []
|
||||
}
|
||||
for value in pool['values']:
|
||||
pools[pool_name]['values'].append({
|
||||
'value': value['value'],
|
||||
'weight': value['weight']
|
||||
})
|
||||
|
||||
# populate rules
|
||||
if geofilter_id == 1:
|
||||
rules.append({'pool': pool_name})
|
||||
else:
|
||||
geos = []
|
||||
|
||||
if 'geoipContinents' in geofilter.keys():
|
||||
for continent_code in geofilter['geoipContinents']:
|
||||
geos.append(continent_code)
|
||||
|
||||
if 'geoipCountries' in geofilter.keys():
|
||||
for country_code in geofilter['geoipCountries']:
|
||||
geos.append('{}-{}'.format(
|
||||
country_alpha2_to_continent_code(country_code),
|
||||
country_code
|
||||
))
|
||||
|
||||
if 'regions' in geofilter.keys():
|
||||
for region in geofilter['regions']:
|
||||
geos.append('{}-{}-{}'.format(
|
||||
region['continentCode'],
|
||||
region['countryCode'],
|
||||
region['regionCode']))
|
||||
|
||||
rules.append({
|
||||
'pool': pool_name,
|
||||
'geos': sorted(geos)
|
||||
})
|
||||
|
||||
# set fallback pool
|
||||
for pool_name in pools:
|
||||
if pool_name != fallback_pool_name:
|
||||
pools[pool_name]['fallback'] = fallback_pool_name
|
||||
|
||||
res = {
|
||||
'ttl': record['ttl'],
|
||||
'type': _type,
|
||||
'dynamic': {
|
||||
'pools': dict(
|
||||
sorted(pools.items(), key=lambda t: t[0])),
|
||||
'rules': sorted(rules, key=lambda t: t['pool'])
|
||||
},
|
||||
'values': default_values
|
||||
}
|
||||
return res
|
||||
|
||||
_data_for_A = _data_for_multiple
|
||||
_data_for_AAAA = _data_for_multiple
|
||||
|
||||
@@ -308,7 +505,7 @@ class ConstellixProvider(BaseProvider):
|
||||
before = len(zone.records)
|
||||
for name, types in values.items():
|
||||
for _type, records in types.items():
|
||||
data_for = getattr(self, '_data_for_{}'.format(_type))
|
||||
data_for = getattr(self, f'_data_for_{_type}')
|
||||
record = Record.new(zone, name, data_for(_type, records),
|
||||
source=self, lenient=lenient)
|
||||
zone.add_record(record, lenient=lenient)
|
||||
@@ -415,24 +612,259 @@ class ConstellixProvider(BaseProvider):
|
||||
'roundRobin': values
|
||||
}
|
||||
|
||||
def _apply_Create(self, change):
|
||||
def _handle_pools(self, record):
|
||||
# If we don't have dynamic, then there's no pools
|
||||
if not getattr(record, 'dynamic', False):
|
||||
return []
|
||||
|
||||
res_pools = []
|
||||
|
||||
for i, rule in enumerate(record.dynamic.rules):
|
||||
pool_name = rule.data.get('pool')
|
||||
pool = record.dynamic.pools.get(pool_name)
|
||||
values = pool.data.get('values')
|
||||
|
||||
# Make a pool name based on zone, record, type and name
|
||||
generated_pool_name = '{}:{}:{}:{}'.format(
|
||||
record.zone.name,
|
||||
record.name,
|
||||
record._type,
|
||||
pool_name
|
||||
)
|
||||
|
||||
# OK, pool is valid, let's create it or update it
|
||||
self.log.debug("Creating pool %s", generated_pool_name)
|
||||
pool_obj = self._create_update_pool(
|
||||
pool_name = generated_pool_name,
|
||||
pool_type = record._type,
|
||||
ttl = record.ttl,
|
||||
values = values
|
||||
)
|
||||
|
||||
# Now will crate GeoFilter for the pool
|
||||
continents = []
|
||||
countries = []
|
||||
regions = []
|
||||
|
||||
for geo in rule.data.get('geos', []):
|
||||
codes = geo.split('-')
|
||||
n = len(geo)
|
||||
if n == 2:
|
||||
continents.append(geo)
|
||||
elif n == 5:
|
||||
countries.append(codes[1])
|
||||
else:
|
||||
regions.append({
|
||||
'continentCode': codes[0],
|
||||
'countryCode': codes[1],
|
||||
'regionCode': codes[2]
|
||||
})
|
||||
|
||||
if len(continents) == 0 and \
|
||||
len(countries) == 0 and \
|
||||
len(regions) == 0:
|
||||
pool_obj['geofilter'] = 1
|
||||
else:
|
||||
self.log.debug(
|
||||
"Creating geofilter %s",
|
||||
generated_pool_name
|
||||
)
|
||||
geofilter_obj = self._create_update_geofilter(
|
||||
generated_pool_name,
|
||||
continents,
|
||||
countries,
|
||||
regions
|
||||
)
|
||||
pool_obj['geofilter'] = geofilter_obj['id']
|
||||
|
||||
res_pools.append(pool_obj)
|
||||
return res_pools
|
||||
|
||||
def _create_update_pool(self, pool_name, pool_type, ttl, values):
|
||||
pool = {
|
||||
'name': pool_name,
|
||||
'type': pool_type,
|
||||
'numReturn': 1,
|
||||
'minAvailableFailover': 1,
|
||||
'ttl': ttl,
|
||||
'values': values
|
||||
}
|
||||
existing_pool = self._client.pool(pool_type, pool_name)
|
||||
if not existing_pool:
|
||||
return self._client.pool_create(pool)
|
||||
|
||||
pool_id = existing_pool['id']
|
||||
updated_pool = self._client.pool_update(pool_id, pool)
|
||||
updated_pool['id'] = pool_id
|
||||
return updated_pool
|
||||
|
||||
def _create_update_geofilter(
|
||||
self,
|
||||
geofilter_name,
|
||||
continents,
|
||||
countries,
|
||||
regions):
|
||||
geofilter = {
|
||||
'filterRulesLimit': 100,
|
||||
'name': geofilter_name,
|
||||
'geoipContinents': continents,
|
||||
'geoipCountries': countries,
|
||||
'regions': regions
|
||||
}
|
||||
if len(regions) == 0:
|
||||
geofilter.pop('regions', None)
|
||||
|
||||
existing_geofilter = self._client.geofilter(geofilter_name)
|
||||
if not existing_geofilter:
|
||||
return self._client.geofilter_create(geofilter)
|
||||
|
||||
geofilter_id = existing_geofilter['id']
|
||||
updated_geofilter = self._client.geofilter_update(
|
||||
geofilter_id, geofilter)
|
||||
updated_geofilter['id'] = geofilter_id
|
||||
return updated_geofilter
|
||||
|
||||
def _apply_Create(self, change, domain_name):
|
||||
new = change.new
|
||||
params_for = getattr(self, '_params_for_{}'.format(new._type))
|
||||
pools = self._handle_pools(new)
|
||||
|
||||
for params in params_for(new):
|
||||
self._client.record_create(new.zone.name, new._type, params)
|
||||
if len(pools) == 0:
|
||||
self._client.record_create(new.zone.name, new._type, params)
|
||||
elif len(pools) == 1:
|
||||
params['pools'] = [pools[0]['id']]
|
||||
params['recordOption'] = 'pools'
|
||||
params.pop('roundRobin', None)
|
||||
self.log.debug(
|
||||
"Creating record %s %s",
|
||||
new.zone.name,
|
||||
new._type
|
||||
)
|
||||
self._client.record_create(
|
||||
new.zone.name,
|
||||
new._type,
|
||||
params
|
||||
)
|
||||
else:
|
||||
# To use GeoIPFilter feature we need to enable it for domain
|
||||
self.log.debug("Enabling domain %s geo support", domain_name)
|
||||
self._client.domain_enable_geoip(domain_name)
|
||||
|
||||
def _apply_Update(self, change):
|
||||
self._apply_Delete(change)
|
||||
self._apply_Create(change)
|
||||
# First we need to create World Default (1) Record
|
||||
for pool in pools:
|
||||
if pool['geofilter'] != 1:
|
||||
continue
|
||||
params['pools'] = [pool['id']]
|
||||
params['recordOption'] = 'pools'
|
||||
params['geolocation'] = {
|
||||
'geoipUserRegion': [pool['geofilter']]
|
||||
}
|
||||
params.pop('roundRobin', None)
|
||||
self.log.debug(
|
||||
"Creating record %s %s",
|
||||
new.zone.name,
|
||||
new._type)
|
||||
self._client.record_create(
|
||||
new.zone.name,
|
||||
new._type,
|
||||
params
|
||||
)
|
||||
|
||||
def _apply_Delete(self, change):
|
||||
# Now we can create the rest of records
|
||||
for pool in pools:
|
||||
if pool['geofilter'] == 1:
|
||||
continue
|
||||
params['pools'] = [pool['id']]
|
||||
params['recordOption'] = 'pools'
|
||||
params['geolocation'] = {
|
||||
'geoipUserRegion': [pool['geofilter']]
|
||||
}
|
||||
params.pop('roundRobin', None)
|
||||
self.log.debug(
|
||||
"Creating record %s %s",
|
||||
new.zone.name,
|
||||
new._type)
|
||||
self._client.record_create(
|
||||
new.zone.name,
|
||||
new._type,
|
||||
params)
|
||||
|
||||
def _apply_Update(self, change, domain_name):
|
||||
self._apply_Delete(change, domain_name)
|
||||
self._apply_Create(change, domain_name)
|
||||
|
||||
def _apply_Delete(self, change, domain_name):
|
||||
existing = change.existing
|
||||
zone = existing.zone
|
||||
|
||||
# if it is dynamic pools record, we need to delete World Default last
|
||||
world_default_record = None
|
||||
|
||||
for record in self.zone_records(zone):
|
||||
if existing.name == record['name'] and \
|
||||
existing._type == record['type']:
|
||||
self._client.record_delete(zone.name, record['type'],
|
||||
record['id'])
|
||||
|
||||
# handle dynamic record
|
||||
if record['recordOption'] == 'pools':
|
||||
if record['geolocation'] is None:
|
||||
world_default_record = record
|
||||
else:
|
||||
if record['geolocation']['geoipFilter'] == 1:
|
||||
world_default_record = record
|
||||
else:
|
||||
# delete record
|
||||
self.log.debug(
|
||||
"Deleting record %s %s",
|
||||
zone.name,
|
||||
record['type'])
|
||||
self._client.record_delete(
|
||||
zone.name,
|
||||
record['type'],
|
||||
record['id'])
|
||||
# delete geofilter
|
||||
self.log.debug(
|
||||
"Deleting geofilter %s",
|
||||
zone.name)
|
||||
self._client.geofilter_delete(
|
||||
record['geolocation']['geoipFilter'])
|
||||
|
||||
# delete pool
|
||||
self.log.debug(
|
||||
"Deleting pool %s %s",
|
||||
zone.name,
|
||||
record['type'])
|
||||
self._client.pool_delete(
|
||||
record['type'],
|
||||
record['pools'][0])
|
||||
|
||||
# for all the rest records
|
||||
else:
|
||||
self._client.record_delete(
|
||||
zone.name, record['type'], record['id'])
|
||||
# delete World Default
|
||||
if world_default_record:
|
||||
# delete record
|
||||
self.log.debug(
|
||||
"Deleting record %s %s",
|
||||
zone.name,
|
||||
world_default_record['type']
|
||||
)
|
||||
self._client.record_delete(
|
||||
zone.name,
|
||||
world_default_record['type'],
|
||||
world_default_record['id']
|
||||
)
|
||||
# delete pool
|
||||
self.log.debug(
|
||||
"Deleting pool %s %s",
|
||||
zone.name,
|
||||
world_default_record['type']
|
||||
)
|
||||
self._client.pool_delete(
|
||||
world_default_record['type'],
|
||||
world_default_record['pools'][0]
|
||||
)
|
||||
|
||||
def _apply(self, plan):
|
||||
desired = plan.desired
|
||||
@@ -448,7 +880,9 @@ class ConstellixProvider(BaseProvider):
|
||||
|
||||
for change in changes:
|
||||
class_name = change.__class__.__name__
|
||||
getattr(self, '_apply_{}'.format(class_name))(change)
|
||||
getattr(self, f'_apply_{class_name}')(
|
||||
change,
|
||||
desired.name)
|
||||
|
||||
# Clear out the cache if any
|
||||
self._zone_records.pop(desired.name, None)
|
||||
|
||||
@@ -263,7 +263,7 @@ class DigitalOceanProvider(BaseProvider):
|
||||
def _params_for_CAA(self, record):
|
||||
for value in record.values:
|
||||
yield {
|
||||
'data': '{}.'.format(value.value),
|
||||
'data': value.value,
|
||||
'flags': value.flags,
|
||||
'name': record.name,
|
||||
'tag': value.tag,
|
||||
|
||||
@@ -145,16 +145,14 @@ class TransipProvider(BaseProvider):
|
||||
|
||||
_dns_entries = []
|
||||
for record in plan.desired.records:
|
||||
if record._type in self.SUPPORTS:
|
||||
entries_for = getattr(self,
|
||||
'_entries_for_{}'.format(record._type))
|
||||
entries_for = getattr(self, '_entries_for_{}'.format(record._type))
|
||||
|
||||
# Root records have '@' as name
|
||||
name = record.name
|
||||
if name == '':
|
||||
name = self.ROOT_RECORD
|
||||
# Root records have '@' as name
|
||||
name = record.name
|
||||
if name == '':
|
||||
name = self.ROOT_RECORD
|
||||
|
||||
_dns_entries.extend(entries_for(name, record))
|
||||
_dns_entries.extend(entries_for(name, record))
|
||||
|
||||
try:
|
||||
self._client.set_dns_entries(plan.desired.name[:-1], _dns_entries)
|
||||
|
||||
34
tests/fixtures/constellix-geofilters.json
vendored
Normal file
34
tests/fixtures/constellix-geofilters.json
vendored
Normal file
@@ -0,0 +1,34 @@
|
||||
[
|
||||
{
|
||||
"id": 6303,
|
||||
"name": "some.other",
|
||||
"filterRulesLimit": 100,
|
||||
"createdTs": "2021-08-19T14:47:47Z",
|
||||
"modifiedTs": "2021-08-19T14:47:47Z",
|
||||
"geoipContinents": ["AS", "OC"],
|
||||
"geoipCountries": ["ES", "SE", "UA"],
|
||||
"regions": [
|
||||
{
|
||||
"continentCode": "NA",
|
||||
"countryCode": "CA",
|
||||
"regionCode": "NL"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 5303,
|
||||
"name": "unit.tests.:www.dynamic:A:one",
|
||||
"filterRulesLimit": 100,
|
||||
"createdTs": "2021-08-19T14:47:47Z",
|
||||
"modifiedTs": "2021-08-19T14:47:47Z",
|
||||
"geoipContinents": ["AS", "OC"],
|
||||
"geoipCountries": ["ES", "SE", "UA"],
|
||||
"regions": [
|
||||
{
|
||||
"continentCode": "NA",
|
||||
"countryCode": "CA",
|
||||
"regionCode": "NL"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
62
tests/fixtures/constellix-pools.json
vendored
Normal file
62
tests/fixtures/constellix-pools.json
vendored
Normal file
@@ -0,0 +1,62 @@
|
||||
[
|
||||
{
|
||||
"id": 1808521,
|
||||
"name": "unit.tests.:www.dynamic:A:two",
|
||||
"type": "A",
|
||||
"numReturn": 1,
|
||||
"minAvailableFailover": 1,
|
||||
"createdTs": "2020-09-12T00:44:35Z",
|
||||
"modifiedTs": "2020-09-12T00:44:35Z",
|
||||
"appliedDomains": [
|
||||
{
|
||||
"id": 123123,
|
||||
"name": "unit.tests",
|
||||
"recordOption": "pools"
|
||||
}
|
||||
],
|
||||
"appliedTemplates": null,
|
||||
"unlinkedDomains": [],
|
||||
"unlinkedTemplates": null,
|
||||
"itoEnabled": false,
|
||||
"values": [
|
||||
{
|
||||
"value": "1.2.3.4",
|
||||
"weight": 1
|
||||
},
|
||||
{
|
||||
"value": "1.2.3.5",
|
||||
"weight": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 1808522,
|
||||
"name": "unit.tests.:www.dynamic:A:one",
|
||||
"type": "A",
|
||||
"numReturn": 1,
|
||||
"minAvailableFailover": 1,
|
||||
"createdTs": "2020-09-12T00:44:35Z",
|
||||
"modifiedTs": "2020-09-12T00:44:35Z",
|
||||
"appliedDomains": [
|
||||
{
|
||||
"id": 123123,
|
||||
"name": "unit.tests",
|
||||
"recordOption": "pools"
|
||||
}
|
||||
],
|
||||
"appliedTemplates": null,
|
||||
"unlinkedDomains": [],
|
||||
"unlinkedTemplates": null,
|
||||
"itoEnabled": false,
|
||||
"values": [
|
||||
{
|
||||
"value": "1.2.3.6",
|
||||
"weight": 1
|
||||
},
|
||||
{
|
||||
"value": "1.2.3.7",
|
||||
"weight": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
191
tests/fixtures/constellix-records.json
vendored
191
tests/fixtures/constellix-records.json
vendored
@@ -64,62 +64,6 @@
|
||||
"roundRobinFailover": [],
|
||||
"pools": [],
|
||||
"poolsDetail": []
|
||||
}, {
|
||||
"id": 1898527,
|
||||
"type": "SRV",
|
||||
"recordType": "srv",
|
||||
"name": "_imap._tcp",
|
||||
"recordOption": "roundRobin",
|
||||
"noAnswer": false,
|
||||
"note": "",
|
||||
"ttl": 600,
|
||||
"gtdRegion": 1,
|
||||
"parentId": 123123,
|
||||
"parent": "domain",
|
||||
"source": "Domain",
|
||||
"modifiedTs": 1565149714387,
|
||||
"value": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}],
|
||||
"roundRobin": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}]
|
||||
}, {
|
||||
"id": 1898528,
|
||||
"type": "SRV",
|
||||
"recordType": "srv",
|
||||
"name": "_pop3._tcp",
|
||||
"recordOption": "roundRobin",
|
||||
"noAnswer": false,
|
||||
"note": "",
|
||||
"ttl": 600,
|
||||
"gtdRegion": 1,
|
||||
"parentId": 123123,
|
||||
"parent": "domain",
|
||||
"source": "Domain",
|
||||
"modifiedTs": 1565149714387,
|
||||
"value": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}],
|
||||
"roundRobin": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}]
|
||||
}, {
|
||||
"id": 1808527,
|
||||
"type": "SRV",
|
||||
@@ -160,6 +104,62 @@
|
||||
"port": 30,
|
||||
"disableFlag": false
|
||||
}]
|
||||
}, {
|
||||
"id": 1808527,
|
||||
"type": "SRV",
|
||||
"recordType": "srv",
|
||||
"name": "_imap._tcp",
|
||||
"recordOption": "roundRobin",
|
||||
"noAnswer": false,
|
||||
"note": "",
|
||||
"ttl": 600,
|
||||
"gtdRegion": 1,
|
||||
"parentId": 123123,
|
||||
"parent": "domain",
|
||||
"source": "Domain",
|
||||
"modifiedTs": 1565149714387,
|
||||
"value": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}],
|
||||
"roundRobin": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}]
|
||||
}, {
|
||||
"id": 1808527,
|
||||
"type": "SRV",
|
||||
"recordType": "srv",
|
||||
"name": "_pop3._tcp",
|
||||
"recordOption": "roundRobin",
|
||||
"noAnswer": false,
|
||||
"note": "",
|
||||
"ttl": 600,
|
||||
"gtdRegion": 1,
|
||||
"parentId": 123123,
|
||||
"parent": "domain",
|
||||
"source": "Domain",
|
||||
"modifiedTs": 1565149714387,
|
||||
"value": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}],
|
||||
"roundRobin": [{
|
||||
"value": ".",
|
||||
"priority": 0,
|
||||
"weight": 0,
|
||||
"port": 0,
|
||||
"disableFlag": false
|
||||
}]
|
||||
}, {
|
||||
"id": 1808515,
|
||||
"type": "AAAA",
|
||||
@@ -614,4 +614,83 @@
|
||||
"roundRobinFailover": [],
|
||||
"pools": [],
|
||||
"poolsDetail": []
|
||||
}, {
|
||||
"id": 1808520,
|
||||
"type": "A",
|
||||
"recordType": "a",
|
||||
"name": "www.dynamic",
|
||||
"recordOption": "pools",
|
||||
"noAnswer": false,
|
||||
"note": "",
|
||||
"ttl": 300,
|
||||
"gtdRegion": 1,
|
||||
"parentId": 123123,
|
||||
"parent": "domain",
|
||||
"source": "Domain",
|
||||
"modifiedTs": 1565150090588,
|
||||
"value": [],
|
||||
"roundRobin": [],
|
||||
"geolocation": {
|
||||
"geoipFilter": 1
|
||||
},
|
||||
"recordFailover": {
|
||||
"disabled": false,
|
||||
"failoverType": 1,
|
||||
"failoverTypeStr": "Normal (always lowest level)",
|
||||
"values": []
|
||||
},
|
||||
"failover": {
|
||||
"disabled": false,
|
||||
"failoverType": 1,
|
||||
"failoverTypeStr": "Normal (always lowest level)",
|
||||
"values": []
|
||||
},
|
||||
"roundRobinFailover": [],
|
||||
"pools": [
|
||||
1808521
|
||||
],
|
||||
"poolsDetail": [{
|
||||
"id": 1808521,
|
||||
"name": "unit.tests.:www.dynamic:A:two"
|
||||
}]
|
||||
},
|
||||
{
|
||||
"id": 1808521,
|
||||
"type": "A",
|
||||
"recordType": "a",
|
||||
"name": "www.dynamic",
|
||||
"recordOption": "pools",
|
||||
"noAnswer": false,
|
||||
"note": "",
|
||||
"ttl": 300,
|
||||
"gtdRegion": 1,
|
||||
"parentId": 123123,
|
||||
"parent": "domain",
|
||||
"source": "Domain",
|
||||
"modifiedTs": 1565150090588,
|
||||
"value": [],
|
||||
"roundRobin": [],
|
||||
"geolocation": {
|
||||
"geoipFilter": 5303
|
||||
},
|
||||
"recordFailover": {
|
||||
"disabled": false,
|
||||
"failoverType": 1,
|
||||
"failoverTypeStr": "Normal (always lowest level)",
|
||||
"values": []
|
||||
},
|
||||
"failover": {
|
||||
"disabled": false,
|
||||
"failoverType": 1,
|
||||
"failoverTypeStr": "Normal (always lowest level)",
|
||||
"values": []
|
||||
},
|
||||
"roundRobinFailover": [],
|
||||
"pools": [
|
||||
1808522
|
||||
],
|
||||
"poolsDetail": [{
|
||||
"id": 1808522,
|
||||
"name": "unit.tests.:www.dynamic:A:one"
|
||||
}]
|
||||
}]
|
||||
|
||||
@@ -107,7 +107,7 @@ class PlannableProvider(BaseProvider):
|
||||
|
||||
SUPPORTS_GEO = False
|
||||
SUPPORTS_DYNAMIC = False
|
||||
SUPPORTS = set(('A',))
|
||||
SUPPORTS = set(('A', 'AAAA', 'TXT'))
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(PlannableProvider, self).__init__(*args, **kwargs)
|
||||
|
||||
@@ -21,7 +21,10 @@ from octodns.zone import Zone
|
||||
class HelperProvider(BaseProvider):
|
||||
log = getLogger('HelperProvider')
|
||||
|
||||
SUPPORTS = set(('A',))
|
||||
SUPPORTS = set(('A', 'PTR'))
|
||||
SUPPORTS_MUTLIVALUE_PTR = False
|
||||
SUPPORTS_DYNAMIC = False
|
||||
|
||||
id = 'test'
|
||||
strict_supports = False
|
||||
|
||||
@@ -234,6 +237,10 @@ class TestBaseProvider(TestCase):
|
||||
self.assertFalse(plan)
|
||||
|
||||
def test_process_desired_zone(self):
|
||||
provider = HelperProvider('test')
|
||||
|
||||
# SUPPORTS_MUTLIVALUE_PTR
|
||||
provider.SUPPORTS_MUTLIVALUE_PTR = False
|
||||
zone1 = Zone('unit.tests.', [])
|
||||
record1 = Record.new(zone1, 'ptr', {
|
||||
'type': 'PTR',
|
||||
@@ -242,11 +249,51 @@ class TestBaseProvider(TestCase):
|
||||
})
|
||||
zone1.add_record(record1)
|
||||
|
||||
zone2 = HelperProvider('hasptr')._process_desired_zone(zone1)
|
||||
zone2 = provider._process_desired_zone(zone1.copy())
|
||||
record2 = list(zone2.records)[0]
|
||||
|
||||
self.assertEqual(len(record2.values), 1)
|
||||
|
||||
provider.SUPPORTS_MUTLIVALUE_PTR = True
|
||||
zone2 = provider._process_desired_zone(zone1.copy())
|
||||
record2 = list(zone2.records)[0]
|
||||
from pprint import pprint
|
||||
pprint([
|
||||
record1, record2
|
||||
])
|
||||
self.assertEqual(len(record2.values), 2)
|
||||
|
||||
# SUPPORTS_DYNAMIC
|
||||
provider.SUPPORTS_DYNAMIC = False
|
||||
zone1 = Zone('unit.tests.', [])
|
||||
record1 = Record.new(zone1, 'a', {
|
||||
'dynamic': {
|
||||
'pools': {
|
||||
'one': {
|
||||
'values': [{
|
||||
'value': '1.1.1.1',
|
||||
}],
|
||||
},
|
||||
},
|
||||
'rules': [{
|
||||
'pool': 'one',
|
||||
}],
|
||||
},
|
||||
'type': 'A',
|
||||
'ttl': 3600,
|
||||
'values': ['2.2.2.2'],
|
||||
})
|
||||
self.assertTrue(record1.dynamic)
|
||||
zone1.add_record(record1)
|
||||
|
||||
zone2 = provider._process_desired_zone(zone1.copy())
|
||||
record2 = list(zone2.records)[0]
|
||||
self.assertFalse(record2.dynamic)
|
||||
|
||||
provider.SUPPORTS_DYNAMIC = True
|
||||
zone2 = provider._process_desired_zone(zone1.copy())
|
||||
record2 = list(zone2.records)[0]
|
||||
self.assertTrue(record2.dynamic)
|
||||
|
||||
def test_safe_none(self):
|
||||
# No changes is safe
|
||||
Plan(None, None, [], True).raise_if_unsafe()
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -186,7 +186,7 @@ class TestDigitalOceanProvider(TestCase):
|
||||
'name': '@',
|
||||
'ttl': 300, 'type': 'A'}),
|
||||
call('POST', '/domains/unit.tests/records', data={
|
||||
'data': 'ca.unit.tests.',
|
||||
'data': 'ca.unit.tests',
|
||||
'flags': 0, 'name': '@',
|
||||
'tag': 'issue',
|
||||
'ttl': 3600, 'type': 'CAA'}),
|
||||
|
||||
Reference in New Issue
Block a user