20497: Give brief instructions for reviewing subprocess output

[arvados.git] / lib / controller / localdb / login_oidc.go

diff --git a/lib/controller/localdb/login_oidc.go b/lib/controller/localdb/login_oidc.go
index 481e6867dbb797ad1a23e3a9c399525f40dd0678..65e2e250e54066e9276747fc156988b44247af5b 100644 (file)
--- a/lib/controller/localdb/login_oidc.go
+++ b/lib/controller/localdb/login_oidc.go
@@ -30,7 +30,7 @@ import (
        "git.arvados.org/arvados.git/sdk/go/auth"
        "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "git.arvados.org/arvados.git/sdk/go/httpserver"
-       "github.com/coreos/go-oidc"
+       "github.com/coreos/go-oidc/v3/oidc"
        lru "github.com/hashicorp/golang-lru"
        "github.com/jmoiron/sqlx"
        "github.com/lib/pq"
@@ -340,7 +340,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, _ := NewConn(cluster).loginController.(*oidcLoginController)
+       ctrl, _ := NewConn(context.Background(), cluster, getdb).loginController.(*oidcLoginController)
        cache, err := lru.New2Q(tokenCacheSize)
        if err != nil {
                panic(err)