[MM-21466] delete users cmd return err (#31191)
* refactored error managment for deleteUsersCmdF * updated tests related to deleteUsersCmdF * updated user_e2e_test to reflect changes made to the deleteUsersCmdF function * Empty-Commit to retrigger workflow * applied gofmt formating reqs to user_test.go * added suggested changes to the deleteUsersCmdF regarding error gathering * added requested changes regarding error aggragation on deleteUsersCmdF * style(mmctl): removing trailing whitespace * feat(mmctl): returning errors in deleteUserCmdF on err * fix(mmctl): returns when err parsing args * test(mmctl): updated tests to expect err instead of reading printer * style: updating returned errs * tests: updated test to reflect error change * tests(mmctl): updated e2e DeleteUserCmd test * Update server/cmd/mmctl/commands/user.go Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com> * refactor: changing error to return username instead of email * refactor: changing email to username for errors --------- Co-authored-by: Arnaud Wanet <andrewwanet9@gmail.com> Co-authored-by: Antonis Stamatiou <stamatiou.antonis@gmail.com> Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Этот коммит содержится в:
@@ -789,6 +789,9 @@ func (s *MmctlE2ETestSuite) TestDeleteUsersCmd() {
|
||||
printer.Clean()
|
||||
emailArg := "nonexistentUser@example.com"
|
||||
|
||||
var expectedErr *multierror.Error
|
||||
expectedErr = multierror.Append(expectedErr, fmt.Errorf("user %s not found", emailArg))
|
||||
|
||||
previousVal := s.th.App.Config().ServiceSettings.EnableAPIUserDeletion
|
||||
s.th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPIUserDeletion = true })
|
||||
defer func() {
|
||||
@@ -800,10 +803,8 @@ func (s *MmctlE2ETestSuite) TestDeleteUsersCmd() {
|
||||
cmd.Flags().BoolVar(&confirm, "confirm", confirm, "confirm")
|
||||
|
||||
err := deleteUsersCmdF(c, cmd, []string{emailArg})
|
||||
s.Require().Nil(err)
|
||||
s.Len(printer.GetLines(), 0)
|
||||
s.Len(printer.GetErrorLines(), 1)
|
||||
s.Equal(fmt.Sprintf("1 error occurred:\n\t* user %s not found\n\n", emailArg), printer.GetErrorLines()[0])
|
||||
s.Require().NotNil(err)
|
||||
s.Require().EqualError(err, expectedErr.Error())
|
||||
})
|
||||
|
||||
s.Run("Delete user without permission", func() {
|
||||
@@ -820,11 +821,14 @@ func (s *MmctlE2ETestSuite) TestDeleteUsersCmd() {
|
||||
cmd.Flags().BoolVar(&confirm, "confirm", confirm, "confirm")
|
||||
|
||||
newUser := s.th.CreateUser()
|
||||
|
||||
var expectedErr *multierror.Error
|
||||
expectedErr = multierror.Append(expectedErr, fmt.Errorf("unable to delete user %s error: %w", newUser.Username,
|
||||
fmt.Errorf("You do not have the appropriate permissions.")))
|
||||
|
||||
err := deleteUsersCmdF(s.th.Client, cmd, []string{newUser.Email})
|
||||
s.Require().Nil(err)
|
||||
s.Len(printer.GetLines(), 0)
|
||||
s.Len(printer.GetErrorLines(), 1)
|
||||
s.Require().Equal(fmt.Sprintf("Unable to delete user '%s' error: You do not have the appropriate permissions.", newUser.Username), printer.GetErrorLines()[0])
|
||||
s.Require().NotNil(err)
|
||||
s.Require().EqualError(err, expectedErr.Error())
|
||||
|
||||
// expect user not deleted
|
||||
user, err := s.th.App.GetUser(newUser.Id)
|
||||
@@ -846,11 +850,14 @@ func (s *MmctlE2ETestSuite) TestDeleteUsersCmd() {
|
||||
cmd.Flags().BoolVar(&confirm, "confirm", confirm, "confirm")
|
||||
|
||||
newUser := s.th.CreateUser()
|
||||
|
||||
var expectedErr *multierror.Error
|
||||
expectedErr = multierror.Append(expectedErr, fmt.Errorf("unable to delete user %s error: %w", newUser.Username,
|
||||
fmt.Errorf("Permanent user deletion feature is not enabled. Please contact your System Administrator.")))
|
||||
|
||||
err := deleteUsersCmdF(s.th.SystemAdminClient, cmd, []string{newUser.Email})
|
||||
s.Require().Nil(err)
|
||||
s.Len(printer.GetLines(), 0)
|
||||
s.Len(printer.GetErrorLines(), 1)
|
||||
s.Require().Equal(fmt.Sprintf("Unable to delete user '%s' error: Permanent user deletion feature is not enabled. Please contact your System Administrator.", newUser.Username), printer.GetErrorLines()[0])
|
||||
s.Require().NotNil(err)
|
||||
s.Require().EqualError(err, expectedErr.Error())
|
||||
|
||||
// expect user not deleted
|
||||
user, err := s.th.App.GetUser(newUser.Id)
|
||||
|
||||
Ссылка в новой задаче
Block a user