mirror of
https://github.com/github/octodns.git
synced 2024-05-11 05:55:00 +00:00
f-strings for RackspaceProvider
This commit is contained in:
@@ -58,7 +58,7 @@ class RackspaceProvider(BaseProvider):
|
||||
# The api key that grants access for that user (required)
|
||||
api_key: api-key
|
||||
'''
|
||||
self.log = logging.getLogger('RackspaceProvider[{}]'.format(id))
|
||||
self.log = logging.getLogger(f'RackspaceProvider[{id}]')
|
||||
super(RackspaceProvider, self).__init__(id, *args, **kwargs)
|
||||
|
||||
auth_token, dns_endpoint = self._get_auth_token(username, api_key)
|
||||
@@ -91,7 +91,7 @@ class RackspaceProvider(BaseProvider):
|
||||
|
||||
def _request(self, method, path, data=None, pagination_key=None):
|
||||
self.log.debug('_request: method=%s, path=%s', method, path)
|
||||
url = '{}/{}'.format(self.dns_endpoint, path)
|
||||
url = f'{self.dns_endpoint}/{path}'
|
||||
|
||||
if pagination_key:
|
||||
resp = self._paginated_request_for_url(method, url, data,
|
||||
@@ -194,8 +194,7 @@ class RackspaceProvider(BaseProvider):
|
||||
resp_data = None
|
||||
try:
|
||||
domain_id = self._get_zone_id_for(zone)
|
||||
resp_data = self._request('GET',
|
||||
'domains/{}/records'.format(domain_id),
|
||||
resp_data = self._request('GET', f'domains/{domain_id}/records',
|
||||
pagination_key='records')
|
||||
self.log.debug('populate: loaded')
|
||||
except HTTPError as e:
|
||||
@@ -213,8 +212,7 @@ class RackspaceProvider(BaseProvider):
|
||||
records = self._group_records(resp_data)
|
||||
for record_type, records_of_type in records.items():
|
||||
for raw_record_name, record_set in records_of_type.items():
|
||||
data_for = getattr(self,
|
||||
'_data_for_{}'.format(record_type))
|
||||
data_for = getattr(self, f'_data_for_{record_type}')
|
||||
record_name = zone.hostname_from_fqdn(raw_record_name)
|
||||
record = Record.new(zone, record_name,
|
||||
data_for(record_set),
|
||||
@@ -291,7 +289,7 @@ class RackspaceProvider(BaseProvider):
|
||||
self._get_values(change.new))
|
||||
|
||||
def _create_given_change_values(self, change, values):
|
||||
transformer = getattr(self, "_record_for_{}".format(change.new._type))
|
||||
transformer = getattr(self, f"_record_for_{change.new._type}")
|
||||
return [transformer(change.new, v) for v in values]
|
||||
|
||||
def _mod_Update(self, change):
|
||||
@@ -311,8 +309,7 @@ class RackspaceProvider(BaseProvider):
|
||||
update_out = []
|
||||
update_values = set(new_values).intersection(set(existing_values))
|
||||
for value in update_values:
|
||||
transformer = getattr(self,
|
||||
"_record_for_{}".format(change.new._type))
|
||||
transformer = getattr(self, f"_record_for_{change.new._type}")
|
||||
prior_rs_record = transformer(change.existing, value)
|
||||
prior_key = self._key_for_record(prior_rs_record)
|
||||
next_rs_record = transformer(change.new, value)
|
||||
@@ -329,8 +326,7 @@ class RackspaceProvider(BaseProvider):
|
||||
change.existing))
|
||||
|
||||
def _delete_given_change_values(self, change, values):
|
||||
transformer = getattr(self, "_record_for_{}".format(
|
||||
change.existing._type))
|
||||
transformer = getattr(self, f"_record_for_{change.existing._type}")
|
||||
out = []
|
||||
for value in values:
|
||||
rs_record = transformer(change.existing, value)
|
||||
@@ -367,12 +363,12 @@ class RackspaceProvider(BaseProvider):
|
||||
|
||||
if deletes:
|
||||
params = "&".join(sorted(deletes))
|
||||
self._delete('domains/{}/records?{}'.format(domain_id, params))
|
||||
self._delete(f'domains/{domain_id}/records?{params}')
|
||||
|
||||
if updates:
|
||||
data = {"records": sorted(updates, key=_value_keyer)}
|
||||
self._put('domains/{}/records'.format(domain_id), data=data)
|
||||
self._put(f'domains/{domain_id}/records', data=data)
|
||||
|
||||
if creates:
|
||||
data = {"records": sorted(creates, key=_value_keyer)}
|
||||
self._post('domains/{}/records'.format(domain_id), data=data)
|
||||
self._post(f'domains/{domain_id}/records', data=data)
|
||||
|
||||
Reference in New Issue
Block a user