[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"
|
||||
"net/http"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
@@ -53,7 +54,7 @@ func ldapSyncCmdF(c client.Client, cmd *cobra.Command, args []string) error {
|
||||
|
||||
includeRemovedMembers, _ := cmd.Flags().GetBool("include-removed-members")
|
||||
|
||||
resp, err := c.SyncLdap(includeRemovedMembers)
|
||||
resp, err := c.SyncLdap(context.TODO(), includeRemovedMembers)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -69,7 +70,7 @@ func ldapSyncCmdF(c client.Client, cmd *cobra.Command, args []string) error {
|
||||
|
||||
func ldapIDMigrateCmdF(c client.Client, cmd *cobra.Command, args []string) error {
|
||||
toAttribute := args[0]
|
||||
resp, err := c.MigrateIdLdap(toAttribute)
|
||||
resp, err := c.MigrateIdLdap(context.TODO(), toAttribute)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user