X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/678f1f53466c3f2133f63a6e6ad553f5e5d14804..60801a7c485c50e3c2f518f9b3ad6f86c8783fca:/lib/controller/railsproxy/railsproxy.go diff --git a/lib/controller/railsproxy/railsproxy.go b/lib/controller/railsproxy/railsproxy.go index 576e603eed..ff9de36b75 100644 --- a/lib/controller/railsproxy/railsproxy.go +++ b/lib/controller/railsproxy/railsproxy.go @@ -7,15 +7,12 @@ package railsproxy import ( - "context" - "errors" "fmt" "net/url" "strings" - "git.curoverse.com/arvados.git/lib/controller/rpc" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/auth" + "git.arvados.org/arvados.git/lib/controller/rpc" + "git.arvados.org/arvados.git/sdk/go/arvados" ) // For now, FindRailsAPI always uses the rails API running on this @@ -40,13 +37,5 @@ func NewConn(cluster *arvados.Cluster) *rpc.Conn { if err != nil { panic(err) } - return rpc.NewConn(cluster.ClusterID, url, insecure, provideIncomingToken) -} - -func provideIncomingToken(ctx context.Context) ([]string, error) { - incoming, ok := auth.FromContext(ctx) - if !ok { - return nil, errors.New("no token provided") - } - return incoming.Tokens, nil + return rpc.NewConn(cluster.ClusterID, url, insecure, rpc.PassthroughTokenProvider) }