Merge branch 'master' into MM-61124_support-packet

mattermost · Nov 29, 2024 · bd7ced5 · bd7ced5
2 parents c0fbabb + 26ad9c2
commit bd7ced5
Show file tree

Hide file tree

Showing 63 changed files with 189 additions and 135 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-22.04
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
@@ -208,7 +208,7 @@ jobs:
           search_path: tests/integration
 
   e2e-cypress-tests:
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-22.04
     name: e2e-cypress-tests-run-${{ matrix.runId }}
     needs:
       - lint

diff --git a/assets/i18n/nb_NO.json b/assets/i18n/nb_NO.json
@@ -0,0 +1 @@
+[]
diff --git a/build/go.mod b/build/go.mod
@@ -5,7 +5,7 @@ go 1.22
 toolchain go1.22.8
 
 require (
-	github.com/mattermost/mattermost/server/public v0.1.7
+	github.com/mattermost/mattermost/server/public v0.1.8
 	github.com/pkg/errors v0.9.1
 )
 

diff --git a/build/go.sum b/build/go.sum
@@ -96,8 +96,8 @@ github.com/mattermost/ldap v0.0.0-20231116144001-0f480c025956 h1:Y1Tu/swM31pVwwb
 github.com/mattermost/ldap v0.0.0-20231116144001-0f480c025956/go.mod h1:SRl30Lb7/QoYyohYeVBuqYvvmXSZJxZgiV3Zf6VbxjI=
 github.com/mattermost/logr/v2 v2.0.21 h1:CMHsP+nrbRlEC4g7BwOk1GAnMtHkniFhlSQPXy52be4=
 github.com/mattermost/logr/v2 v2.0.21/go.mod h1:kZkB/zqKL9e+RY5gB3vGpsyenC+TpuiOenjMkvJJbzc=
-github.com/mattermost/mattermost/server/public v0.1.7 h1:WA+fnLrQQeE6xTyHERqcGiKljBFK6m8WYL4Pez07ko4=
-github.com/mattermost/mattermost/server/public v0.1.7/go.mod h1:SkTKbMul91Rq0v2dIxe8mqzUOY+3KwlwwLmAlxDfGCk=
+github.com/mattermost/mattermost/server/public v0.1.8 h1:Z2PUXR4YGquuSo3ojNUl0aazOMSRqALjyMaf20jNIy4=
+github.com/mattermost/mattermost/server/public v0.1.8/go.mod h1:SkTKbMul91Rq0v2dIxe8mqzUOY+3KwlwwLmAlxDfGCk=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=

