X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/57bdcaa0749776dc23dc56429d026edc28d64350..dd08650c44e691a3828b6febb121e821de2c8019:/lib/controller/federation/user_test.go

diff --git a/lib/controller/federation/user_test.go b/lib/controller/federation/user_test.go
index 09aa5086de..1bd1bd2f18 100644
--- a/lib/controller/federation/user_test.go
+++ b/lib/controller/federation/user_test.go
@@ -14,6 +14,7 @@ import (
 	"strings"
 
 	"git.arvados.org/arvados.git/lib/controller/rpc"
+	"git.arvados.org/arvados.git/lib/ctrlctx"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
 	"git.arvados.org/arvados.git/sdk/go/auth"
@@ -30,7 +31,7 @@ type UserSuite struct {
 func (s *UserSuite) TestLoginClusterUserList(c *check.C) {
 	s.cluster.ClusterID = "local"
 	s.cluster.Login.LoginCluster = "zzzzz"
-	s.fed = New(s.cluster)
+	s.fed = New(s.ctx, s.cluster, nil, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB)
 	s.addDirectRemote(c, "zzzzz", rpc.NewConn("zzzzz", &url.URL{Scheme: "https", Host: os.Getenv("ARVADOS_API_HOST")}, true, rpc.PassthroughTokenProvider))
 
 	for _, updateFail := range []bool{false, true} {
@@ -117,10 +118,64 @@ func (s *UserSuite) TestLoginClusterUserList(c *check.C) {
 	}
 }
 
+func (s *UserSuite) TestLoginClusterUserGet(c *check.C) {
+	s.cluster.ClusterID = "local"
+	s.cluster.Login.LoginCluster = "zzzzz"
+	s.fed = New(s.ctx, s.cluster, nil, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB)
+	s.addDirectRemote(c, "zzzzz", rpc.NewConn("zzzzz", &url.URL{Scheme: "https", Host: os.Getenv("ARVADOS_API_HOST")}, true, rpc.PassthroughTokenProvider))
+
+	opts := arvados.GetOptions{UUID: "zzzzz-tpzed-xurymjxw79nv3jz", Select: []string{"uuid", "email"}}
+
+	stub := &arvadostest.APIStub{Error: errors.New("local cluster failure")}
+	s.fed.local = stub
+	s.fed.UserGet(s.ctx, opts)
+
+	calls := stub.Calls(stub.UserBatchUpdate)
+	if c.Check(calls, check.HasLen, 1) {
+		c.Logf("... stub.UserUpdate called with options: %#v", calls[0].Options)
+		shouldUpdate := map[string]bool{
+			"uuid":       false,
+			"email":      true,
+			"first_name": true,
+			"last_name":  true,
+			"is_admin":   true,
+			"is_active":  true,
+			"prefs":      true,
+			// can't safely update locally
+			"owner_uuid":   false,
+			"identity_url": false,
+			// virtual attrs
+			"full_name":  false,
+			"is_invited": false,
+		}
+		if opts.Select != nil {
+			// Only the selected
+			// fields (minus uuid)
+			// should be updated.
+			for k := range shouldUpdate {
+				shouldUpdate[k] = false
+			}
+			for _, k := range opts.Select {
+				if k != "uuid" {
+					shouldUpdate[k] = true
+				}
+			}
+		}
+		var uuid string
+		for uuid = range calls[0].Options.(arvados.UserBatchUpdateOptions).Updates {
+		}
+		for k, shouldFind := range shouldUpdate {
+			_, found := calls[0].Options.(arvados.UserBatchUpdateOptions).Updates[uuid][k]
+			c.Check(found, check.Equals, shouldFind, check.Commentf("offending attr: %s", k))
+		}
+	}
+
+}
+
 func (s *UserSuite) TestLoginClusterUserListBypassFederation(c *check.C) {
 	s.cluster.ClusterID = "local"
 	s.cluster.Login.LoginCluster = "zzzzz"
-	s.fed = New(s.cluster)
+	s.fed = New(s.ctx, s.cluster, nil, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB)
 	s.addDirectRemote(c, "zzzzz", rpc.NewConn("zzzzz", &url.URL{Scheme: "https", Host: os.Getenv("ARVADOS_API_HOST")},
 		true, rpc.PassthroughTokenProvider))