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

Address Ns1Provider review feedback

Browse Source
This commit is contained in:
Ross McFarland
2020-01-13 07:29:38 -08:00
parent 4d8f275e68
commit 01a9fa87b1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
octodns/provider/ns1.py
View File

@@ -655,9 +655,9 @@ class Ns1Provider(BaseProvider):
host = record.fqdn[:-1] host = record.fqdn[:-1]
_type = record._type _type = record._type
request = 'GET {path} HTTP/1.0\\r\\nHost: {host}\\r\\n' \ request = r'GET {path} HTTP/1.0\r\nHost: {host}\r\n' \
'User-agent: NS1\\r\\n\\r\\n'.format(path=record.healthcheck_path, r'User-agent: NS1\r\n\r\n'.format(path=record.healthcheck_path,
host=record.healthcheck_host) host=record.healthcheck_host)
return { return {
'active': True, 'active': True,
@@ -771,13 +771,13 @@ class Ns1Provider(BaseProvider):
for geo in rule.data.get('geos', []): for geo in rule.data.get('geos', []):
n = len(geo) n = len(geo)
if n == 8: if n == 8:
# US state # US state, e.g. NA-US-KY
us_state.add(geo[-2:]) us_state.add(geo[-2:])
elif n == 5: elif n == 5:
# Country # Country, e.g. EU-FR
country.add(geo[-2:]) country.add(geo[-2:])
else: else:
# Continent # Continent, e.g. AS
georegion.update(self._CONTINENT_TO_REGIONS[geo]) georegion.update(self._CONTINENT_TO_REGIONS[geo])
meta = { meta = {
@@ -826,7 +826,9 @@ class Ns1Provider(BaseProvider):
# Dynamic/health checked # Dynamic/health checked
current_pool_name = pool_name current_pool_name = pool_name
while current_pool_name: seen = set()
while current_pool_name and current_pool_name not in seen:
seen.add(current_pool_name)
pool = pools[current_pool_name] pool = pools[current_pool_name]
for answer in pool_answers[current_pool_name]: for answer in pool_answers[current_pool_name]:
answer = { answer = {