X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e6617f0bff3521135bc63b229260fdfb7b9dc331..988db9dc5af7e2c06e2a6106d2ce32275e3da7a4:/lib/controller/railsproxy/railsproxy.go?ds=sidebyside

diff --git a/lib/controller/railsproxy/railsproxy.go b/lib/controller/railsproxy/railsproxy.go
index 5070fa396d..515dd5df0f 100644
--- 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 := ctx.Value(auth.ContextKeyCredentials).(*auth.Credentials)
-	if !ok {
-		return nil, errors.New("no token provided")
-	}
-	return incoming.Tokens, nil
+	return rpc.NewConn(cluster.ClusterID, url, insecure, rpc.PassthroughTokenProvider)
 }