import (
"bytes"
"context"
+ "io"
+ "math"
"net"
"net/url"
"os"
TLS:
Insecure: true
Login:
- # LoginCluster: z1111
+ LoginCluster: z1111
SystemLogs:
Format: text
RemoteClusters:
s.testClusters[id] = &testCluster{
super: boot.Supervisor{
SourcePath: filepath.Join(cwd, "..", ".."),
- LibPath: filepath.Join(cwd, "..", "..", "tmp"),
ClusterType: "test",
ListenHost: "127.0.0." + id[3:],
ControllerAddr: ":0",
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) {
+func (s *IntegrationSuite) userClients(rootctx context.Context, c *check.C, conn *rpc.Conn, clusterID string, activate bool) (context.Context, *arvados.Client, *keepclient.KeepClient) {
login, err := conn.UserSessionCreate(rootctx, rpc.UserSessionCreateOptions{
ReturnTo: ",https://example.com",
AuthInfo: rpc.UserSessionAuthInfo{
redirURL, err := url.Parse(login.RedirectLocation)
c.Assert(err, check.IsNil)
userToken := redirURL.Query().Get("api_token")
- c.Logf("userToken: %q", userToken)
+ c.Logf("user token: %q", userToken)
ctx, ac, kc := s.clientsWithToken(clusterID, userToken)
user, err := conn.UserGetCurrent(ctx, arvados.GetOptions{})
- if err != nil {
- panic(err)
- }
+ c.Assert(err, check.IsNil)
_, err = conn.UserSetup(rootctx, arvados.UserSetupOptions{UUID: user.UUID})
- if err != nil {
- panic(err)
- }
- _, err = conn.UserActivate(rootctx, arvados.UserActivateOptions{UUID: user.UUID})
- if err != nil {
- panic(err)
- }
- user, err = conn.UserGetCurrent(ctx, arvados.GetOptions{})
- if err != nil {
- panic(err)
- }
- c.Logf("user: %#v", user)
- if !user.IsActive {
- c.Fatal("failed to activate user")
+ 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
}
return s.clientsWithToken(clusterID, s.testClusters[clusterID].config.Clusters[clusterID].SystemRootToken)
}
-func (s *IntegrationSuite) TestLoopDetection(c *check.C) {
+func (s *IntegrationSuite) TestGetCollectionByPDH(c *check.C) {
conn1 := s.conn("z1111")
rootctx1, _, _ := s.rootClients("z1111")
conn3 := s.conn("z3333")
- // rootctx3, _, _ := s.rootClients("z3333")
-
- userctx1, ac1, kc1 := s.userClients(c, conn1, rootctx1, "z1111", true)
- _, err := conn1.CollectionGet(userctx1, arvados.GetOptions{UUID: "1f4b0bc7583c2a7f9102c395f4ffc5e3+45"})
- c.Assert(err, check.ErrorMatches, `.*404 Not Found.*`)
+ userctx1, ac1, kc1 := s.userClients(rootctx1, c, conn1, "z1111", true)
+ // Create the collection to find its PDH (but don't save it
+ // anywhere yet)
var coll1 arvados.Collection
fs1, err := coll1.FileSystem(ac1, kc1)
- if err != nil {
- c.Error(err)
- }
- f, err := fs1.OpenFile("foo", os.O_CREATE|os.O_RDWR, 0777)
- f.Write([]byte("foo"))
- f.Close()
+ 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,
}})
c.Assert(err, check.IsNil)
- coll, err := conn3.CollectionGet(userctx1, arvados.GetOptions{UUID: "1f4b0bc7583c2a7f9102c395f4ffc5e3+45"})
+
+ // 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)
+}
+
+// Test for bug #16263
+func (s *IntegrationSuite) TestListUsers(c *check.C) {
+ rootctx1, _, _ := s.rootClients("z1111")
+ conn1 := s.conn("z1111")
+ conn3 := s.conn("z3333")
+
+ // Make sure LoginCluster is properly configured
+ for cls := range s.testClusters {
+ c.Check(
+ s.testClusters[cls].config.Clusters[cls].Login.LoginCluster,
+ check.Equals, "z1111",
+ check.Commentf("incorrect LoginCluster config on cluster %q", cls))
+ }
+ // Make sure z1111 has users with NULL usernames
+ lst, err := conn1.UserList(rootctx1, arvados.ListOptions{Limit: -1})
+ nullUsername := false
+ c.Assert(err, check.IsNil)
+ c.Assert(len(lst.Items), check.Not(check.Equals), 0)
+ for _, user := range lst.Items {
+ if user.Username == "" {
+ nullUsername = true
+ }
+ }
+ c.Assert(nullUsername, check.Equals, true)
+ // Ask for the user list on z3333 using z1111's system root token
+ _, err = conn3.UserList(rootctx1, arvados.ListOptions{Limit: -1})
+ c.Assert(err, check.IsNil, check.Commentf("getting user list: %q", err))
+}
+
+// Test for bug #16263
+func (s *IntegrationSuite) TestListUsersWithMaxLimit(c *check.C) {
+ rootctx1, _, _ := s.rootClients("z1111")
+ conn3 := s.conn("z3333")
+ maxLimit := int64(math.MaxInt64)
+
+ // Make sure LoginCluster is properly configured
+ for cls := range s.testClusters {
+ c.Check(
+ s.testClusters[cls].config.Clusters[cls].Login.LoginCluster,
+ check.Equals, "z1111",
+ check.Commentf("incorrect LoginCluster config on cluster %q", cls))
+ }
+
+ // Ask for the user list on z3333 using z1111's system root token and
+ // limit: max int64 value.
+ _, err := conn3.UserList(rootctx1, arvados.ListOptions{Limit: maxLimit})
+ c.Assert(err, check.IsNil, check.Commentf("getting user list: %q", err))
}
projects / arvados.git / blobdiff