X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/99a68365532a28a78d20461620c9a6bc7c54050d..4a919918a4ce37b5290793f02fa959db1c073590:/lib/controller/federation/conn.go

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 14e6a90614..3bcafacd2c 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -5,8 +5,10 @@
 package federation
 
 import (
+	"bytes"
 	"context"
 	"crypto/md5"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -14,6 +16,7 @@ import (
 	"regexp"
 	"strings"
 
+	"git.curoverse.com/arvados.git/lib/config"
 	"git.curoverse.com/arvados.git/lib/controller/railsproxy"
 	"git.curoverse.com/arvados.git/lib/controller/rpc"
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
@@ -21,38 +24,13 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
 )
 
-type Interface interface {
-	CollectionCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Collection, error)
-	CollectionUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.Collection, error)
-	CollectionGet(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error)
-	CollectionList(ctx context.Context, options arvados.ListOptions) (arvados.CollectionList, error)
-	CollectionProvenance(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error)
-	CollectionUsedBy(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error)
-	CollectionDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Collection, error)
-	CollectionTrash(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error)
-	CollectionUntrash(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error)
-	ContainerCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Container, error)
-	ContainerUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.Container, error)
-	ContainerGet(ctx context.Context, options arvados.GetOptions) (arvados.Container, error)
-	ContainerList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerList, error)
-	ContainerDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Container, error)
-	ContainerLock(ctx context.Context, options arvados.GetOptions) (arvados.Container, error)
-	ContainerUnlock(ctx context.Context, options arvados.GetOptions) (arvados.Container, error)
-	SpecimenCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Specimen, error)
-	SpecimenUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.Specimen, error)
-	SpecimenGet(ctx context.Context, options arvados.GetOptions) (arvados.Specimen, error)
-	SpecimenList(ctx context.Context, options arvados.ListOptions) (arvados.SpecimenList, error)
-	SpecimenDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Specimen, error)
-	APIClientAuthorizationCurrent(ctx context.Context, options arvados.GetOptions) (arvados.APIClientAuthorization, error)
-}
-
 type Conn struct {
 	cluster *arvados.Cluster
 	local   backend
 	remotes map[string]backend
 }
 
