openstack/election
Code Issues Proposed changes

Update for new gerrit API

Browse Source 
The recent 2.11 -> 2.13 gerrit update had a hidden API chnage that broke
our tools.

Compare:
 * https://gerrit-documentation.storage.googleapis.com/Documentation/2.11.10/rest-api-accounts.html#suggest-account
 * https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#query-account

This change added the addition o=DETAILS and uses requests for
parameter encoding

Change-Id: I0a4670c58080ceb0d4c6993b3c57f6d4f96f3914
This commit is contained in:
Tony Breeds 2017-09-21 12:49:59 -04:00
parent d080390617
commit acdee44eb3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_election/utils.py
View File

@ -66,8 +66,8 @@ def gerrit_datetime(dt):
return dt.strftime('%Y-%m-%d %H:%M:%S %z') return dt.strftime('%Y-%m-%d %H:%M:%S %z')
def gerrit_query(url): def gerrit_query(url, params=None):
r = requests.get(url) r = requests.get(url, params=params)
if r.status_code == 200: if r.status_code == 200:
data = json.loads(r.text[4:]) data = json.loads(r.text[4:])
else: else:
@ -87,8 +87,8 @@ def get_email(filepath):
def get_gerrit_account(email): def get_gerrit_account(email):
url = '%s/accounts/?q=%s' % (GERRIT_BASE, email) accounts = gerrit_query('%s/accounts/' % (GERRIT_BASE),
accounts = gerrit_query(url) params={'q': email, 'o': ['DETAILS']})
if not accounts: if not accounts:
raise ValueError("Couldn't find gerrit account with '%s'" % email) raise ValueError("Couldn't find gerrit account with '%s'" % email)
if len(accounts) != 1: if len(accounts) != 1: