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

Merge branch 'master' of https://github.com/github/octodns into feature/cloudflare-auth-bearer

Browse Source
This commit is contained in:
Mark Mercado
2020-02-15 12:20:19 -05:00
parent cf3dc94315 b854453732
commit 78383df99f
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
octodns/provider/dnsimple.py
View File

@@ -30,16 +30,19 @@ class DnsimpleClientUnauthorized(DnsimpleClientException):
class DnsimpleClient(object): class DnsimpleClient(object):
BASE = 'https://api.dnsimple.com/v2/'
def __init__(self, token, account): def __init__(self, token, account, sandbox):
self.account = account self.account = account
sess = Session() sess = Session()
sess.headers.update({'Authorization': 'Bearer {}'.format(token)}) sess.headers.update({'Authorization': 'Bearer {}'.format(token)})
self._sess = sess self._sess = sess
if sandbox:
self.base = 'https://api.sandbox.dnsimple.com/v2/'
else:
self.base = 'https://api.dnsimple.com/v2/'
def _request(self, method, path, params=None, data=None): def _request(self, method, path, params=None, data=None):
url = '{}{}{}'.format(self.BASE, self.account, path) url = '{}{}{}'.format(self.base, self.account, path)
resp = self._sess.request(method, url, params=params, json=data) resp = self._sess.request(method, url, params=params, json=data)
if resp.status_code == 401: if resp.status_code == 401:
raise DnsimpleClientUnauthorized() raise DnsimpleClientUnauthorized()
@@ -89,17 +92,19 @@ class DnsimpleProvider(BaseProvider):
token: letmein token: letmein
# Your account number (required) # Your account number (required)
account: 42 account: 42
# Use sandbox (optional)
sandbox: true
''' '''
SUPPORTS_GEO = False SUPPORTS_GEO = False
SUPPORTS_DYNAMIC = False SUPPORTS_DYNAMIC = False
SUPPORTS = set(('A', 'AAAA', 'ALIAS', 'CAA', 'CNAME', 'MX', 'NAPTR', 'NS', SUPPORTS = set(('A', 'AAAA', 'ALIAS', 'CAA', 'CNAME', 'MX', 'NAPTR', 'NS',
'PTR', 'SPF', 'SRV', 'SSHFP', 'TXT')) 'PTR', 'SPF', 'SRV', 'SSHFP', 'TXT'))
def __init__(self, id, token, account, *args, **kwargs): def __init__(self, id, token, account, sandbox=False, *args, **kwargs):
self.log = logging.getLogger('DnsimpleProvider[{}]'.format(id)) self.log = logging.getLogger('DnsimpleProvider[{}]'.format(id))
self.log.debug('__init__: id=%s, token=***, account=%s', id, account) self.log.debug('__init__: id=%s, token=***, account=%s', id, account)
super(DnsimpleProvider, self).__init__(id, *args, **kwargs) super(DnsimpleProvider, self).__init__(id, *args, **kwargs)
self._client = DnsimpleClient(token, account) self._client = DnsimpleClient(token, account, sandbox)
self._zone_records = {} self._zone_records = {}

8
requirements.txt
View File

@@ -1,8 +1,8 @@
PyYaml==5.3 PyYaml==5.3
azure-common==1.1.24 azure-common==1.1.24
azure-mgmt-dns==3.0.0 azure-mgmt-dns==3.0.0
boto3==1.11.9 boto3==1.11.13
botocore==1.14.9 botocore==1.14.13
dnspython==1.16.0 dnspython==1.16.0
docutils==0.16 docutils==0.16
dyn==1.8.1 dyn==1.8.1
@@ -14,13 +14,13 @@ ipaddress==1.0.23
jmespath==0.9.4 jmespath==0.9.4
msrestazure==0.6.2 msrestazure==0.6.2
natsort==6.2.1 natsort==6.2.1
ns1-python==0.13.0 ns1-python==0.14.0
ovh==0.5.0 ovh==0.5.0
pycountry-convert==0.7.2 pycountry-convert==0.7.2
pycountry==19.8.18 pycountry==19.8.18
python-dateutil==2.8.1 python-dateutil==2.8.1
requests==2.22.0 requests==2.22.0
s3transfer==0.3.2 s3transfer==0.3.3
setuptools==44.0.0 setuptools==44.0.0
six==1.14.0 six==1.14.0
transip==2.0.0 transip==2.0.0

6
tests/test_octodns_provider_dnsimple.py
View File

@@ -38,7 +38,13 @@ class TestDnsimpleProvider(TestCase):
break break
def test_populate(self): def test_populate(self):
# Sandbox
provider = DnsimpleProvider('test', 'token', 42, 'true')
self.assertTrue('sandbox' in provider._client.base)
provider = DnsimpleProvider('test', 'token', 42) provider = DnsimpleProvider('test', 'token', 42)
self.assertFalse('sandbox' in provider._client.base)
# Bad auth # Bad auth
with requests_mock() as mock: with requests_mock() as mock: