[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"
|
||||
"fmt"
|
||||
|
||||
@@ -28,10 +29,10 @@ func getTeamFromTeamArg(c client.Client, teamArg string) *model.Team {
|
||||
}
|
||||
|
||||
var team *model.Team
|
||||
team, _, _ = c.GetTeam(teamArg, "")
|
||||
team, _, _ = c.GetTeam(context.TODO(), teamArg, "")
|
||||
|
||||
if team == nil {
|
||||
team, _, _ = c.GetTeamByName(teamArg, "")
|
||||
team, _, _ = c.GetTeamByName(context.TODO(), teamArg, "")
|
||||
}
|
||||
return team
|
||||
}
|
||||
@@ -62,7 +63,7 @@ func getTeamFromArg(c client.Client, teamArg string) (*model.Team, error) {
|
||||
var team *model.Team
|
||||
var response *model.Response
|
||||
var err error
|
||||
team, response, err = c.GetTeam(teamArg, "")
|
||||
team, response, err = c.GetTeam(context.TODO(), teamArg, "")
|
||||
if err != nil {
|
||||
nErr := ExtractErrorFromResponse(response, err)
|
||||
var nfErr *NotFoundError
|
||||
@@ -74,7 +75,7 @@ func getTeamFromArg(c client.Client, teamArg string) (*model.Team, error) {
|
||||
if team != nil {
|
||||
return team, nil
|
||||
}
|
||||
team, response, err = c.GetTeamByName(teamArg, "")
|
||||
team, response, err = c.GetTeamByName(context.TODO(), teamArg, "")
|
||||
if err != nil {
|
||||
nErr := ExtractErrorFromResponse(response, err)
|
||||
var nfErr *NotFoundError
|
||||
|
||||
Ссылка в новой задаче
Block a user