[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>
Этот коммит содержится в:
Ben Schumacher
2023-06-06 23:29:29 +02:00
коммит произвёл GitHub
родитель 7116e9267a
Коммит 6c82605df0
140 изменённых файлов: 7516 добавлений и 7333 удалений

Просмотреть файл

@@ -4,6 +4,7 @@
package commands
import (
"context"
"errors"
"net/url"
"strings"
@@ -26,16 +27,16 @@ func getUsersFromUserArgs(c client.Client, userArgs []string) []*model.User {
func getUserFromUserArg(c client.Client, userArg string) *model.User {
var user *model.User
if !checkDots(userArg) {
user, _, _ = c.GetUserByEmail(userArg, "")
user, _, _ = c.GetUserByEmail(context.TODO(), userArg, "")
}
if !checkSlash(userArg) {
if user == nil {
user, _, _ = c.GetUserByUsername(userArg, "")
user, _, _ = c.GetUserByUsername(context.TODO(), userArg, "")
}
if user == nil {
user, _, _ = c.GetUser(userArg, "")
user, _, _ = c.GetUser(context.TODO(), userArg, "")
}
}
@@ -75,7 +76,7 @@ func getUserFromArg(c client.Client, userArg string) (*model.User, error) {
var response *model.Response
var err error
if !checkDots(userArg) {
user, response, err = c.GetUserByEmail(userArg, "")
user, response, err = c.GetUserByEmail(context.TODO(), userArg, "")
if err != nil {
nErr := ExtractErrorFromResponse(response, err)
var nfErr *NotFoundError
@@ -88,7 +89,7 @@ func getUserFromArg(c client.Client, userArg string) (*model.User, error) {
if !checkSlash(userArg) {
if user == nil {
user, response, err = c.GetUserByUsername(userArg, "")
user, response, err = c.GetUserByUsername(context.TODO(), userArg, "")
if err != nil {
nErr := ExtractErrorFromResponse(response, err)
var nfErr *NotFoundError
@@ -100,7 +101,7 @@ func getUserFromArg(c client.Client, userArg string) (*model.User, error) {
}
if user == nil {
user, response, err = c.GetUser(userArg, "")
user, response, err = c.GetUser(context.TODO(), userArg, "")
if err != nil {
nErr := ExtractErrorFromResponse(response, err)
var nfErr *NotFoundError