-func New(cluster *arvados.Cluster) Interface {
+func New(cluster *arvados.Cluster) *Conn {
 	local := railsproxy.NewConn(cluster)
 	remotes := map[string]backend{}
 	for id, remote := range cluster.RemoteClusters {
@@ -76,7 +54,7 @@ func New(cluster *arvados.Cluster) Interface {
 func saltedTokenProvider(local backend, remoteID string) rpc.TokenProvider {
 	return func(ctx context.Context) ([]string, error) {
 		var tokens []string
-		incoming, ok := ctx.Value(auth.ContextKeyCredentials).(*auth.Credentials)
+		incoming, ok := auth.FromContext(ctx)
 		if !ok {
 			return nil, errors.New("no token provided")
 		}
@@ -88,7 +66,7 @@ func saltedTokenProvider(local backend, remoteID string) rpc.TokenProvider {
 			case auth.ErrSalted:
 				tokens = append(tokens, token)
 			case auth.ErrObsoleteToken:
-				ctx := context.WithValue(ctx, auth.ContextKeyCredentials, &auth.Credentials{Tokens: []string{token}})
+				ctx := auth.NewContext(ctx, &auth.Credentials{Tokens: []string{token}})
 				aca, err := local.APIClientAuthorizationCurrent(ctx, arvados.GetOptions{})
 				if errStatus(err) == http.StatusUnauthorized {
 					// pass through unmodified
@@ -113,8 +91,11 @@ func saltedTokenProvider(local backend, remoteID string) rpc.TokenProvider {
 // Return suitable backend for a query about the given cluster ID
 // ("aaaaa") or object UUID ("aaaaa-dz642-abcdefghijklmno").
 func (conn *Conn) chooseBackend(id string) backend {
-	if len(id) > 5 {
+	if len(id) == 27 {
 		id = id[:5]
+	} else if len(id) != 5 {
+		// PDH or bogus ID
+		return conn.local
 	}
 	if id == conn.cluster.ClusterID {
 		return conn.local
@@ -161,8 +142,7 @@ func (conn *Conn) tryLocalThenRemotes(ctx context.Context, fn func(context.Conte
 	if all404 {
 		return notFoundError{}
 	}
-	// FIXME: choose appropriate HTTP status
-	return fmt.Errorf("errors: %v", errs)
+	return httpErrorf(http.StatusBadGateway, "errors: %v", errs)
 }
 
 func (conn *Conn) CollectionCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Collection, error) {
@@ -199,6 +179,12 @@ func portableDataHash(mt string) string {
 	return fmt.Sprintf("%x+%d", h.Sum(nil), size)
 }
 
+func (conn *Conn) ConfigGet(ctx context.Context) (json.RawMessage, error) {
+	var buf bytes.Buffer
+	err := config.ExportJSON(&buf, conn.cluster)
+	return json.RawMessage(buf.Bytes()), err
+}
+
 func (conn *Conn) CollectionGet(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error) {
 	if len(options.UUID) == 27 {
 		// UUID is really a UUID
@@ -219,8 +205,9 @@ func (conn *Conn) CollectionGet(ctx context.Context, options arvados.GetOptions)
 			// hash+size+hints; only hash+size need to
 			// match the computed PDH.
 			if pdh := portableDataHash(c.ManifestText); pdh != options.UUID && !strings.HasPrefix(options.UUID, pdh+"+") {
-				ctxlog.FromContext(ctx).Warnf("bad portable data hash %q received from remote %q (expected %q)", pdh, remoteID, options.UUID)
-				return notFoundError{}
+				err = httpErrorf(http.StatusBadGateway, "bad portable data hash %q received from remote %q (expected %q)", pdh, remoteID, options.UUID)
+				ctxlog.FromContext(ctx).Warn(err)
+				return err
 			}
 			if remoteID != "" {
 				c.ManifestText = rewriteManifest(c.ManifestText, remoteID)
@@ -240,27 +227,23 @@ func (conn *Conn) CollectionGet(ctx context.Context, options arvados.GetOptions)
 	}
 }
 
-func (conn *Conn) CollectionList(ctx context.Context, options arvados.ListOptions) (arvados.CollectionList, error) {
-	return conn.local.CollectionList(ctx, options)
-}
-
 func (conn *Conn) CollectionProvenance(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error) {
-	return conn.local.CollectionProvenance(ctx, options)
+	return conn.chooseBackend(options.UUID).CollectionProvenance(ctx, options)
 }
 
 func (conn *Conn) CollectionUsedBy(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error) {
-	return conn.local.CollectionUsedBy(ctx, options)
+	return conn.chooseBackend(options.UUID).CollectionUsedBy(ctx, options)
 }
 
 func (conn *Conn) CollectionDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Collection, error) {
 	return conn.chooseBackend(options.UUID).CollectionDelete(ctx, options)
 }
 
-func (conn *Conn) CollectionTrash(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error) {
+func (conn *Conn) CollectionTrash(ctx context.Context, options arvados.DeleteOptions) (arvados.Collection, error) {
 	return conn.chooseBackend(options.UUID).CollectionTrash(ctx, options)
 }
 
-func (conn *Conn) CollectionUntrash(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error) {
+func (conn *Conn) CollectionUntrash(ctx context.Context, options arvados.UntrashOptions) (arvados.Collection, error) {
 	return conn.chooseBackend(options.UUID).CollectionUntrash(ctx, options)
 }
 
@@ -276,10 +259,6 @@ func (conn *Conn) ContainerGet(ctx context.Context, options arvados.GetOptions)
 	return conn.chooseBackend(options.UUID).ContainerGet(ctx, options)
 }
 
-func (conn *Conn) ContainerList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerList, error) {
-	return conn.local.ContainerList(ctx, options)
-}
-
 func (conn *Conn) ContainerDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Container, error) {
 	return conn.chooseBackend(options.UUID).ContainerDelete(ctx, options)
 }
@@ -304,10 +283,6 @@ func (conn *Conn) SpecimenGet(ctx context.Context, options arvados.GetOptions) (
 	return conn.chooseBackend(options.UUID).SpecimenGet(ctx, options)
 }
 
-func (conn *Conn) SpecimenList(ctx context.Context, options arvados.ListOptions) (arvados.SpecimenList, error) {
-	return conn.local.SpecimenList(ctx, options)
-}
-
 func (conn *Conn) SpecimenDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Specimen, error) {
 	return conn.chooseBackend(options.UUID).SpecimenDelete(ctx, options)
 }
@@ -316,7 +291,7 @@ func (conn *Conn) APIClientAuthorizationCurrent(ctx context.Context, options arv
 	return conn.chooseBackend(options.UUID).APIClientAuthorizationCurrent(ctx, options)
 }
 
-type backend interface{ Interface }
+type backend interface{ arvados.API }
 
 type notFoundError struct{}