[MM-49989] Pass a context.Context to Client4 methods (#22922)
* Migrate all method in model/client4.go to accept a context.Context * Fix th.*Client * Fix remaining issues * Empty commit to triger CI * Fix test * Add cancellation test * Test that returned error is context.Canceled * Fix bad merge * Update mmctl code --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
7116e9267a
Коммит
6c82605df0
@@ -4,6 +4,7 @@
|
||||
package commands
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
@@ -78,7 +79,7 @@ func rolesSystemAdminCmdF(c client.Client, _ *cobra.Command, args []string) erro
|
||||
|
||||
if !systemAdmin {
|
||||
roles = append(roles, model.SystemAdminRoleId)
|
||||
if _, err := c.UpdateUserRoles(user.Id, strings.Join(roles, " ")); err != nil {
|
||||
if _, err := c.UpdateUserRoles(context.TODO(), user.Id, strings.Join(roles, " ")); err != nil {
|
||||
updateErr := fmt.Errorf("can't update roles for user %q: %w", args[i], err)
|
||||
errs = multierror.Append(errs, updateErr)
|
||||
printer.PrintError(updateErr.Error())
|
||||
@@ -117,7 +118,7 @@ func rolesMemberCmdF(c client.Client, _ *cobra.Command, args []string) error {
|
||||
}
|
||||
|
||||
if shouldRemoveSysadmin {
|
||||
if _, err := c.UpdateUserRoles(user.Id, strings.Join(newRoles, " ")); err != nil {
|
||||
if _, err := c.UpdateUserRoles(context.TODO(), user.Id, strings.Join(newRoles, " ")); err != nil {
|
||||
updateErr := fmt.Errorf("can't update roles for user %q: %w", args[i], err)
|
||||
errs = multierror.Append(errs, updateErr)
|
||||
printer.PrintError(updateErr.Error())
|
||||
|
||||
Ссылка в новой задаче
Block a user