[ARVADOS] updated: 2.1.0-97-g00ca53322

Git user git at public.arvados.org
Mon Nov 16 19:44:27 UTC 2020


Summary of changes:
 lib/controller/localdb/login_oidc.go |  5 ++---
 sdk/go/arvadostest/api.go            | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

       via  00ca5332212f0e7f091d9e952c07e2205b255ec6 (commit)
      from  03b1e0f42a6eb83dc5ce1b6ec7fd8ec35f6a8fd1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 00ca5332212f0e7f091d9e952c07e2205b255ec6
Author: Nico Cesar <nico at nicocesar.com>
Date:   Mon Nov 16 14:43:38 2020 -0500

    17014: rebase with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>17014: rebase
    with master and adaptation changes
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/localdb/login_oidc.go b/lib/controller/localdb/login_oidc.go
index a41a93da1..b99a1c2aa 100644
--- a/lib/controller/localdb/login_oidc.go
+++ b/lib/controller/localdb/login_oidc.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"git.arvados.org/arvados.git/lib/controller/api"
-	"git.arvados.org/arvados.git/lib/controller/railsproxy"
 	"git.arvados.org/arvados.git/lib/controller/rpc"
 	"git.arvados.org/arvados.git/lib/ctrlctx"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
@@ -322,7 +321,7 @@ func OIDCAccessTokenAuthorizer(cluster *arvados.Cluster, getdb func(context.Cont
 	// We want ctrl to be nil if the chosen controller is not a
 	// *oidcLoginController, so we can ignore the 2nd return value
 	// of this type cast.
-	ctrl, _ := chooseLoginController(cluster, railsproxy.NewConn(cluster)).(*oidcLoginController)
+	ctrl, _ := NewConn(cluster).loginController.(*oidcLoginController)
 	cache, err := lru.New2Q(tokenCacheSize)
 	if err != nil {
 		panic(err)
@@ -474,7 +473,7 @@ func (ta *oidcTokenAuthorizer) registerToken(ctx context.Context, tok string) er
 		}
 		ctxlog.FromContext(ctx).WithField("HMAC", hmac).Debug("(*oidcTokenAuthorizer)registerToken: updated api_client_authorizations row")
 	} else {
-		aca, err = createAPIClientAuthorization(ctx, ta.ctrl.RailsProxy, ta.ctrl.Cluster.SystemRootToken, *authinfo)
+		aca, err = ta.ctrl.Parent.CreateAPIClientAuthorization(ctx, ta.ctrl.Cluster.SystemRootToken, *authinfo)
 		if err != nil {
 			return err
 		}
diff --git a/sdk/go/arvadostest/api.go b/sdk/go/arvadostest/api.go
index fe600257f..df3e46feb 100644
--- a/sdk/go/arvadostest/api.go
+++ b/sdk/go/arvadostest/api.go
@@ -106,23 +106,23 @@ func (as *APIStub) ContainerUnlock(ctx context.Context, options arvados.GetOptio
 	return arvados.Container{}, as.Error
 }
 func (as *APIStub) ContainerRequestCreate(ctx context.Context, options arvados.CreateOptions) (arvados.ContainerRequest, error) {
-	as.appendCall(as.ContainerRequestCreate, ctx, options)
+	as.appendCall(ctx, as.ContainerRequestCreate, options)
 	return arvados.ContainerRequest{}, as.Error
 }
 func (as *APIStub) ContainerRequestUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.ContainerRequest, error) {
-	as.appendCall(as.ContainerRequestUpdate, ctx, options)
+	as.appendCall(ctx, as.ContainerRequestUpdate, options)
 	return arvados.ContainerRequest{}, as.Error
 }
 func (as *APIStub) ContainerRequestGet(ctx context.Context, options arvados.GetOptions) (arvados.ContainerRequest, error) {
-	as.appendCall(as.ContainerRequestGet, ctx, options)
+	as.appendCall(ctx, as.ContainerRequestGet, options)
 	return arvados.ContainerRequest{}, as.Error
 }
 func (as *APIStub) ContainerRequestList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerRequestList, error) {
-	as.appendCall(as.ContainerRequestList, ctx, options)
+	as.appendCall(ctx, as.ContainerRequestList, options)
 	return arvados.ContainerRequestList{}, as.Error
 }
 func (as *APIStub) ContainerRequestDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.ContainerRequest, error) {
-	as.appendCall(as.ContainerRequestDelete, ctx, options)
+	as.appendCall(ctx, as.ContainerRequestDelete, options)
 	return arvados.ContainerRequest{}, as.Error
 }
 func (as *APIStub) SpecimenCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Specimen, error) {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list