From b32c4f1abc275d68263cdef4e772c65dcad92d4b Mon Sep 17 00:00:00 2001 From: Allen Li Date: Tue, 17 Sep 2024 20:31:42 +0000 Subject: [PATCH] [gerrit_util] Add auth parameter to GetAccountDetails We need to use this to determine if an account exists to determine what auth to use, so we have to be able to override the default auth detection. Bug: b/366261039 Change-Id: I814b47ac1518170846ff9a7e5dc210f26db3e985 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5869049 Reviewed-by: Josip Sokcevic Commit-Queue: Allen Li --- gerrit_util.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gerrit_util.py b/gerrit_util.py index c5cf716a5..22cc4b887 100644 --- a/gerrit_util.py +++ b/gerrit_util.py @@ -1778,7 +1778,10 @@ def GetProjectHead(host, project): return ReadHttpJsonResponse(conn, accept_statuses=[200]) -def GetAccountDetails(host, account_id='self'): +def GetAccountDetails(host, + account_id='self', + *, + authenticator: Optional[_Authenticator] = None): """Returns details of the account. If account_id is not given, uses magic value 'self' which corresponds to @@ -1789,7 +1792,9 @@ def GetAccountDetails(host, account_id='self'): Returns None if account is not found (i.e., Gerrit returned 404). """ - conn = CreateHttpConn(host, '/accounts/%s' % account_id) + conn = CreateHttpConn(host, + '/accounts/%s' % account_id, + authenticator=authenticator) return ReadHttpJsonResponse(conn, accept_statuses=[200, 404])