remove request.Context from shared channel service methods (#17606)

services/remotecluster/recv.go

@@ -6,7 +6,6 @@ package remotecluster
 import (
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/v5/app/request"
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/mattermost/mattermost-server/v5/shared/mlog"
 )
@@ -14,7 +13,7 @@ import (
 // ReceiveIncomingMsg is called by the Rest API layer, or websocket layer (future), when a Remote Cluster
 // message is received.  Here we route the message to any topic listeners.
 // `rc` and `msg` cannot be nil.
-func (rcs *Service) ReceiveIncomingMsg(c *request.Context, rc *model.RemoteCluster, msg model.RemoteClusterMsg) Response {
+func (rcs *Service) ReceiveIncomingMsg(rc *model.RemoteCluster, msg model.RemoteClusterMsg) Response {
 	rcs.mux.RLock()
 	defer rcs.mux.RUnlock()
 
@@ -32,7 +31,7 @@ func (rcs *Service) ReceiveIncomingMsg(c *request.Context, rc *model.RemoteClust
 	listeners := rcs.getTopicListeners(msg.Topic)
 
 	for _, l := range listeners {
-		if err := callback(l, c, msg, &rcSanitized, &response); err != nil {
+		if err := callback(l, msg, &rcSanitized, &response); err != nil {
 			rcs.server.GetLogger().Log(mlog.LvlRemoteClusterServiceError, "Error from remote cluster message listener",
 				mlog.String("msgId", msg.Id), mlog.String("topic", msg.Topic), mlog.String("remote", rc.DisplayName), mlog.Err(err))
 
@@ -43,12 +42,12 @@ func (rcs *Service) ReceiveIncomingMsg(c *request.Context, rc *model.RemoteClust
 	return response
 }
 
-func callback(listener TopicListener, c *request.Context, msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) (err error) {
+func callback(listener TopicListener, msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			err = fmt.Errorf("%v", r)
 		}
 	}()
-	err = listener(c, msg, rc, resp)
+	err = listener(msg, rc, resp)
 	return
 }

services/remotecluster/service.go

@@ -10,7 +10,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/mattermost-server/v5/app/request"
 	"github.com/mattermost/mattermost-server/v5/einterfaces"
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/mattermost/mattermost-server/v5/shared/mlog"
@@ -66,12 +65,12 @@ type RemoteClusterServiceIFace interface {
 	SendFile(ctx context.Context, us *model.UploadSession, fi *model.FileInfo, rc *model.RemoteCluster, rp ReaderProvider, f SendFileResultFunc) error
 	SendProfileImage(ctx context.Context, userID string, rc *model.RemoteCluster, provider ProfileImageProvider, f SendProfileImageResultFunc) error
 	AcceptInvitation(invite *model.RemoteClusterInvite, name string, displayName string, creatorId string, teamId string, siteURL string) (*model.RemoteCluster, error)
-	ReceiveIncomingMsg(c *request.Context, rc *model.RemoteCluster, msg model.RemoteClusterMsg) Response
+	ReceiveIncomingMsg(rc *model.RemoteCluster, msg model.RemoteClusterMsg) Response
 }
 
 // TopicListener is a callback signature used to listen for incoming messages for
 // a specific topic.
-type TopicListener func(c *request.Context, msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error
+type TopicListener func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error
 
 // ConnectionStateListener is used to listen to remote cluster connection state changes.
 type ConnectionStateListener func(rc *model.RemoteCluster, online bool)

services/remotecluster/service_test.go

@@ -10,22 +10,21 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v5/app/request"
 	"github.com/mattermost/mattermost-server/v5/model"
 )
 
 func TestService_AddTopicListener(t *testing.T) {
 	var count int32
 
-	l1 := func(_ *request.Context, msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error {
+	l1 := func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error {
 		atomic.AddInt32(&count, 1)
 		return nil
 	}
-	l2 := func(_ *request.Context, msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error {
+	l2 := func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error {
 		atomic.AddInt32(&count, 1)
 		return nil
 	}
-	l3 := func(_ *request.Context, msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error {
+	l3 := func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response) error {
 		atomic.AddInt32(&count, 1)
 		return nil
 	}
@@ -47,28 +46,26 @@ func TestService_AddTopicListener(t *testing.T) {
 	msg1 := model.RemoteClusterMsg{Topic: "test"}
 	msg2 := model.RemoteClusterMsg{Topic: "different"}
 
-	c := request.EmptyContext()
-
-	service.ReceiveIncomingMsg(c, rc, msg1)
+	service.ReceiveIncomingMsg(rc, msg1)
 	assert.Equal(t, int32(2), atomic.LoadInt32(&count))
 
-	service.ReceiveIncomingMsg(c, rc, msg2)
+	service.ReceiveIncomingMsg(rc, msg2)
 	assert.Equal(t, int32(3), atomic.LoadInt32(&count))
 
 	service.RemoveTopicListener(l1id)
-	service.ReceiveIncomingMsg(c, rc, msg1)
+	service.ReceiveIncomingMsg(rc, msg1)
 	assert.Equal(t, int32(4), atomic.LoadInt32(&count))
 
 	service.RemoveTopicListener(l2id)
-	service.ReceiveIncomingMsg(c, rc, msg1)
+	service.ReceiveIncomingMsg(rc, msg1)
 	assert.Equal(t, int32(4), atomic.LoadInt32(&count))
 
-	service.ReceiveIncomingMsg(c, rc, msg2)
+	service.ReceiveIncomingMsg(rc, msg2)
 	assert.Equal(t, int32(5), atomic.LoadInt32(&count))
 
 	service.RemoveTopicListener(l3id)
-	service.ReceiveIncomingMsg(c, rc, msg1)
-	service.ReceiveIncomingMsg(c, rc, msg2)
+	service.ReceiveIncomingMsg(rc, msg1)
+	service.ReceiveIncomingMsg(rc, msg2)
 	assert.Equal(t, int32(5), atomic.LoadInt32(&count))
 
 	listeners = service.getTopicListeners("test")