[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"
|
||||
|
||||
"github.com/mattermost/mattermost-server/server/public/model"
|
||||
@@ -71,7 +72,7 @@ func init() {
|
||||
}
|
||||
|
||||
func addPermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) error {
|
||||
role, _, err := c.GetRoleByName(args[0])
|
||||
role, _, err := c.GetRoleByName(context.TODO(), args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -92,7 +93,7 @@ func addPermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) erro
|
||||
Permissions: &newPermissions,
|
||||
}
|
||||
|
||||
if _, _, err = c.PatchRole(role.Id, &patchRole); err != nil {
|
||||
if _, _, err = c.PatchRole(context.TODO(), role.Id, &patchRole); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -100,7 +101,7 @@ func addPermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) erro
|
||||
}
|
||||
|
||||
func removePermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) error {
|
||||
role, _, err := c.GetRoleByName(args[0])
|
||||
role, _, err := c.GetRoleByName(context.TODO(), args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -131,7 +132,7 @@ func removePermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) e
|
||||
Permissions: &newPermissionSet,
|
||||
}
|
||||
|
||||
if _, _, err = c.PatchRole(role.Id, &patchRole); err != nil {
|
||||
if _, _, err = c.PatchRole(context.TODO(), role.Id, &patchRole); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -139,7 +140,7 @@ func removePermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) e
|
||||
}
|
||||
|
||||
func resetPermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) error {
|
||||
role, _, err := c.GetRoleByName(args[0])
|
||||
role, _, err := c.GetRoleByName(context.TODO(), args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -153,7 +154,7 @@ func resetPermissionsCmdF(c client.Client, cmd *cobra.Command, args []string) er
|
||||
Permissions: &defaultRole.Permissions,
|
||||
}
|
||||
|
||||
role, _, err = c.PatchRole(role.Id, &patchRole)
|
||||
role, _, err = c.PatchRole(context.TODO(), role.Id, &patchRole)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user