[MM-53016] Pass timeout to outgoing request to MM server (#476)

.github/workflows/ci.yaml

@@ -151,12 +151,12 @@ jobs:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
-      - name: ci/checkout-mattermost-server-repo
+      - name: ci/checkout-mattermost-mono-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
-          repository: mattermost/mattermost-server
-          path: mattermost-server
-          ref: v7.7.0
+          repository: mattermost/mattermost
+          path: mattermost
+          ref: v8.1.0
 
       - name: ci/setup-go
         uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
@@ -167,7 +167,7 @@ jobs:
       - name: ci/test-with-db
         env:
           MM_SERVICESETTINGS_ENABLEDEVELOPER: true
-          MM_SERVER_PATH: ${{ github.workspace }}/mattermost-server
+          MM_SERVER_PATH: ${{ github.workspace }}/mattermost/server
         run: make test-rest-api
 
   e2e-cypress-tests-pinned: # Run only on master push and scheduled runs
@@ -216,7 +216,7 @@ jobs:
         ports:
           - 9200:9200
       mattermost-server:
-        image: mattermost/mattermost-enterprise-edition:release-7.7
+        image: mattermost/mattermost-enterprise-edition:release-8.1
         env:
           DB_HOST: postgres
           DB_PORT_NUMBER: 5432

apps/app.go

@@ -6,7 +6,7 @@ package apps
 import (
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 // App describes an App installed on a Mattermost instance. App should be

apps/appclient/mattermost_client.go

@@ -1,10 +1,11 @@
 package appclient
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 
 	"github.com/mattermost/mattermost-plugin-apps/apps"
@@ -187,8 +188,8 @@ func (c *Client) Call(creq apps.CallRequest) (*apps.CallResponse, error) {
 	return cresp, nil
 }
 
-func (c *Client) CreatePost(post *model.Post) (*model.Post, error) {
-	createdPost, res, err := c.Client4.CreatePost(post)
+func (c *Client) CreatePost(ctx context.Context, post *model.Post) (*model.Post, error) {
+	createdPost, res, err := c.Client4.CreatePost(ctx, post)
 	if err != nil {
 		return nil, err
 	}
@@ -200,18 +201,18 @@ func (c *Client) CreatePost(post *model.Post) (*model.Post, error) {
 	return createdPost, nil
 }
 
-func (c *Client) DM(userID string, format string, args ...interface{}) (*model.Post, error) {
-	return c.DMPost(userID, &model.Post{
+func (c *Client) DM(ctx context.Context, userID string, format string, args ...interface{}) (*model.Post, error) {
+	return c.DMPost(ctx, userID, &model.Post{
 		Message: fmt.Sprintf(format, args...),
 	})
 }
 
-func (c *Client) DMPost(userID string, post *model.Post) (*model.Post, error) {
+func (c *Client) DMPost(ctx context.Context, userID string, post *model.Post) (*model.Post, error) {
 	if c.userID == "" {
 		return nil, errors.New("empty sender user_id, perhaps Call does not expand acting_user")
 	}
 
-	channel, res, err := c.CreateDirectChannel(c.userID, userID)
+	channel, res, err := c.CreateDirectChannel(ctx, c.userID, userID)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get direct channel")
 	}
@@ -221,5 +222,5 @@ func (c *Client) DMPost(userID string, post *model.Post) (*model.Post, error) {
 	}
 
 	post.ChannelId = channel.Id
-	return c.CreatePost(post)
+	return c.CreatePost(ctx, post)
 }

apps/appclient/mattermost_client_pp.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 
 	"github.com/mattermost/mattermost-plugin-apps/apps"
 	appspath "github.com/mattermost/mattermost-plugin-apps/apps/path"

apps/context.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 
 	"github.com/mattermost/mattermost-plugin-apps/utils"
 )

apps/expand.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 
 	"github.com/mattermost/mattermost-plugin-apps/utils"
 )

apps/goapp/call_request_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 
 	"github.com/mattermost/mattermost-plugin-apps/apps"
 )

build/custom.mk

@@ -7,7 +7,7 @@ ifdef MM_RUDDER_PLUGINS_PROD
 	RUDDER_WRITE_KEY = $(MM_RUDDER_PLUGINS_PROD)
 endif
 
-LDFLAGS += -X "github.com/mattermost/mattermost-plugin-api/experimental/telemetry.rudderWriteKey=$(RUDDER_WRITE_KEY)"
+LDFLAGS += -X "github.com/mattermost/mattermost/server/public/pluginapi/experimental/telemetry.rudderWriteKey=$(RUDDER_WRITE_KEY)"
 
 BUILD_DATE = $(shell date -u)
 BUILD_HASH = $(shell git rev-parse HEAD)

build/manifest/main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 )
 

build/pluginctl/main.go

@@ -2,15 +2,19 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"log"
 	"net"
 	"os"
+	"time"
 
-	"github.com/mattermost/mattermost-server/v6/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
+const commandTimeout = 120 * time.Second
+
 const helpText = `
 Usage:
     pluginctl deploy <plugin id> <bundle path>
@@ -33,7 +37,10 @@ func pluginctl() error {
 		return errors.New("invalid number of arguments")
 	}
 
-	client, err := getClient()
+	ctx, cancel := context.WithTimeout(context.Background(), commandTimeout)
+	defer cancel()
+
+	client, err := getClient(ctx)
 	if err != nil {
 		return err
 	}
@@ -43,19 +50,19 @@ func pluginctl() error {
 		if len(os.Args) < 4 {
 			return errors.New("invalid number of arguments")
 		}
-		return deploy(client, os.Args[2], os.Args[3])
+		return deploy(ctx, client, os.Args[2], os.Args[3])
 	case "disable":
-		return disablePlugin(client, os.Args[2])
+		return disablePlugin(ctx, client, os.Args[2])
 	case "enable":
-		return enablePlugin(client, os.Args[2])
+		return enablePlugin(ctx, client, os.Args[2])
 	case "reset":
-		return resetPlugin(client, os.Args[2])
+		return resetPlugin(ctx, client, os.Args[2])
 	default:
 		return errors.New("invalid second argument")
 	}
 }
 
-func getClient() (*model.Client4, error) {
+func getClient(ctx context.Context) (*model.Client4, error) {
 	socketPath := os.Getenv("MM_LOCALSOCKETPATH")
 	if socketPath == "" {
 		socketPath = model.LocalModeSocketPath
@@ -91,7 +98,7 @@ func getClient() (*model.Client4, error) {
 	if adminUsername != "" && adminPassword != "" {
 		client := model.NewAPIv4Client(siteURL)
 		log.Printf("Authenticating as %s against %s.", adminUsername, siteURL)
-		_, _, err := client.Login(adminUsername, adminPassword)
+		_, _, err := client.Login(ctx, adminUsername, adminPassword)
 		if err != nil {
 			return nil, fmt.Errorf("failed to login as %s: %w", adminUsername, err)
 		}
@@ -113,21 +120,21 @@ func getUnixClient(socketPath string) (*model.Client4, bool) {
 
 // deploy attempts to upload and enable a plugin via the Client4 API.
 // It will fail if plugin uploads are disabled.
-func deploy(client *model.Client4, pluginID, bundlePath string) error {
+func deploy(ctx context.Context, client *model.Client4, pluginID, bundlePath string) error {
 	pluginBundle, err := os.Open(bundlePath)
 	if err != nil {
 		return fmt.Errorf("failed to open %s: %w", bundlePath, err)
 	}
 	defer pluginBundle.Close()
 
 	log.Print("Uploading plugin via API.")
-	_, _, err = client.UploadPluginForced(pluginBundle)
+	_, _, err = client.UploadPluginForced(ctx, pluginBundle)
 	if err != nil {
 		return fmt.Errorf("failed to upload plugin bundle: %s", err.Error())
 	}
 
 	log.Print("Enabling plugin.")
-	_, err = client.EnablePlugin(pluginID)
+	_, err = client.EnablePlugin(ctx, pluginID)
 	if err != nil {
 		return fmt.Errorf("failed to enable plugin: %s", err.Error())
 	}
@@ -136,9 +143,9 @@ func deploy(client *model.Client4, pluginID, bundlePath string) error {
 }
 
 // disablePlugin attempts to disable the plugin via the Client4 API.
-func disablePlugin(client *model.Client4, pluginID string) error {
+func disablePlugin(ctx context.Context, client *model.Client4, pluginID string) error {
 	log.Print("Disabling plugin.")
-	_, err := client.DisablePlugin(pluginID)
+	_, err := client.DisablePlugin(ctx, pluginID)
 	if err != nil {
 		return fmt.Errorf("failed to disable plugin: %w", err)
 	}
@@ -147,9 +154,9 @@ func disablePlugin(client *model.Client4, pluginID string) error {
 }
 
 // enablePlugin attempts to enable the plugin via the Client4 API.
-func enablePlugin(client *model.Client4, pluginID string) error {
+func enablePlugin(ctx context.Context, client *model.Client4, pluginID string) error {
 	log.Print("Enabling plugin.")
-	_, err := client.EnablePlugin(pluginID)
+	_, err := client.EnablePlugin(ctx, pluginID)
 	if err != nil {
 		return fmt.Errorf("failed to enable plugin: %w", err)
 	}
@@ -158,13 +165,13 @@ func enablePlugin(client *model.Client4, pluginID string) error {
 }
 
 // resetPlugin attempts to reset the plugin via the Client4 API.
-func resetPlugin(client *model.Client4, pluginID string) error {
-	err := disablePlugin(client, pluginID)
+func resetPlugin(ctx context.Context, client *model.Client4, pluginID string) error {
+	err := disablePlugin(ctx, client, pluginID)
 	if err != nil {
 		return err
 	}
 
-	err = enablePlugin(client, pluginID)
+	err = enablePlugin(ctx, client, pluginID)
 	if err != nil {
 		return err
 	}

cmd/appsctl/main.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"time"
+
 	"github.com/spf13/cobra"
 	"go.uber.org/zap/zapcore"
 
@@ -15,6 +17,10 @@ var (
 
 var log = utils.MustMakeCommandLogger(zapcore.InfoLevel)
 
+const (
+	commandTimeout = 2 * time.Minute
+)
+
 var (
 	dockerRegistry        string
 	executeRoleName       string

cmd/appsctl/mattermost.go

@@ -2,6 +2,7 @@
 package main
 
 import (
+	"context"
 	"net/http"
 	"os"
 	"strings"
@@ -46,19 +47,19 @@ func updateMattermost(appClient *appclient.Client, m apps.Manifest, deployType a
 	return nil
 }
 
-func installPlugin(appClient *appclient.Client, bundlePath string) (*apps.Manifest, error) {
+func installPlugin(ctx context.Context, appClient *appclient.Client, bundlePath string) (*apps.Manifest, error) {
 	f, err := os.Open(bundlePath)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to open the plugin bundle")
 	}
 	defer f.Close()
 
-	pluginManifest, _, err := appClient.UploadPluginForced(f)
+	pluginManifest, _, err := appClient.UploadPluginForced(ctx, f)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to upload the plugin to Mattermost")
 	}
 
-	_, err = appClient.EnablePlugin(pluginManifest.Id)
+	_, err = appClient.EnablePlugin(ctx, pluginManifest.Id)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to enable plugin on Mattermost")
 	}

cmd/appsctl/plugin.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -33,7 +34,10 @@ var pluginDeployCmd = &cobra.Command{
 			return err
 		}
 
-		m, err := installPlugin(appClient, bundlePath)
+		ctx, cancel := context.WithTimeout(context.Background(), commandTimeout)
+		defer cancel()
+
+		m, err := installPlugin(ctx, appClient, bundlePath)
 		if err != nil {
 			return err
 		}