Skip to content

clouddns - client quota failing, unable to handle list in response. #5085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cycomike wants to merge 3 commits into from
Closed

clouddns - client quota failing, unable to handle list in response. #5085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4437bc4
Checking for list in quota to address Google DNS API changes
cycomike Mar 20, 2018
15dea82
Merge branch 'master' of https://github.com/cycomike/google-cloud-python
cycomike Mar 21, 2018
a7e957f
Merge branch 'master' of https://github.com/GoogleCloudPlatform/googl…
michaelgrantham Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dns/google/cloud/dns/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def quotas(self):

return {key: int(value)
for key, value in resp['quota'].items()
if key != 'kind'}
if key != 'kind' and type(value) is not list}

def list_zones(self, max_results=None, page_token=None):
"""List zones for the project associated with this client.
Expand Down
4 changes: 3 additions & 1 deletion dns/tests/unit/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,12 @@ def test_quotas_w_kind_key(self):
'rrsetAdditionsPerChange': str(RRSET_ADDITIONS),
'rrsetDeletionsPerChange': str(RRSET_DELETIONS),
'totalRrdataSizePerChange': str(TOTAL_SIZE),
'whitelistedKeySpecs': [{"x":"y","a":"b"},{"x":"y","z":"a"}]
}
}
CONVERTED = {key: int(value)
for key, value in DATA['quota'].items()}
for key, value in DATA['quota'].items()
if type(value) is not list}
WITH_KIND = {'quota': DATA['quota'].copy()}
WITH_KIND['quota']['kind'] = 'dns#quota'
creds = _make_credentials()
Expand Down