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

f-strings for UltraProvider

Browse Source
This commit is contained in:
Ross McFarland
2021-09-04 18:15:29 -07:00
parent 059bb5dbbc
commit f946900433
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
octodns/provider/ultra.py
View File

@@ -79,7 +79,7 @@ class UltraProvider(BaseProvider):
data=None, json=None, json_response=True): data=None, json=None, json_response=True):
self.log.debug('_request: method=%s, path=%s', method, path) self.log.debug('_request: method=%s, path=%s', method, path)
url = '{}{}'.format(self._base_uri, path) url = f'{self._base_uri}{path}'
resp = self._sess.request(method, resp = self._sess.request(method,
url, url,
params=params, params=params,
@@ -128,12 +128,12 @@ class UltraProvider(BaseProvider):
resp = self._post(path, data=data) resp = self._post(path, data=data)
self._sess.headers.update({ self._sess.headers.update({
'Authorization': 'Bearer {}'.format(resp['access_token']), 'Authorization': f'Bearer {resp["access_token"]}',
}) })
def __init__(self, id, account, username, password, timeout=TIMEOUT, def __init__(self, id, account, username, password, timeout=TIMEOUT,
*args, **kwargs): *args, **kwargs):
self.log = getLogger('UltraProvider[{}]'.format(id)) self.log = getLogger(f'UltraProvider[{id}]')
self.log.debug('__init__: id=%s, account=%s, username=%s, ' self.log.debug('__init__: id=%s, account=%s, username=%s, '
'password=***', id, account, username) 'password=***', id, account, username)
@@ -250,7 +250,7 @@ class UltraProvider(BaseProvider):
return [] return []
records = [] records = []
path = '/v2/zones/{}/rrsets'.format(zone.name) path = f'/v2/zones/{zone.name}/rrsets'
offset = 0 offset = 0
limit = 100 limit = 100
paging = True paging = True
@@ -269,7 +269,7 @@ class UltraProvider(BaseProvider):
return self._zone_records[zone.name] return self._zone_records[zone.name]
def _record_for(self, zone, name, _type, records, lenient): def _record_for(self, zone, name, _type, records, lenient):
data_for = getattr(self, '_data_for_{}'.format(_type)) data_for = getattr(self, f'_data_for_{_type}')
data = data_for(_type, records) data = data_for(_type, records)
record = Record.new(zone, name, data, source=self, lenient=lenient) record = Record.new(zone, name, data, source=self, lenient=lenient)
return record return record
@@ -327,7 +327,7 @@ class UltraProvider(BaseProvider):
for change in changes: for change in changes:
class_name = change.__class__.__name__ class_name = change.__class__.__name__
getattr(self, '_apply_{}'.format(class_name))(change) getattr(self, f'_apply_{class_name}')(change)
# Clear the cache # Clear the cache
self._zone_records.pop(name, None) self._zone_records.pop(name, None)
@@ -380,25 +380,20 @@ class UltraProvider(BaseProvider):
def _contents_for_SRV(self, record): def _contents_for_SRV(self, record):
return { return {
'ttl': record.ttl, 'ttl': record.ttl,
'rdata': ['{} {} {} {}'.format(x.priority, 'rdata': [f'{x.priority} {x.weight} {x.port} {x.target}'
x.weight, for x in record.values]
x.port,
x.target) for x in record.values]
} }
def _contents_for_CAA(self, record): def _contents_for_CAA(self, record):
return { return {
'ttl': record.ttl, 'ttl': record.ttl,
'rdata': ['{} {} {}'.format(x.flags, 'rdata': [f'{x.flags} {x.tag} {x.value}' for x in record.values]
x.tag,
x.value) for x in record.values]
} }
def _contents_for_MX(self, record): def _contents_for_MX(self, record):
return { return {
'ttl': record.ttl, 'ttl': record.ttl,
'rdata': ['{} {}'.format(x.preference, 'rdata': [f'{x.preference} {x.exchange}' for x in record.values]
x.exchange) for x in record.values]
} }
def _gen_data(self, record): def _gen_data(self, record):
@@ -410,10 +405,8 @@ class UltraProvider(BaseProvider):
else: else:
record_type = record._type record_type = record._type
path = '/v2/zones/{}/rrsets/{}/{}'.format(zone_name, path = f'/v2/zones/{zone_name}/rrsets/{record_type}/{record.fqdn}'
record_type, contents_for = getattr(self, f'_contents_for_{record._type}')
record.fqdn)
contents_for = getattr(self, '_contents_for_{}'.format(record._type))
return path, contents_for(record) return path, contents_for(record)
def _apply_Create(self, change): def _apply_Create(self, change):
@@ -459,7 +452,6 @@ class UltraProvider(BaseProvider):
if existing_type == "ALIAS": if existing_type == "ALIAS":
existing_type = "APEXALIAS" existing_type = "APEXALIAS"
path = '/v2/zones/{}/rrsets/{}/{}'.format(zone_name, path = f'/v2/zones/{zone_name}/rrsets/{existing_type}/' + \
existing_type, existing.fqdn
existing.fqdn)
self._delete(path, json_response=False) self._delete(path, json_response=False)