[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"
|
||||
"errors"
|
||||
"io/ioutil"
|
||||
|
||||
@@ -56,7 +57,7 @@ func uploadLicenseStringCmdF(c client.Client, cmd *cobra.Command, args []string)
|
||||
|
||||
licenseBytes := []byte(args[0])
|
||||
|
||||
if _, err := c.UploadLicenseFile(licenseBytes); err != nil {
|
||||
if _, err := c.UploadLicenseFile(context.TODO(), licenseBytes); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -75,7 +76,7 @@ func uploadLicenseCmdF(c client.Client, cmd *cobra.Command, args []string) error
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err := c.UploadLicenseFile(fileBytes); err != nil {
|
||||
if _, err := c.UploadLicenseFile(context.TODO(), fileBytes); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -85,7 +86,7 @@ func uploadLicenseCmdF(c client.Client, cmd *cobra.Command, args []string) error
|
||||
}
|
||||
|
||||
func removeLicenseCmdF(c client.Client, cmd *cobra.Command, args []string) error {
|
||||
if _, err := c.RemoveLicenseFile(); err != nil {
|
||||
if _, err := c.RemoveLicenseFile(context.TODO()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user