return
}
+// RecordsToStrings formats the input data suitable for MakeTempCSVFile
+func RecordsToStrings(records []userRecord) [][]string {
+ data := [][]string{}
+ for _, u := range records {
+ data = append(data, []string{
+ u.UserID,
+ u.FirstName,
+ u.LastName,
+ fmt.Sprintf("%t", u.Active),
+ fmt.Sprintf("%t", u.Admin)})
+ }
+ return data
+}
+
func ListUsers(ac *arvados.Client) ([]arvados.User, error) {
var ul arvados.UserList
err := ac.RequestAndDecode(&ul, "GET", "/arvados/v1/users", nil, arvados.ResourceListParams{})
os.Args = []string{"cmd", "-verbose"}
err := ParseFlags(&ConfigParams{})
c.Assert(err, NotNil)
+ c.Assert(err, ErrorMatches, ".*please provide a path to an input file.*")
+}
+
+func (s *TestSuite) TestParseFlagsWrongUserID(c *C) {
+ os.Args = []string{"cmd", "-user-id=nickname", "/tmp/somefile.csv"}
+ err := ParseFlags(&ConfigParams{})
+ c.Assert(err, NotNil)
+ c.Assert(err, ErrorMatches, ".*user ID must be one of:.*")
}
func (s *TestSuite) TestParseFlagsWithPositionalArgument(c *C) {
c.Assert(cfg.Path, Equals, "/tmp/somefile.csv")
c.Assert(cfg.Verbose, Equals, false)
c.Assert(cfg.DeactivateUnlisted, Equals, false)
+ c.Assert(cfg.UserID, Equals, "email")
+ c.Assert(cfg.CaseInsensitive, Equals, true)
}
func (s *TestSuite) TestParseFlagsWithOptionalFlags(c *C) {
cfg := ConfigParams{}
- os.Args = []string{"cmd", "-verbose", "-deactivate-unlisted", "/tmp/somefile.csv"}
+ os.Args = []string{"cmd", "-verbose", "-deactivate-unlisted", "-user-id=username", "/tmp/somefile.csv"}
err := ParseFlags(&cfg)
c.Assert(err, IsNil)
c.Assert(cfg.Path, Equals, "/tmp/somefile.csv")
c.Assert(cfg.Verbose, Equals, true)
c.Assert(cfg.DeactivateUnlisted, Equals, true)
+ c.Assert(cfg.UserID, Equals, "username")
+ c.Assert(cfg.CaseInsensitive, Equals, false)
}
func (s *TestSuite) TestGetConfig(c *C) {
}
}
-// Activate and deactivate users
+// Create, activate and deactivate users
func (s *TestSuite) TestUserCreationAndUpdate(c *C) {
- testCases := []struct {
- Email string
- FirstName string
- LastName string
- Active bool
- Admin bool
- }{{
- Email: "user1@example.com",
- FirstName: "Example",
- LastName: "User1",
- Active: true,
- Admin: false,
- }, {
- Email: "admin1@example.com",
- FirstName: "Example",
- LastName: "Admin1",
- Active: true,
- Admin: true,
- }}
- // Make sure users aren't already there from fixtures
- for _, user := range s.users {
- e := user.Email
- found := e == testCases[0].Email || e == testCases[1].Email
- c.Assert(found, Equals, false)
- }
- // User creation
- data := [][]string{
- {testCases[0].Email, testCases[0].FirstName, testCases[0].LastName, fmt.Sprintf("%t", testCases[0].Active), fmt.Sprintf("%t", testCases[0].Admin)},
- {testCases[1].Email, testCases[1].FirstName, testCases[1].LastName, fmt.Sprintf("%t", testCases[1].Active), fmt.Sprintf("%t", testCases[1].Admin)},
- }
- tmpfile, err := MakeTempCSVFile(data)
- c.Assert(err, IsNil)
- defer os.Remove(tmpfile.Name())
- s.cfg.Path = tmpfile.Name()
- err = doMain(s.cfg)
- c.Assert(err, IsNil)
+ for _, tc := range []string{"email", "username"} {
+ uIDPrefix := tc
+ uIDSuffix := ""
+ if tc == "email" {
+ uIDSuffix = "@example.com"
+ }
+ s.cfg.UserID = tc
+ records := []userRecord{{
+ UserID: fmt.Sprintf("%suser1%s", uIDPrefix, uIDSuffix),
+ FirstName: "Example",
+ LastName: "User1",
+ Active: true,
+ Admin: false,
+ }, {
+ UserID: fmt.Sprintf("%suser2%s", uIDPrefix, uIDSuffix),
+ FirstName: "Example",
+ LastName: "User2",
+ Active: false, // initially inactive
+ Admin: false,
+ }, {
+ UserID: fmt.Sprintf("%sadmin1%s", uIDPrefix, uIDSuffix),
+ FirstName: "Example",
+ LastName: "Admin1",
+ Active: true,
+ Admin: true,
+ }, {
+ UserID: fmt.Sprintf("%sadmin2%s", uIDPrefix, uIDSuffix),
+ FirstName: "Example",
+ LastName: "Admin2",
+ Active: false, // initially inactive
+ Admin: true,
+ }}
+ // Make sure users aren't already there from fixtures
+ for _, user := range s.users {
+ uID, err := GetUserID(user, s.cfg.UserID)
+ c.Assert(err, IsNil)
+ found := false
+ for _, r := range records {
+ if uID == r.UserID {
+ found = true
+ break
+ }
+ }
+ c.Assert(found, Equals, false)
+ }
+ // User creation
+ tmpfile, err := MakeTempCSVFile(RecordsToStrings(records))
+ c.Assert(err, IsNil)
+ defer os.Remove(tmpfile.Name())
+ s.cfg.Path = tmpfile.Name()
+ err = doMain(s.cfg)
+ c.Assert(err, IsNil)
- users, err := ListUsers(s.cfg.Client)
- c.Assert(err, IsNil)
- for _, tc := range testCases {
- var foundUser arvados.User
- for _, user := range users {
- if user.Email == tc.Email {
- foundUser = user
- break
+ users, err := ListUsers(s.cfg.Client)
+ c.Assert(err, IsNil)
+ for _, r := range records {
+ var foundUser arvados.User
+ for _, user := range users {
+ uID, err := GetUserID(user, s.cfg.UserID)
+ c.Assert(err, IsNil)
+ if uID == r.UserID {
+ // Add an @example.com email if missing
+ // (to avoid database reset errors)
+ if tc == "username" && user.Email == "" {
+ err := UpdateUser(s.cfg.Client, user.UUID, &user, map[string]string{
+ "email": fmt.Sprintf("%s@example.com", user.Username),
+ })
+ c.Assert(err, IsNil)
+ }
+ foundUser = user
+ break
+ }
}
+ c.Assert(foundUser, NotNil)
+ c.Logf("Checking creation for user %q", r.UserID)
+ c.Assert(foundUser.FirstName, Equals, r.FirstName)
+ c.Assert(foundUser.LastName, Equals, r.LastName)
+ c.Assert(foundUser.IsActive, Equals, r.Active)
+ c.Assert(foundUser.IsAdmin, Equals, (r.Active && r.Admin))
}
- c.Assert(foundUser, NotNil)
- c.Logf("Checking recently created user %q", foundUser.Email)
- c.Assert(foundUser.FirstName, Equals, tc.FirstName)
- c.Assert(foundUser.LastName, Equals, tc.LastName)
- c.Assert(foundUser.IsActive, Equals, true)
- c.Assert(foundUser.IsAdmin, Equals, tc.Admin)
- }
- // User deactivation
- testCases[0].Active = false
- testCases[1].Active = false
- data = [][]string{
- {testCases[0].Email, testCases[0].FirstName, testCases[0].LastName, fmt.Sprintf("%t", testCases[0].Active), fmt.Sprintf("%t", testCases[0].Admin)},
- {testCases[1].Email, testCases[1].FirstName, testCases[1].LastName, fmt.Sprintf("%t", testCases[1].Active), fmt.Sprintf("%t", testCases[1].Admin)},
- }
- tmpfile, err = MakeTempCSVFile(data)
- c.Assert(err, IsNil)
- defer os.Remove(tmpfile.Name())
- s.cfg.Path = tmpfile.Name()
- err = doMain(s.cfg)
- c.Assert(err, IsNil)
+ // User update
+ for idx := range records {
+ records[idx].Active = !records[idx].Active
+ records[idx].FirstName = records[idx].FirstName + "Updated"
+ records[idx].LastName = records[idx].LastName + "Updated"
+ }
+ tmpfile, err = MakeTempCSVFile(RecordsToStrings(records))
+ c.Assert(err, IsNil)
+ defer os.Remove(tmpfile.Name())
+ s.cfg.Path = tmpfile.Name()
+ err = doMain(s.cfg)
+ c.Assert(err, IsNil)
- users, err = ListUsers(s.cfg.Client)
- c.Assert(err, IsNil)
- for _, tc := range testCases {
- var foundUser arvados.User
- for _, user := range users {
- if user.Email == tc.Email {
- foundUser = user
- break
+ users, err = ListUsers(s.cfg.Client)
+ c.Assert(err, IsNil)
+ for _, r := range records {
+ var foundUser arvados.User
+ for _, user := range users {
+ uID, err := GetUserID(user, s.cfg.UserID)
+ c.Assert(err, IsNil)
+ if uID == r.UserID {
+ foundUser = user
+ break
+ }
}
+ c.Assert(foundUser, NotNil)
+ c.Logf("Checking update for user %q", r.UserID)
+ c.Assert(foundUser.FirstName, Equals, r.FirstName)
+ c.Assert(foundUser.LastName, Equals, r.LastName)
+ c.Assert(foundUser.IsActive, Equals, r.Active)
+ c.Assert(foundUser.IsAdmin, Equals, (r.Active && r.Admin))
}
- c.Assert(foundUser, NotNil)
- c.Logf("Checking recently deactivated user %q", foundUser.Email)
- c.Assert(foundUser.FirstName, Equals, tc.FirstName)
- c.Assert(foundUser.LastName, Equals, tc.LastName)
- c.Assert(foundUser.IsActive, Equals, false)
- c.Assert(foundUser.IsAdmin, Equals, false) // inactive users cannot be admins
}
}
projects / arvados.git / blobdiff