diff --git a/build/manifest/main.go b/build/manifest/main.go
@@ -6,8 +6,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
+
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 const pluginIDGoFileTemplate = `// This file is automatically generated. Do not modify it manually.

diff --git a/client/client.go b/client/client.go
@@ -16,9 +16,10 @@ import (
 	"strconv"
 
 	"github.com/google/go-querystring/query"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
+
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 const (

diff --git a/client/doc_test.go b/client/doc_test.go
@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/client"
 	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/client"
 )
 
 func Example() {

diff --git a/client/playbook_runs_test.go b/client/playbook_runs_test.go
@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/client"
 	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/client"
 )
 
 func ExamplePlaybookRunService_Get() {

diff --git a/client/playbooks_test.go b/client/playbooks_test.go
@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/client"
 	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/client"
 )
 
 func ExamplePlaybooksService_Get() {

diff --git a/go.mod b/go.mod
@@ -26,8 +26,8 @@ require (
 	github.com/jmoiron/sqlx v1.4.0
 	github.com/lib/pq v1.10.9
 	github.com/mattermost/mattermost-plugin-playbooks/client v0.7.0
-	github.com/mattermost/mattermost/server/public v0.1.9
-	github.com/mattermost/mattermost/server/v8 v8.0.0-20241113102039-053d0b5f0ad5
+	github.com/mattermost/mattermost/server/public v0.1.8
+	github.com/mattermost/mattermost/server/v8 v8.0.0-20241112090719-5eef415a39e1
 	github.com/mattermost/morph v1.1.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -295,10 +295,10 @@ github.com/mattermost/ldap v0.0.0-20231116144001-0f480c025956 h1:Y1Tu/swM31pVwwb
 github.com/mattermost/ldap v0.0.0-20231116144001-0f480c025956/go.mod h1:SRl30Lb7/QoYyohYeVBuqYvvmXSZJxZgiV3Zf6VbxjI=
 github.com/mattermost/logr/v2 v2.0.21 h1:CMHsP+nrbRlEC4g7BwOk1GAnMtHkniFhlSQPXy52be4=
 github.com/mattermost/logr/v2 v2.0.21/go.mod h1:kZkB/zqKL9e+RY5gB3vGpsyenC+TpuiOenjMkvJJbzc=
-github.com/mattermost/mattermost/server/public v0.1.9 h1:l/OKPRVuFeqL0yqRVC/JpveG5sLNKcT9llxqMkO9e+s=
-github.com/mattermost/mattermost/server/public v0.1.9/go.mod h1:SkTKbMul91Rq0v2dIxe8mqzUOY+3KwlwwLmAlxDfGCk=
-github.com/mattermost/mattermost/server/v8 v8.0.0-20241113102039-053d0b5f0ad5 h1:XVePV2EZhapQ6JIGFycfTd1QgxICvDs8rRUy3pqxagQ=
-github.com/mattermost/mattermost/server/v8 v8.0.0-20241113102039-053d0b5f0ad5/go.mod h1:B4pQsrbZs6yO4GpWY6nCJPNG7myB0r3gvlFWWlGABmc=
+github.com/mattermost/mattermost/server/public v0.1.8 h1:Z2PUXR4YGquuSo3ojNUl0aazOMSRqALjyMaf20jNIy4=
+github.com/mattermost/mattermost/server/public v0.1.8/go.mod h1:SkTKbMul91Rq0v2dIxe8mqzUOY+3KwlwwLmAlxDfGCk=
+github.com/mattermost/mattermost/server/v8 v8.0.0-20241112090719-5eef415a39e1 h1:qNW9//+lx3kwCETTCvqjrFgQ3SH0DyHusE3PnGJfHVE=
+github.com/mattermost/mattermost/server/v8 v8.0.0-20241112090719-5eef415a39e1/go.mod h1:B4pQsrbZs6yO4GpWY6nCJPNG7myB0r3gvlFWWlGABmc=
 github.com/mattermost/morph v1.1.0 h1:Q9vrJbeM3s2jfweGheq12EFIzdNp9a/6IovcbvOQ6Cw=
 github.com/mattermost/morph v1.1.0/go.mod h1:gD+EaqX2UMyyuzmF4PFh4r33XneQ8Nzi+0E8nXjMa3A=
 github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 h1:G9tL6JXRBMzjuD1kkBtcnd42kUiT6QDwxfFYu7adM6o=

diff --git a/server/api/actions.go b/server/api/actions.go
@@ -6,13 +6,14 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/safemapstructure"
-	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 
-	"github.com/gorilla/mux"
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/pluginapi"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
+	"github.com/mattermost/mattermost-plugin-playbooks/server/safemapstructure"
 )
 
 type ActionsHandler struct {

diff --git a/server/api/categories.go b/server/api/categories.go
@@ -6,11 +6,12 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/pluginapi"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
 )
 
 const maxItemsInRunsAndPlaybooksCategory = 1000

diff --git a/server/api/graphql_root_playbook.go b/server/api/graphql_root_playbook.go
@@ -4,10 +4,12 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 	"gopkg.in/guregu/null.v4"
+
+	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
 )
 
 // RunMutationCollection hold all mutation functions for a playbookRun

diff --git a/server/api/graphql_root_run.go b/server/api/graphql_root_run.go
@@ -3,10 +3,12 @@ package api
 import (
 	"context"
 
+	"github.com/pkg/errors"
+
+	"github.com/mattermost/mattermost/server/public/model"
+
 	"github.com/mattermost/mattermost-plugin-playbooks/client"
 	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/pkg/errors"
 )
 
 // RunRootResolver hold all queries and mutations for a playbookRun

diff --git a/server/api/logger.go b/server/api/logger.go
@@ -5,8 +5,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/sirupsen/logrus"
+
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 // statusRecorder intercepts and saves the status code written to an http.ResponseWriter.

diff --git a/server/api/playbook_runs.go b/server/api/playbook_runs.go
@@ -12,12 +12,12 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-plugin-playbooks/client"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/pluginapi"
 
+	"github.com/mattermost/mattermost-plugin-playbooks/client"
 	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
 	"github.com/mattermost/mattermost-plugin-playbooks/server/bot"
 	"github.com/mattermost/mattermost-plugin-playbooks/server/config"

diff --git a/server/api/playbooks.go b/server/api/playbooks.go
@@ -10,13 +10,14 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/config"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/pluginapi"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
+	"github.com/mattermost/mattermost-plugin-playbooks/server/config"
 )
 
 // PlaybookHandler is the API handler.

diff --git a/server/api/signal.go b/server/api/signal.go
@@ -6,11 +6,12 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/public/pluginapi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/pluginapi"
+
 	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
 )
 

diff --git a/server/api/stats.go b/server/api/stats.go
@@ -5,15 +5,15 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost/server/public/model"
-	"gopkg.in/guregu/null.v4"
-
 	"github.com/gorilla/mux"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/sqlstore"
 	"github.com/pkg/errors"
+	"gopkg.in/guregu/null.v4"
 
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/pluginapi"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
+	"github.com/mattermost/mattermost-plugin-playbooks/server/sqlstore"
 )
 
 type StatsHandler struct {

diff --git a/server/api/urls.go b/server/api/urls.go
@@ -5,10 +5,10 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
+	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/pluginapi"
 )
 

diff --git a/server/api_actions_test.go b/server/api_actions_test.go
@@ -5,10 +5,12 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mattermost/mattermost/server/public/model"
+
 	"github.com/mattermost/mattermost-plugin-playbooks/client"
 	"github.com/mattermost/mattermost-plugin-playbooks/server/safemapstructure"
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestActionCreation(t *testing.T) {

diff --git a/server/api_bot_test.go b/server/api_bot_test.go
@@ -6,8 +6,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/mattermost/mattermost/server/public/model"
 )
 
 func TestTrialLicences(t *testing.T) {

diff --git a/server/api_playbooks_test.go b/server/api_playbooks_test.go
@@ -10,12 +10,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/client"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/client"
+	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
 )
 
 func TestPlaybooks(t *testing.T) {

diff --git a/server/api_runs_test.go b/server/api_runs_test.go
@@ -8,11 +8,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/client"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/client"
+	"github.com/mattermost/mattermost-plugin-playbooks/server/app"
 )
 
 func TestRunCreation(t *testing.T) {

diff --git a/server/api_tabapp_test.go b/server/api_tabapp_test.go
@@ -5,11 +5,13 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/mattermost-plugin-playbooks/client"
-	"github.com/mattermost/mattermost-plugin-playbooks/server/api"
-	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/mattermost/mattermost/server/public/model"
+
+	"github.com/mattermost/mattermost-plugin-playbooks/client"
+	"github.com/mattermost/mattermost-plugin-playbooks/server/api"
 )
 
 func TestTabAppGetRuns(t *testing.T) {
@@ -36,7 +38,6 @@ func TestTabAppGetRuns(t *testing.T) {
 		}
 		_, _, err := e.ServerAdminClient.PatchConfig(context.Background(), &patchedConfig)
 		require.NoError(t, err)
-
 	}
 
 	setDeveloperMode := func(t *testing.T, enable bool) {

diff --git a/server/app/actions_service.go b/server/app/actions_service.go
@@ -6,13 +6,15 @@ import (
 	"sync"
 	"time"
 
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/pluginapi"
+
 	"github.com/mattermost/mattermost-plugin-playbooks/server/bot"
 	"github.com/mattermost/mattermost-plugin-playbooks/server/config"
 	"github.com/mattermost/mattermost-plugin-playbooks/server/safemapstructure"
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/public/pluginapi"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 )
 
 type PlaybookGetter interface {

diff --git a/server/app/category_service.go b/server/app/category_service.go
@@ -3,9 +3,10 @@ package app
 import (
 	"database/sql"
 
+	"github.com/pkg/errors"
+
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/pluginapi"
-	"github.com/pkg/errors"
 )
 
 type categoryService struct {