Merge branch '18349-fed-request-id'

[arvados.git] / lib / controller / railsproxy / railsproxy.go

diff --git a/lib/controller/railsproxy/railsproxy.go b/lib/controller/railsproxy/railsproxy.go
index 576e603eedd758f8ff53f2556e1161b6957b0691..515dd5df0fa65b76b9fb20136e12eaca89623b16 100644 (file)
--- a/lib/controller/railsproxy/railsproxy.go
+++ b/lib/controller/railsproxy/railsproxy.go
@@ -7,19 +7,15 @@
 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
-// node.
+// FindRailsAPI always uses the rails API running on this node, for now.
 func FindRailsAPI(cluster *arvados.Cluster) (*url.URL, bool, error) {
        var best *url.URL
        for target := range cluster.Services.RailsAPI.InternalURLs {
@@ -40,13 +36,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)
 }