X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0857d7c48349d0d2e3a0570540e7a9e6ba25dca0..d739042d5aedd9a2cef19deb591cccc57d639353:/lib/controller/integration_test.go

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index b605fde06e..2adb5811ea 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -7,6 +7,7 @@ package controller
 import (
 	"bytes"
 	"context"
+	"io"
 	"net"
 	"net/url"
 	"os"
@@ -15,6 +16,7 @@ import (
 	"git.arvados.org/arvados.git/lib/boot"
 	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/lib/controller/rpc"
+	"git.arvados.org/arvados.git/lib/service"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
 	"git.arvados.org/arvados.git/sdk/go/auth"
@@ -26,7 +28,7 @@ import (
 var _ = check.Suite(&IntegrationSuite{})
 
 type testCluster struct {
-	booter        boot.Booter
+	super         boot.Supervisor
 	config        arvados.Config
 	controllerURL *url.URL
 }
@@ -47,15 +49,19 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
 		"z2222": nil,
 		"z3333": nil,
 	}
-	port := map[string]string{}
+	hostport := map[string]string{}
 	for id := range s.testClusters {
-		port[id] = func() string {
-			ln, err := net.Listen("tcp", "localhost:0")
+		hostport[id] = func() string {
+			// TODO: Instead of expecting random ports on
+			// 127.0.0.11, 22, 33 to be race-safe, try
+			// different 127.x.y.z until finding one that
+			// isn't in use.
+			ln, err := net.Listen("tcp", ":0")
 			c.Assert(err, check.IsNil)
 			ln.Close()
 			_, port, err := net.SplitHostPort(ln.Addr().String())
 			c.Assert(err, check.IsNil)
-			return port
+			return "127.0.0." + id[3:] + ":" + port
 		}()
 	}
 	for id := range s.testClusters {
@@ -63,24 +69,32 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
   ` + id + `:
     Services:
       Controller:
-        ExternalURL: https://localhost:` + port[id] + `
+        ExternalURL: https://` + hostport[id] + `
     TLS:
       Insecure: true
     Login:
-      LoginCluster: z1111
+      # LoginCluster: z1111
+    SystemLogs:
+      Format: text
     RemoteClusters:
       z1111:
-        Host: localhost:` + port["z1111"] + `
+        Host: ` + hostport["z1111"] + `
         Scheme: https
         Insecure: true
+        Proxy: true
+        ActivateUsers: true
       z2222:
-        Host: localhost:` + port["z2222"] + `
+        Host: ` + hostport["z2222"] + `
         Scheme: https
         Insecure: true
+        Proxy: true
+        ActivateUsers: true
       z3333:
-        Host: localhost:` + port["z3333"] + `
+        Host: ` + hostport["z3333"] + `
         Scheme: https
         Insecure: true
+        Proxy: true
+        ActivateUsers: true
 `
 		loader := config.NewLoader(bytes.NewBufferString(yaml), ctxlog.TestLogger(c))
 		loader.Path = "-"
@@ -89,22 +103,20 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
 		cfg, err := loader.Load()
 		c.Assert(err, check.IsNil)
 		s.testClusters[id] = &testCluster{
-			booter: boot.Booter{
+			super: boot.Supervisor{
 				SourcePath:           filepath.Join(cwd, "..", ".."),
-				LibPath:              filepath.Join(cwd, "..", "..", "tmp"),
 				ClusterType:          "test",
-				ListenHost:           "localhost",
+				ListenHost:           "127.0.0." + id[3:],
 				ControllerAddr:       ":0",
 				OwnTemporaryDatabase: true,
-				Stderr:               ctxlog.LogWriter(c.Log),
+				Stderr:               &service.LogPrefixer{Writer: ctxlog.LogWriter(c.Log), Prefix: []byte("[" + id + "] ")},
 			},
 			config: *cfg,
 		}
-		s.testClusters[id].booter.Start(context.Background(), &s.testClusters[id].config)
-		c.Logf("%v", &s.testClusters[id].config)
+		s.testClusters[id].super.Start(context.Background(), &s.testClusters[id].config)
 	}
 	for _, tc := range s.testClusters {
-		au, ok := tc.booter.WaitReady()
+		au, ok := tc.super.WaitReady()
 		c.Assert(ok, check.Equals, true)
 		u := url.URL(*au)
 		tc.controllerURL = &u
@@ -113,47 +125,101 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
 
 func (s *IntegrationSuite) TearDownSuite(c *check.C) {
 	for _, c := range s.testClusters {
-		c.booter.Stop()
+		c.super.Stop()
 	}
 }
 
-func (s *IntegrationSuite) conn(clusterID string) (*rpc.Conn, context.Context, *arvados.Client, *keepclient.KeepClient) {
+func (s *IntegrationSuite) conn(clusterID string) *rpc.Conn {
+	return rpc.NewConn(clusterID, s.testClusters[clusterID].controllerURL, true, rpc.PassthroughTokenProvider)
+}
+
+func (s *IntegrationSuite) clientsWithToken(clusterID string, token string) (context.Context, *arvados.Client, *keepclient.KeepClient) {
 	cl := s.testClusters[clusterID].config.Clusters[clusterID]
-	conn := rpc.NewConn(clusterID, s.testClusters[clusterID].controllerURL, true, rpc.PassthroughTokenProvider)
-	rootctx := auth.NewContext(context.Background(), auth.NewCredentials(cl.SystemRootToken))
+	ctx := auth.NewContext(context.Background(), auth.NewCredentials(token))
 	ac, err := arvados.NewClientFromConfig(&cl)
 	if err != nil {
 		panic(err)
 	}
-	ac.AuthToken = cl.SystemRootToken
+	ac.AuthToken = token
 	arv, err := arvadosclient.New(ac)
 	if err != nil {
 		panic(err)
 	}
 	kc := keepclient.New(arv)
-	return conn, rootctx, ac, kc
+	return ctx, ac, kc
+}
+
+func (s *IntegrationSuite) userClients(c *check.C, conn *rpc.Conn, rootctx context.Context, clusterID string, activate bool) (context.Context, *arvados.Client, *keepclient.KeepClient) {
+	login, err := conn.UserSessionCreate(rootctx, rpc.UserSessionCreateOptions{
+		ReturnTo: ",https://example.com",
+		AuthInfo: rpc.UserSessionAuthInfo{
+			Email:     "user@example.com",
+			FirstName: "Example",
+			LastName:  "User",
+			Username:  "example",
+		},
+	})
+	c.Assert(err, check.IsNil)
+	redirURL, err := url.Parse(login.RedirectLocation)
+	c.Assert(err, check.IsNil)
+	userToken := redirURL.Query().Get("api_token")
+	c.Logf("user token: %q", userToken)
+	ctx, ac, kc := s.clientsWithToken(clusterID, userToken)
+	user, err := conn.UserGetCurrent(ctx, arvados.GetOptions{})
+	c.Assert(err, check.IsNil)
+	_, err = conn.UserSetup(rootctx, arvados.UserSetupOptions{UUID: user.UUID})
+	c.Assert(err, check.IsNil)
+	if activate {
+		_, err = conn.UserActivate(rootctx, arvados.UserActivateOptions{UUID: user.UUID})
+		c.Assert(err, check.IsNil)
+		user, err = conn.UserGetCurrent(ctx, arvados.GetOptions{})
+		c.Assert(err, check.IsNil)
+		c.Logf("user UUID: %q", user.UUID)
+		if !user.IsActive {
+			c.Fatalf("failed to activate user -- %#v", user)
+		}
+	}
+	return ctx, ac, kc
 }
 
-func (s *IntegrationSuite) TestLoopDetection(c *check.C) {
-	conn1, rootctx1, _, _ := s.conn("z1111")
-	conn3, rootctx3, ac3, kc3 := s.conn("z3333")
+func (s *IntegrationSuite) rootClients(clusterID string) (context.Context, *arvados.Client, *keepclient.KeepClient) {
+	return s.clientsWithToken(clusterID, s.testClusters[clusterID].config.Clusters[clusterID].SystemRootToken)
+}
 
-	_, err := conn1.CollectionGet(rootctx1, arvados.GetOptions{UUID: "1f4b0bc7583c2a7f9102c395f4ffc5e3+45"})
-	c.Check(err, check.ErrorMatches, `.*404 Not Found.*`)
+func (s *IntegrationSuite) TestGetCollectionByPDH(c *check.C) {
+	conn1 := s.conn("z1111")
+	rootctx1, _, _ := s.rootClients("z1111")
+	conn3 := s.conn("z3333")
+	userctx1, ac1, kc1 := s.userClients(c, conn1, rootctx1, "z1111", true)
 
-	var coll3 arvados.Collection
-	fs3, err := coll3.FileSystem(ac3, kc3)
-	if err != nil {
-		c.Error(err)
-	}
-	f, err := fs3.OpenFile("foo", os.O_CREATE|os.O_RDWR, 0777)
-	f.Write([]byte("foo"))
-	f.Close()
-	mtxt, err := fs3.MarshalManifest(".")
-	coll3, err = conn3.CollectionCreate(rootctx3, arvados.CreateOptions{Attrs: map[string]interface{}{
+	// Create the collection to find its PDH (but don't save it
+	// anywhere yet)
+	var coll1 arvados.Collection
+	fs1, err := coll1.FileSystem(ac1, kc1)
+	c.Assert(err, check.IsNil)
+	f, err := fs1.OpenFile("test.txt", os.O_CREATE|os.O_RDWR, 0777)
+	c.Assert(err, check.IsNil)
+	_, err = io.WriteString(f, "IntegrationSuite.TestGetCollectionByPDH")
+	c.Assert(err, check.IsNil)
+	err = f.Close()
+	c.Assert(err, check.IsNil)
+	mtxt, err := fs1.MarshalManifest(".")
+	c.Assert(err, check.IsNil)
+	pdh := arvados.PortableDataHash(mtxt)
+
+	// Looking up the PDH before saving returns 404 if cycle
+	// detection is working.
+	_, err = conn1.CollectionGet(userctx1, arvados.GetOptions{UUID: pdh})
+	c.Assert(err, check.ErrorMatches, `.*404 Not Found.*`)
+
+	// Save the collection on cluster z1111.
+	coll1, err = conn1.CollectionCreate(userctx1, arvados.CreateOptions{Attrs: map[string]interface{}{
 		"manifest_text": mtxt,
 	}})
-	coll, err := conn1.CollectionGet(rootctx1, arvados.GetOptions{UUID: "1f4b0bc7583c2a7f9102c395f4ffc5e3+45"})
+	c.Assert(err, check.IsNil)
+
+	// Retrieve the collection from cluster z3333.
+	coll, err := conn3.CollectionGet(userctx1, arvados.GetOptions{UUID: pdh})
 	c.Check(err, check.IsNil)
-	c.Check(coll.PortableDataHash, check.Equals, "1f4b0bc7583c2a7f9102c395f4ffc5e3+45")
+	c.Check(coll.PortableDataHash, check.Equals, pdh)
 }