[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 удалений

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

@@ -3,6 +3,7 @@
package commands
import (
"context"
"fmt"
"net/http"
@@ -19,17 +20,17 @@ func (s *MmctlUnitTestSuite) TestGetUserFromArgs() {
printer.Clean()
s.client.
EXPECT().
GetUserByEmail(notFoundEmail, "").
GetUserByEmail(context.Background(), notFoundEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusNotFound}, notFoundErr).
Times(1)
s.client.
EXPECT().
GetUserByUsername(notFoundEmail, "").
GetUserByUsername(context.Background(), notFoundEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusNotFound}, notFoundErr).
Times(1)
s.client.
EXPECT().
GetUser(notFoundEmail, "").
GetUser(context.Background(), notFoundEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusNotFound}, notFoundErr).
Times(1)
@@ -45,17 +46,17 @@ func (s *MmctlUnitTestSuite) TestGetUserFromArgs() {
printer.Clean()
s.client.
EXPECT().
GetUserByEmail(badRequestEmail, "").
GetUserByEmail(context.Background(), badRequestEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusBadRequest}, badRequestErr).
Times(1)
s.client.
EXPECT().
GetUserByUsername(badRequestEmail, "").
GetUserByUsername(context.Background(), badRequestEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusBadRequest}, badRequestErr).
Times(1)
s.client.
EXPECT().
GetUser(badRequestEmail, "").
GetUser(context.Background(), badRequestEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusBadRequest}, badRequestErr).
Times(1)
@@ -71,7 +72,7 @@ func (s *MmctlUnitTestSuite) TestGetUserFromArgs() {
printer.Clean()
s.client.
EXPECT().
GetUserByEmail(unexpectedErrEmail, "").
GetUserByEmail(context.Background(), unexpectedErrEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusInternalServerError}, unexpectedErr).
Times(1)
users, err := getUsersFromArgs(s.client, []string{unexpectedErrEmail})
@@ -85,7 +86,7 @@ func (s *MmctlUnitTestSuite) TestGetUserFromArgs() {
printer.Clean()
s.client.
EXPECT().
GetUserByEmail(forbiddenErrEmail, "").
GetUserByEmail(context.Background(), forbiddenErrEmail, "").
Return(nil, &model.Response{StatusCode: http.StatusForbidden}, forbiddenErr).
Times(1)
users, err := getUsersFromArgs(s.client, []string{forbiddenErrEmail})
@@ -99,7 +100,7 @@ func (s *MmctlUnitTestSuite) TestGetUserFromArgs() {
printer.Clean()
s.client.
EXPECT().
GetUserByEmail(successEmail, "").
GetUserByEmail(context.Background(), successEmail, "").
Return(successUser, nil, nil).
Times(1)
users, err := getUsersFromArgs(s.client, []string{successEmail})