diff --git a/server/Makefile b/server/Makefile index 3271d4d4b9..e824d5129d 100644 --- a/server/Makefile +++ b/server/Makefile @@ -102,11 +102,11 @@ GOFLAGS ?= $(GOFLAGS:) export GOBIN ?= $(PWD)/bin GO=go DELVE=dlv -LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)" -LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)" GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1) GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2) @@ -132,9 +132,9 @@ DIST_PATH_WIN=$(DIST_ROOT)/windows/mattermost TESTS=. # Packages lists -TE_PACKAGES=$(shell $(GO) list ./... | grep -vE 'v6/server/playbooks|v6/server/boards') -BOARDS_PACKAGES=$(shell $(GO) list ./... | grep -E 'v6/server/boards') -PLAYBOOKS_PACKAGES=$(shell $(GO) list ./... | grep -E 'v6/server/playbooks') +TE_PACKAGES=$(shell $(GO) list ./... | grep -vE 'server/v8/playbooks|server/v8/boards') +BOARDS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/boards') +PLAYBOOKS_PACKAGES=$(shell $(GO) list ./... | grep -E 'server/v8/playbooks') TEMPLATES_DIR=templates @@ -189,7 +189,7 @@ endif include config.mk include build/*.mk -LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.MockCWS=$(MM_ENABLE_CWS_MOCK)" +LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.MockCWS=$(MM_ENABLE_CWS_MOCK)" RUN_IN_BACKGROUND ?= ifeq ($(RUN_SERVER_IN_BACKGROUND),true) @@ -270,7 +270,7 @@ else endif plugin-checker: - $(GO) run $(GOFLAGS) ../plugin/checker + $(GO) run $(GOFLAGS) ./plugin/checker prepackaged-plugins: ## Populate the prepackaged-plugins directory @echo Downloading prepackaged plugins @@ -349,9 +349,9 @@ ldap-mocks: ## Creates mock files for ldap. plugin-mocks: ## Creates mock files for plugins. $(GO) install github.com/vektra/mockery/v2/...@v2.23.2 - $(GOBIN)/mockery --dir ../plugin --name API --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.' - $(GOBIN)/mockery --dir ../plugin --name Hooks --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.' - $(GOBIN)/mockery --dir ../plugin --name Driver --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.' + $(GOBIN)/mockery --dir ./plugin --name API --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.' + $(GOBIN)/mockery --dir ./plugin --name Hooks --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.' + $(GOBIN)/mockery --dir ./plugin --name Driver --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.' einterfaces-mocks: ## Creates mock files for einterfaces. $(GO) install github.com/vektra/mockery/v2/...@v2.23.2 @@ -380,7 +380,7 @@ platform-mocks: ## Creates mocks for platform interfaces. $(GOBIN)/mockery --dir channels/app/platform --name SuiteIFace --output channels/app/platform/mocks --note 'Regenerate this file using `make platform-mocks`.' pluginapi: ## Generates api and hooks glue code for plugins - $(GO) generate $(GOFLAGS) ../plugin + $(GO) generate $(GOFLAGS) ./plugin mocks: store-mocks telemetry-mocks filestore-mocks ldap-mocks plugin-mocks einterfaces-mocks searchengine-mocks sharedchannel-mocks misc-mocks email-mocks platform-mocks @@ -552,20 +552,20 @@ run-server: setup-go-work prepackaged-binaries validate-go-version start-docker debug-server: start-docker ## Compile and start server using delve. mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files $(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\ - -X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\ - -X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\ - -X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\ - -X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ - -X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" + -X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\ + -X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\ + -X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\ + -X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ + -X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ. mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files $(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\ - -X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\ - -X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\ - -X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\ - -X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ - -X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" + -X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\ + -X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\ + -X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\ + -X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ + -X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" run-cli: start-docker ## Runs CLI. @echo Running mattermost for development @@ -733,18 +733,18 @@ gen-serialized: ## Generates serialization methods for hot structs # would be to temporarily move all the structs to the same file, # but that involves a lot of manual work. $(GO) install github.com/tinylib/msgp@v1.1.6 - $(GOBIN)/msgp -file=../model/session.go -tests=false -o=../model/session_serial_gen.go + $(GOBIN)/msgp -file=./model/session.go -tests=false -o=./model/session_serial_gen.go @echo "$$LICENSE_HEADER" > tmp.go - @cat ../model/session_serial_gen.go >> tmp.go - @mv tmp.go ../model/session_serial_gen.go - $(GOBIN)/msgp -file=../model/user.go -tests=false -o=../model/user_serial_gen.go + @cat ./model/session_serial_gen.go >> tmp.go + @mv tmp.go ./model/session_serial_gen.go + $(GOBIN)/msgp -file=./model/user.go -tests=false -o=./model/user_serial_gen.go @echo "$$LICENSE_HEADER" > tmp.go - @cat ../model/user_serial_gen.go >> tmp.go - @mv tmp.go ../model/user_serial_gen.go - $(GOBIN)/msgp -file=../model/team_member.go -tests=false -o=../model/team_member_serial_gen.go + @cat ./model/user_serial_gen.go >> tmp.go + @mv tmp.go ./model/user_serial_gen.go + $(GOBIN)/msgp -file=./model/team_member.go -tests=false -o=./model/team_member_serial_gen.go @echo "$$LICENSE_HEADER" > tmp.go - @cat ../model/team_member_serial_gen.go >> tmp.go - @mv tmp.go ../model/team_member_serial_gen.go + @cat ./model/team_member_serial_gen.go >> tmp.go + @mv tmp.go ./model/team_member_serial_gen.go todo: ## Display TODO and FIXME items in the source code. @! ag --ignore Makefile --ignore-dir runtime '(TODO|XXX|FIXME|"FIX ME")[: ]+' diff --git a/server/boards/api/admin.go b/server/boards/api/admin.go index 1c9acd73cc..cc2a277654 100644 --- a/server/boards/api/admin.go +++ b/server/boards/api/admin.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type AdminSetPasswordData struct { diff --git a/server/boards/api/api.go b/server/boards/api/api.go index 063dd8fcbc..b800c84604 100644 --- a/server/boards/api/api.go +++ b/server/boards/api/api.go @@ -12,12 +12,12 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/app" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/app" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/api/api_test.go b/server/boards/api/api_test.go index c8038799c1..4a31e36127 100644 --- a/server/boards/api/api_test.go +++ b/server/boards/api/api_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestErrorResponse(t *testing.T) { diff --git a/server/boards/api/archive.go b/server/boards/api/archive.go index a8ec09d9b5..58377d9cd2 100644 --- a/server/boards/api/archive.go +++ b/server/boards/api/archive.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/api/audit.go b/server/boards/api/audit.go index 017b840638..766e166f58 100644 --- a/server/boards/api/audit.go +++ b/server/boards/api/audit.go @@ -6,8 +6,8 @@ package api import ( "net/http" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" ) // makeAuditRecord creates an audit record pre-populated with data from the request. diff --git a/server/boards/api/auth.go b/server/boards/api/auth.go index 3d01179db1..fb54d95d16 100644 --- a/server/boards/api/auth.go +++ b/server/boards/api/auth.go @@ -13,12 +13,12 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/boards/services/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerAuthRoutes(r *mux.Router) { diff --git a/server/boards/api/blocks.go b/server/boards/api/blocks.go index c1b8f6a562..400ff624c1 100644 --- a/server/boards/api/blocks.go +++ b/server/boards/api/blocks.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerBlocksRoutes(r *mux.Router) { diff --git a/server/boards/api/boards.go b/server/boards/api/boards.go index 038c62a35c..ee90a715fb 100644 --- a/server/boards/api/boards.go +++ b/server/boards/api/boards.go @@ -10,10 +10,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerBoardsRoutes(r *mux.Router) { diff --git a/server/boards/api/boards_and_blocks.go b/server/boards/api/boards_and_blocks.go index 2ff5d6e4ca..acd1155227 100644 --- a/server/boards/api/boards_and_blocks.go +++ b/server/boards/api/boards_and_blocks.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerBoardsAndBlocksRoutes(r *mux.Router) { diff --git a/server/boards/api/cards.go b/server/boards/api/cards.go index 98f74657c4..51da96cda2 100644 --- a/server/boards/api/cards.go +++ b/server/boards/api/cards.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/api/categories.go b/server/boards/api/categories.go index 6d21b7ed52..ef269e98ae 100644 --- a/server/boards/api/categories.go +++ b/server/boards/api/categories.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" ) func (a *API) registerCategoriesRoutes(r *mux.Router) { diff --git a/server/boards/api/channels.go b/server/boards/api/channels.go index 171db8ed72..e59aba7fc2 100644 --- a/server/boards/api/channels.go +++ b/server/boards/api/channels.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerChannelsRoutes(r *mux.Router) { diff --git a/server/boards/api/compliance.go b/server/boards/api/compliance.go index 1c6db61bce..ac79bbf9a0 100644 --- a/server/boards/api/compliance.go +++ b/server/boards/api/compliance.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/api/content_blocks.go b/server/boards/api/content_blocks.go index d595958deb..18a1fd3663 100644 --- a/server/boards/api/content_blocks.go +++ b/server/boards/api/content_blocks.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" ) func (a *API) registerContentBlocksRoutes(r *mux.Router) { diff --git a/server/boards/api/files.go b/server/boards/api/files.go index 4a7eb5e6e7..2ca2102863 100644 --- a/server/boards/api/files.go +++ b/server/boards/api/files.go @@ -11,17 +11,17 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/app" + "github.com/mattermost/mattermost-server/server/v8/boards/app" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/web" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) // FileUploadResponse is the response to a file upload diff --git a/server/boards/api/insights.go b/server/boards/api/insights.go index 1553d13d8a..839b7c31c8 100644 --- a/server/boards/api/insights.go +++ b/server/boards/api/insights.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *API) registerInsightsRoutes(r *mux.Router) { diff --git a/server/boards/api/limits.go b/server/boards/api/limits.go index 650505b6c0..bf08184990 100644 --- a/server/boards/api/limits.go +++ b/server/boards/api/limits.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func (a *API) registerLimitsRoutes(r *mux.Router) { diff --git a/server/boards/api/members.go b/server/boards/api/members.go index 5aa0165075..353fb750b7 100644 --- a/server/boards/api/members.go +++ b/server/boards/api/members.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerMembersRoutes(r *mux.Router) { diff --git a/server/boards/api/onboarding.go b/server/boards/api/onboarding.go index 48016f073e..4e96e9ecc6 100644 --- a/server/boards/api/onboarding.go +++ b/server/boards/api/onboarding.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func (a *API) registerOnboardingRoutes(r *mux.Router) { diff --git a/server/boards/api/search.go b/server/boards/api/search.go index d617acc559..ee5f052591 100644 --- a/server/boards/api/search.go +++ b/server/boards/api/search.go @@ -9,10 +9,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerSearchRoutes(r *mux.Router) { diff --git a/server/boards/api/sharing.go b/server/boards/api/sharing.go index 32cb30c22e..42bc405b81 100644 --- a/server/boards/api/sharing.go +++ b/server/boards/api/sharing.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ErrTurningOnSharing = errors.New("turning on sharing for board failed, see log for details") diff --git a/server/boards/api/statistics.go b/server/boards/api/statistics.go index ec019e4d29..b73cc6e801 100644 --- a/server/boards/api/statistics.go +++ b/server/boards/api/statistics.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/mux" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *API) registerStatisticsRoutes(r *mux.Router) { diff --git a/server/boards/api/subscriptions.go b/server/boards/api/subscriptions.go index 8ac1a59b9a..e8542334cd 100644 --- a/server/boards/api/subscriptions.go +++ b/server/boards/api/subscriptions.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerSubscriptionsRoutes(r *mux.Router) { diff --git a/server/boards/api/system_test.go b/server/boards/api/system_test.go index 5b43b776e1..660db2f853 100644 --- a/server/boards/api/system_test.go +++ b/server/boards/api/system_test.go @@ -10,9 +10,9 @@ import ( "runtime" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/app" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/boards/app" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestHello(t *testing.T) { diff --git a/server/boards/api/teams.go b/server/boards/api/teams.go index 640fbdff5a..9a93ec1dd7 100644 --- a/server/boards/api/teams.go +++ b/server/boards/api/teams.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func (a *API) registerTeamsRoutes(r *mux.Router) { diff --git a/server/boards/api/templates.go b/server/boards/api/templates.go index 8ed915336e..ad3212e068 100644 --- a/server/boards/api/templates.go +++ b/server/boards/api/templates.go @@ -9,10 +9,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *API) registerTemplatesRoutes(r *mux.Router) { diff --git a/server/boards/api/users.go b/server/boards/api/users.go index 3e1876b8bf..26e824afca 100644 --- a/server/boards/api/users.go +++ b/server/boards/api/users.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func (a *API) registerUsersRoutes(r *mux.Router) { diff --git a/server/boards/app/app.go b/server/boards/app/app.go index b7a93adcf3..1e7ba4caea 100644 --- a/server/boards/app/app.go +++ b/server/boards/app/app.go @@ -8,19 +8,19 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/metrics" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/services/webhook" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/boards/ws" + "github.com/mattermost/mattermost-server/server/v8/boards/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/metrics" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/services/webhook" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/ws" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/app/app_test.go b/server/boards/app/app_test.go index e24dfd3b48..a938dfd1df 100644 --- a/server/boards/app/app_test.go +++ b/server/boards/app/app_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" ) func TestSetConfig(t *testing.T) { diff --git a/server/boards/app/auth.go b/server/boards/app/auth.go index 6648c2f164..e05efa6747 100644 --- a/server/boards/app/auth.go +++ b/server/boards/app/auth.go @@ -4,11 +4,11 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/pkg/errors" ) diff --git a/server/boards/app/auth_test.go b/server/boards/app/auth_test.go index 7e2d40db79..6f3093139a 100644 --- a/server/boards/app/auth_test.go +++ b/server/boards/app/auth_test.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) var mockUser = &model.User{ diff --git a/server/boards/app/blocks.go b/server/boards/app/blocks.go index 8db5ad5990..41de8d5736 100644 --- a/server/boards/app/blocks.go +++ b/server/boards/app/blocks.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ErrBlocksFromMultipleBoards = errors.New("the block set contain blocks from multiple boards") diff --git a/server/boards/app/blocks_test.go b/server/boards/app/blocks_test.go index a810b064d5..e19ebdae66 100644 --- a/server/boards/app/blocks_test.go +++ b/server/boards/app/blocks_test.go @@ -12,9 +12,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) type blockError struct { diff --git a/server/boards/app/boards.go b/server/boards/app/boards.go index b383164e76..ff81e81bff 100644 --- a/server/boards/app/boards.go +++ b/server/boards/app/boards.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/boards/app/boards_and_blocks.go b/server/boards/app/boards_and_blocks.go index 8a37e980aa..d16188a759 100644 --- a/server/boards/app/boards_and_blocks.go +++ b/server/boards/app/boards_and_blocks.go @@ -4,10 +4,10 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) CreateBoardsAndBlocks(bab *model.BoardsAndBlocks, userID string, addMember bool) (*model.BoardsAndBlocks, error) { diff --git a/server/boards/app/boards_test.go b/server/boards/app/boards_test.go index 9ea4c4b59d..be672c418d 100644 --- a/server/boards/app/boards_test.go +++ b/server/boards/app/boards_test.go @@ -6,14 +6,14 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func TestAddMemberToBoard(t *testing.T) { diff --git a/server/boards/app/cards.go b/server/boards/app/cards.go index 23b6c97b77..dea4ed88c7 100644 --- a/server/boards/app/cards.go +++ b/server/boards/app/cards.go @@ -6,8 +6,8 @@ package app import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func (a *App) CreateCard(card *model.Card, boardID string, userID string, disableNotify bool) (*model.Card, error) { diff --git a/server/boards/app/cards_test.go b/server/boards/app/cards_test.go index 81a52fbae4..d1d4b76059 100644 --- a/server/boards/app/cards_test.go +++ b/server/boards/app/cards_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func TestCreateCard(t *testing.T) { diff --git a/server/boards/app/category.go b/server/boards/app/category.go index 486b7811d8..ce48580d42 100644 --- a/server/boards/app/category.go +++ b/server/boards/app/category.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) var errCategoryNotFound = errors.New("category ID specified in input does not exist for user") diff --git a/server/boards/app/category_boards.go b/server/boards/app/category_boards.go index 264f48b56c..eb142dea7e 100644 --- a/server/boards/app/category_boards.go +++ b/server/boards/app/category_boards.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) const defaultCategoryBoards = "Boards" diff --git a/server/boards/app/category_boards_test.go b/server/boards/app/category_boards_test.go index 93b56df8c6..a158e62292 100644 --- a/server/boards/app/category_boards_test.go +++ b/server/boards/app/category_boards_test.go @@ -6,11 +6,11 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func TestGetUserCategoryBoards(t *testing.T) { diff --git a/server/boards/app/category_test.go b/server/boards/app/category_test.go index 3b31e674b1..63e250d2bf 100644 --- a/server/boards/app/category_test.go +++ b/server/boards/app/category_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func TestCreateCategory(t *testing.T) { diff --git a/server/boards/app/clientConfig.go b/server/boards/app/clientConfig.go index 7b806d3fde..5814cbc806 100644 --- a/server/boards/app/clientConfig.go +++ b/server/boards/app/clientConfig.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func (a *App) GetClientConfig() *model.ClientConfig { diff --git a/server/boards/app/clientConfig_test.go b/server/boards/app/clientConfig_test.go index 3d43f4c9b1..6ec12fb50d 100644 --- a/server/boards/app/clientConfig_test.go +++ b/server/boards/app/clientConfig_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" ) func TestGetClientConfig(t *testing.T) { diff --git a/server/boards/app/cloud.go b/server/boards/app/cloud.go index 4dc1b3af5f..8667856706 100644 --- a/server/boards/app/cloud.go +++ b/server/boards/app/cloud.go @@ -7,12 +7,12 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) var ErrNilPluginAPI = errors.New("server not running in plugin mode") diff --git a/server/boards/app/cloud_test.go b/server/boards/app/cloud_test.go index ee3b2d1cfb..5c0b7f7357 100644 --- a/server/boards/app/cloud_test.go +++ b/server/boards/app/cloud_test.go @@ -12,10 +12,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - mockservicesapi "github.com/mattermost/mattermost-server/v6/server/boards/model/mocks" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks" ) func TestIsCloud(t *testing.T) { diff --git a/server/boards/app/compliance.go b/server/boards/app/compliance.go index 205fca182c..f84c647bc4 100644 --- a/server/boards/app/compliance.go +++ b/server/boards/app/compliance.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/v6/server/boards/model" +import "github.com/mattermost/mattermost-server/server/v8/boards/model" func (a *App) GetBoardsForCompliance(opts model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) { return a.store.GetBoardsForCompliance(opts) diff --git a/server/boards/app/content_blocks.go b/server/boards/app/content_blocks.go index fc6e77c6ca..b5711bb9bf 100644 --- a/server/boards/app/content_blocks.go +++ b/server/boards/app/content_blocks.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func (a *App) MoveContentBlock(block *model.Block, dstBlock *model.Block, where string, userID string) error { diff --git a/server/boards/app/content_blocks_test.go b/server/boards/app/content_blocks_test.go index ce603e363b..8447eb3311 100644 --- a/server/boards/app/content_blocks_test.go +++ b/server/boards/app/content_blocks_test.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) type contentOrderMatcher struct { diff --git a/server/boards/app/export.go b/server/boards/app/export.go index 60af732727..88cc95ab86 100644 --- a/server/boards/app/export.go +++ b/server/boards/app/export.go @@ -11,9 +11,9 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/boards/app/files.go b/server/boards/app/files.go index 97f3eda25c..9ca07ef323 100644 --- a/server/boards/app/files.go +++ b/server/boards/app/files.go @@ -10,12 +10,12 @@ import ( "path/filepath" "strings" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const emptyString = "empty" diff --git a/server/boards/app/files_test.go b/server/boards/app/files_test.go index fc6a363da5..229712896b 100644 --- a/server/boards/app/files_test.go +++ b/server/boards/app/files_test.go @@ -15,10 +15,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) const ( diff --git a/server/boards/app/helper_test.go b/server/boards/app/helper_test.go index 75df2aa843..d337592a79 100644 --- a/server/boards/app/helper_test.go +++ b/server/boards/app/helper_test.go @@ -7,18 +7,18 @@ import ( "github.com/golang/mock/gomock" - "github.com/mattermost/mattermost-server/v6/server/boards/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/metrics" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions" - mmpermissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions/mocks" - permissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore" - "github.com/mattermost/mattermost-server/v6/server/boards/services/webhook" - "github.com/mattermost/mattermost-server/v6/server/boards/ws" + "github.com/mattermost/mattermost-server/server/v8/boards/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/metrics" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions" + mmpermissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions/mocks" + permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/webhook" + "github.com/mattermost/mattermost-server/server/v8/boards/ws" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type TestHelper struct { diff --git a/server/boards/app/import.go b/server/boards/app/import.go index 7b4d5a1607..7f694e2717 100644 --- a/server/boards/app/import.go +++ b/server/boards/app/import.go @@ -16,10 +16,10 @@ import ( "github.com/krolaw/zipstream" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/app/import_test.go b/server/boards/app/import_test.go index 2b4f7342c5..89d73335bf 100644 --- a/server/boards/app/import_test.go +++ b/server/boards/app/import_test.go @@ -7,12 +7,12 @@ import ( "bytes" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func TestApp_ImportArchive(t *testing.T) { diff --git a/server/boards/app/initialize.go b/server/boards/app/initialize.go index 408c00bcac..0e63a3057f 100644 --- a/server/boards/app/initialize.go +++ b/server/boards/app/initialize.go @@ -6,7 +6,7 @@ package app import ( "context" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // initialize is called when the App is first created. diff --git a/server/boards/app/insights.go b/server/boards/app/insights.go index 2cc319a94d..b14c155cf9 100644 --- a/server/boards/app/insights.go +++ b/server/boards/app/insights.go @@ -6,8 +6,8 @@ package app import ( "github.com/pkg/errors" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetTeamBoardsInsights(userID string, teamID string, opts *mm_model.InsightsOpts) (*model.BoardInsightsList, error) { diff --git a/server/boards/app/insights_test.go b/server/boards/app/insights_test.go index fcd94a0a5f..ff87b31d7e 100644 --- a/server/boards/app/insights_test.go +++ b/server/boards/app/insights_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) var mockInsightsBoards = []*model.Board{ diff --git a/server/boards/app/onboarding.go b/server/boards/app/onboarding.go index 4e4ea91999..b30b0d5f0f 100644 --- a/server/boards/app/onboarding.go +++ b/server/boards/app/onboarding.go @@ -6,7 +6,7 @@ package app import ( "errors" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) const ( diff --git a/server/boards/app/onboarding_test.go b/server/boards/app/onboarding_test.go index a93b0ec034..97e7eef529 100644 --- a/server/boards/app/onboarding_test.go +++ b/server/boards/app/onboarding_test.go @@ -6,11 +6,11 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) const ( diff --git a/server/boards/app/permissions.go b/server/boards/app/permissions.go index 0d340e3f0c..a1d7da51dd 100644 --- a/server/boards/app/permissions.go +++ b/server/boards/app/permissions.go @@ -4,7 +4,7 @@ package app import ( - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) HasPermissionToBoard(userID, boardID string, permission *mm_model.Permission) bool { diff --git a/server/boards/app/server_metadata.go b/server/boards/app/server_metadata.go index 1082057828..28a2a44bca 100644 --- a/server/boards/app/server_metadata.go +++ b/server/boards/app/server_metadata.go @@ -6,7 +6,7 @@ package app import ( "runtime" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) type ServerMetadata struct { diff --git a/server/boards/app/server_metadata_test.go b/server/boards/app/server_metadata_test.go index 08eab2cb82..76991bac20 100644 --- a/server/boards/app/server_metadata_test.go +++ b/server/boards/app/server_metadata_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func TestGetServerMetadata(t *testing.T) { diff --git a/server/boards/app/sharing.go b/server/boards/app/sharing.go index ab73b41d6d..3dc7ede811 100644 --- a/server/boards/app/sharing.go +++ b/server/boards/app/sharing.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func (a *App) GetSharing(boardID string) (*model.Sharing, error) { diff --git a/server/boards/app/sharing_test.go b/server/boards/app/sharing_test.go index ecda3b62b8..ebf6fea176 100644 --- a/server/boards/app/sharing_test.go +++ b/server/boards/app/sharing_test.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func TestGetSharing(t *testing.T) { diff --git a/server/boards/app/subscriptions.go b/server/boards/app/subscriptions.go index c25fc436de..26bab3214b 100644 --- a/server/boards/app/subscriptions.go +++ b/server/boards/app/subscriptions.go @@ -4,10 +4,10 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) CreateSubscription(sub *model.Subscription) (*model.Subscription, error) { diff --git a/server/boards/app/teams.go b/server/boards/app/teams.go index 114a45e6df..83c998ee34 100644 --- a/server/boards/app/teams.go +++ b/server/boards/app/teams.go @@ -4,10 +4,10 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) GetRootTeam() (*model.Team, error) { diff --git a/server/boards/app/teams_test.go b/server/boards/app/teams_test.go index 48911f4d11..e418c1968a 100644 --- a/server/boards/app/teams_test.go +++ b/server/boards/app/teams_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) var errInvalidTeam = errors.New("invalid team id") diff --git a/server/boards/app/templates.go b/server/boards/app/templates.go index 9cd0b1d1bc..0f17d3e08e 100644 --- a/server/boards/app/templates.go +++ b/server/boards/app/templates.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/assets" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/assets" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/app/templates_test.go b/server/boards/app/templates_test.go index dee1e08ece..bb1eb9bd3a 100644 --- a/server/boards/app/templates_test.go +++ b/server/boards/app/templates_test.go @@ -9,10 +9,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestApp_initializeTemplates(t *testing.T) { diff --git a/server/boards/app/user.go b/server/boards/app/user.go index 31ff2ee9cf..c798e7a333 100644 --- a/server/boards/app/user.go +++ b/server/boards/app/user.go @@ -4,8 +4,8 @@ package app import ( - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetTeamUsers(teamID string, asGuestID string) ([]*model.User, error) { diff --git a/server/boards/app/user_test.go b/server/boards/app/user_test.go index f9cc9890d3..e1aa8ee597 100644 --- a/server/boards/app/user_test.go +++ b/server/boards/app/user_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSearchUsers(t *testing.T) { diff --git a/server/boards/auth/auth.go b/server/boards/auth/auth.go index 0e90c8ecbd..8e93c0cd44 100644 --- a/server/boards/auth/auth.go +++ b/server/boards/auth/auth.go @@ -7,11 +7,11 @@ package auth import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) type AuthInterface interface { diff --git a/server/boards/auth/auth_test.go b/server/boards/auth/auth_test.go index 99afcc9196..65491d37ca 100644 --- a/server/boards/auth/auth_test.go +++ b/server/boards/auth/auth_test.go @@ -10,14 +10,14 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/localpermissions" - mockpermissions "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions" + mockpermissions "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type TestHelper struct { diff --git a/server/boards/auth/mocks/mockauth_interface.go b/server/boards/auth/mocks/mockauth_interface.go index 082c22bc2e..45d151310d 100644 --- a/server/boards/auth/mocks/mockauth_interface.go +++ b/server/boards/auth/mocks/mockauth_interface.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/boards/auth (interfaces: AuthInterface) +// Source: github.com/mattermost/mattermost-server/server/v8/boards/auth (interfaces: AuthInterface) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/server/boards/model" + model "github.com/mattermost/mattermost-server/server/v8/boards/model" ) // MockAuthInterface is a mock of AuthInterface interface. diff --git a/server/boards/client/client.go b/server/boards/client/client.go index d803e2e444..ea33a38c2b 100644 --- a/server/boards/client/client.go +++ b/server/boards/client/client.go @@ -12,10 +12,10 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/api" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/api" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/boards/integrationtests/blocks_test.go b/server/boards/integrationtests/blocks_test.go index 8960129a04..16365fd034 100644 --- a/server/boards/integrationtests/blocks_test.go +++ b/server/boards/integrationtests/blocks_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/board_test.go b/server/boards/integrationtests/board_test.go index 0088e8433a..3f48b8f790 100644 --- a/server/boards/integrationtests/board_test.go +++ b/server/boards/integrationtests/board_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/client" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/client" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/boards_and_blocks_test.go b/server/boards/integrationtests/boards_and_blocks_test.go index 9ae48366f8..965b3f320f 100644 --- a/server/boards/integrationtests/boards_and_blocks_test.go +++ b/server/boards/integrationtests/boards_and_blocks_test.go @@ -6,7 +6,7 @@ package integrationtests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/boardsapp_test.go b/server/boards/integrationtests/boardsapp_test.go index f327520a7d..8faf4156d6 100644 --- a/server/boards/integrationtests/boardsapp_test.go +++ b/server/boards/integrationtests/boardsapp_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/server" + "github.com/mattermost/mattermost-server/server/v8/boards/server" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestSetConfiguration(t *testing.T) { diff --git a/server/boards/integrationtests/cards_test.go b/server/boards/integrationtests/cards_test.go index aba146823a..e2290d46aa 100644 --- a/server/boards/integrationtests/cards_test.go +++ b/server/boards/integrationtests/cards_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func TestCreateCard(t *testing.T) { diff --git a/server/boards/integrationtests/clienttestlib.go b/server/boards/integrationtests/clienttestlib.go index 10997b0b18..3c7f0ab003 100644 --- a/server/boards/integrationtests/clienttestlib.go +++ b/server/boards/integrationtests/clienttestlib.go @@ -10,19 +10,19 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/client" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/server" - "github.com/mattermost/mattermost-server/v6/server/boards/services/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/localpermissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/client" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/server" + "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/compliance_test.go b/server/boards/integrationtests/compliance_test.go index 64ac6bb594..7ed89c3c7e 100644 --- a/server/boards/integrationtests/compliance_test.go +++ b/server/boards/integrationtests/compliance_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) var ( diff --git a/server/boards/integrationtests/configuration_test.go b/server/boards/integrationtests/configuration_test.go index 349e6df8a5..fd49036e4a 100644 --- a/server/boards/integrationtests/configuration_test.go +++ b/server/boards/integrationtests/configuration_test.go @@ -8,14 +8,14 @@ import ( "github.com/golang/mock/gomock" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/server" - "github.com/mattermost/mattermost-server/v6/server/boards/ws" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/server" + "github.com/mattermost/mattermost-server/server/v8/boards/ws" - mockservicesapi "github.com/mattermost/mattermost-server/v6/server/boards/model/mocks" + mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/stretchr/testify/assert" ) diff --git a/server/boards/integrationtests/content_blocks_test.go b/server/boards/integrationtests/content_blocks_test.go index 8455ae5f4d..461bbd8da4 100644 --- a/server/boards/integrationtests/content_blocks_test.go +++ b/server/boards/integrationtests/content_blocks_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/export_test.go b/server/boards/integrationtests/export_test.go index da96ebf301..f896e83632 100644 --- a/server/boards/integrationtests/export_test.go +++ b/server/boards/integrationtests/export_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func TestExportBoard(t *testing.T) { diff --git a/server/boards/integrationtests/file_test.go b/server/boards/integrationtests/file_test.go index fc66cf4c2f..f0598ce83e 100644 --- a/server/boards/integrationtests/file_test.go +++ b/server/boards/integrationtests/file_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/permissions_test.go b/server/boards/integrationtests/permissions_test.go index e86f1d1c64..936e15bfea 100644 --- a/server/boards/integrationtests/permissions_test.go +++ b/server/boards/integrationtests/permissions_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/client" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/client" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) type Clients struct { diff --git a/server/boards/integrationtests/pluginteststore.go b/server/boards/integrationtests/pluginteststore.go index 06e8f92b12..0f289252de 100644 --- a/server/boards/integrationtests/pluginteststore.go +++ b/server/boards/integrationtests/pluginteststore.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) var errTestStore = errors.New("plugin test store error") diff --git a/server/boards/integrationtests/sharing_test.go b/server/boards/integrationtests/sharing_test.go index 44719679de..982f88c74f 100644 --- a/server/boards/integrationtests/sharing_test.go +++ b/server/boards/integrationtests/sharing_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func TestSharing(t *testing.T) { diff --git a/server/boards/integrationtests/sidebar_test.go b/server/boards/integrationtests/sidebar_test.go index a2c3aed354..d62c3b48a3 100644 --- a/server/boards/integrationtests/sidebar_test.go +++ b/server/boards/integrationtests/sidebar_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func TestSidebar(t *testing.T) { diff --git a/server/boards/integrationtests/statistics_test.go b/server/boards/integrationtests/statistics_test.go index 5123183b70..cb0e44b456 100644 --- a/server/boards/integrationtests/statistics_test.go +++ b/server/boards/integrationtests/statistics_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/client" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/client" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func TestStatisticsLocalMode(t *testing.T) { diff --git a/server/boards/integrationtests/subscriptions_test.go b/server/boards/integrationtests/subscriptions_test.go index 0f4a09ab3a..cfd75a7019 100644 --- a/server/boards/integrationtests/subscriptions_test.go +++ b/server/boards/integrationtests/subscriptions_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/client" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/client" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func createTestSubscriptions(client *client.Client, num int) ([]*model.Subscription, string, error) { diff --git a/server/boards/integrationtests/teststore.go b/server/boards/integrationtests/teststore.go index 134078c5da..bc2bed79d3 100644 --- a/server/boards/integrationtests/teststore.go +++ b/server/boards/integrationtests/teststore.go @@ -4,9 +4,9 @@ package integrationtests import ( - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) type TestStore struct { diff --git a/server/boards/integrationtests/user_test.go b/server/boards/integrationtests/user_test.go index af494acd47..836bbbd0c5 100644 --- a/server/boards/integrationtests/user_test.go +++ b/server/boards/integrationtests/user_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) const ( diff --git a/server/boards/model/auth.go b/server/boards/model/auth.go index a667a56e63..f63acab92d 100644 --- a/server/boards/model/auth.go +++ b/server/boards/model/auth.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/services/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" ) const ( diff --git a/server/boards/model/block.go b/server/boards/model/block.go index 02b633e840..972e564b0a 100644 --- a/server/boards/model/block.go +++ b/server/boards/model/block.go @@ -8,7 +8,7 @@ import ( "io" "strconv" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" ) // Block is the basic data unit diff --git a/server/boards/model/block_test.go b/server/boards/model/block_test.go index 05cede4395..f35239ac0a 100644 --- a/server/boards/model/block_test.go +++ b/server/boards/model/block_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/model/blockid.go b/server/boards/model/blockid.go index 521779a6ed..d0309a9021 100644 --- a/server/boards/model/blockid.go +++ b/server/boards/model/blockid.go @@ -6,9 +6,9 @@ package model import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // GenerateBlockIDs generates new IDs for all the blocks of the list, diff --git a/server/boards/model/blocktype.go b/server/boards/model/blocktype.go index 7fb868e700..6c1868898d 100644 --- a/server/boards/model/blocktype.go +++ b/server/boards/model/blocktype.go @@ -7,7 +7,7 @@ import ( "errors" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) // BlockType represents a block type. diff --git a/server/boards/model/board_insights.go b/server/boards/model/board_insights.go index cd34ddc919..74fe283901 100644 --- a/server/boards/model/board_insights.go +++ b/server/boards/model/board_insights.go @@ -7,7 +7,7 @@ import ( "encoding/json" "io" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) // BoardInsightsList is a response type with pagination support. diff --git a/server/boards/model/boards_and_blocks.go b/server/boards/model/boards_and_blocks.go index 3ebe548d2b..159e091acf 100644 --- a/server/boards/model/boards_and_blocks.go +++ b/server/boards/model/boards_and_blocks.go @@ -9,9 +9,9 @@ import ( "fmt" "io" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ErrNoBoardsInBoardsAndBlocks = errors.New("at least one board is required") diff --git a/server/boards/model/boards_and_blocks_test.go b/server/boards/model/boards_and_blocks_test.go index 0c6d0b0891..4c89496ae3 100644 --- a/server/boards/model/boards_and_blocks_test.go +++ b/server/boards/model/boards_and_blocks_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestIsValidBoardsAndBlocks(t *testing.T) { diff --git a/server/boards/model/card.go b/server/boards/model/card.go index 377672dea9..f27c59af7e 100644 --- a/server/boards/model/card.go +++ b/server/boards/model/card.go @@ -9,7 +9,7 @@ import ( "github.com/rivo/uniseg" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) var ErrBoardIDMismatch = errors.New("Board IDs do not match") diff --git a/server/boards/model/card_test.go b/server/boards/model/card_test.go index 3274ac1e2e..96237ebfc8 100644 --- a/server/boards/model/card_test.go +++ b/server/boards/model/card_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func TestBlock2Card(t *testing.T) { diff --git a/server/boards/model/category.go b/server/boards/model/category.go index ad925768ab..0d49b3b0a0 100644 --- a/server/boards/model/category.go +++ b/server/boards/model/category.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) const ( diff --git a/server/boards/model/error.go b/server/boards/model/error.go index 0c1727904c..678520c87f 100644 --- a/server/boards/model/error.go +++ b/server/boards/model/error.go @@ -10,7 +10,7 @@ import ( "net/http" "strings" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) var ( diff --git a/server/boards/model/mocks/mockservicesapi.go b/server/boards/model/mocks/mockservicesapi.go index 23da9096c7..724c0c9e28 100644 --- a/server/boards/model/mocks/mockservicesapi.go +++ b/server/boards/model/mocks/mockservicesapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/boards/model (interfaces: ServicesAPI) +// Source: github.com/mattermost/mattermost-server/server/v8/boards/model (interfaces: ServicesAPI) // Package mocks is a generated GoMock package. package mocks @@ -13,8 +13,8 @@ import ( gomock "github.com/golang/mock/gomock" mux "github.com/gorilla/mux" - model "github.com/mattermost/mattermost-server/v6/model" - mlog "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + model "github.com/mattermost/mattermost-server/server/v8/model" + mlog "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // MockServicesAPI is a mock of ServicesAPI interface. diff --git a/server/boards/model/mocks/propValueResolverMock.go b/server/boards/model/mocks/propValueResolverMock.go index 6937de3c7d..0030038d46 100644 --- a/server/boards/model/mocks/propValueResolverMock.go +++ b/server/boards/model/mocks/propValueResolverMock.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/boards/model (interfaces: PropValueResolver) +// Source: github.com/mattermost/mattermost-server/server/v8/boards/model (interfaces: PropValueResolver) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/server/boards/model" + model "github.com/mattermost/mattermost-server/server/v8/boards/model" ) // MockPropValueResolver is a mock of PropValueResolver interface. diff --git a/server/boards/model/notification.go b/server/boards/model/notification.go index 2cfc150b90..dfb2641aa4 100644 --- a/server/boards/model/notification.go +++ b/server/boards/model/notification.go @@ -6,7 +6,7 @@ package model import ( "time" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" ) // NotificationHint provides a hint that a block has been modified and has subscribers that diff --git a/server/boards/model/permission.go b/server/boards/model/permission.go index 95998f4df8..544f131cfc 100644 --- a/server/boards/model/permission.go +++ b/server/boards/model/permission.go @@ -4,7 +4,7 @@ package model import ( - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) var ( diff --git a/server/boards/model/properties.go b/server/boards/model/properties.go index c10bd84178..c640d87d0a 100644 --- a/server/boards/model/properties.go +++ b/server/boards/model/properties.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) var ErrInvalidBoardBlock = errors.New("invalid board block") diff --git a/server/boards/model/properties_test.go b/server/boards/model/properties_test.go index 0546c529b5..df24231779 100644 --- a/server/boards/model/properties_test.go +++ b/server/boards/model/properties_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) type MockResolver struct{} diff --git a/server/boards/model/services_api.go b/server/boards/model/services_api.go index 6623adc80b..d1918f9217 100644 --- a/server/boards/model/services_api.go +++ b/server/boards/model/services_api.go @@ -10,8 +10,8 @@ import ( "github.com/gorilla/mux" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/model/util.go b/server/boards/model/util.go index dcb2f96671..4d80a2a2e3 100644 --- a/server/boards/model/util.go +++ b/server/boards/model/util.go @@ -6,7 +6,7 @@ package model import ( "time" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) // GetMillis is a convenience method to get milliseconds since epoch. diff --git a/server/boards/model/version.go b/server/boards/model/version.go index 12f5b5887b..be8a561634 100644 --- a/server/boards/model/version.go +++ b/server/boards/model/version.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // This is a list of all the current versions including any patches. diff --git a/server/boards/product/api_adapter.go b/server/boards/product/api_adapter.go index 506c2ba91c..e0d2f1d276 100644 --- a/server/boards/product/api_adapter.go +++ b/server/boards/product/api_adapter.go @@ -8,11 +8,11 @@ import ( "github.com/gorilla/mux" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) // normalizeAppError returns a truly nil error if appErr is nil diff --git a/server/boards/product/boards_product.go b/server/boards/product/boards_product.go index 7e74c86349..9fc74101cb 100644 --- a/server/boards/product/boards_product.go +++ b/server/boards/product/boards_product.go @@ -7,13 +7,13 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/server" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/server" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/boards/product/imports/boards_imports.go b/server/boards/product/imports/boards_imports.go index cf6081d414..e684480eaf 100644 --- a/server/boards/product/imports/boards_imports.go +++ b/server/boards/product/imports/boards_imports.go @@ -6,5 +6,5 @@ package imports import ( // Needed to ensure the init() method in the FocalBoard product is run. // This file is copied to the mmserver imports package via makefile. - _ "github.com/mattermost/mattermost-server/v6/server/boards/product" + _ "github.com/mattermost/mattermost-server/server/v8/boards/product" ) diff --git a/server/boards/server/boards_service.go b/server/boards/server/boards_service.go index a702c026a3..3eedabfc4e 100644 --- a/server/boards/server/boards_service.go +++ b/server/boards/server/boards_service.go @@ -8,19 +8,19 @@ import ( "net/http" "sync" - "github.com/mattermost/mattermost-server/v6/server/boards/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/mattermostauthlayer" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/boards/ws" + "github.com/mattermost/mattermost-server/server/v8/boards/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/mattermostauthlayer" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/ws" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/boards/server/boards_service_api.go b/server/boards/server/boards_service_api.go index 9464a1309b..1ad34b3656 100644 --- a/server/boards/server/boards_service_api.go +++ b/server/boards/server/boards_service_api.go @@ -4,11 +4,11 @@ package server import ( - "github.com/mattermost/mattermost-server/v6/server/boards/app" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/app" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) // boardsServiceAPI provides a service API for other products such as Channels. diff --git a/server/boards/server/boards_service_util.go b/server/boards/server/boards_service_util.go index c1de21897e..2661d960ef 100644 --- a/server/boards/server/boards_service_util.go +++ b/server/boards/server/boards_service_util.go @@ -8,9 +8,9 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) const defaultS3Timeout = 60 * 1000 // 60 seconds diff --git a/server/boards/server/data_retention_test.go b/server/boards/server/data_retention_test.go index 927e6b5afa..18a731d918 100644 --- a/server/boards/server/data_retention_test.go +++ b/server/boards/server/data_retention_test.go @@ -11,12 +11,12 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/localpermissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type TestHelperMockStore struct { diff --git a/server/boards/server/notifications.go b/server/boards/server/notifications.go index dba47ba45d..5f085d163d 100644 --- a/server/boards/server/notifications.go +++ b/server/boards/server/notifications.go @@ -7,15 +7,15 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify/notifymentions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify/notifysubscriptions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify/plugindelivery" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifymentions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifysubscriptions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify/plugindelivery" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type notifyBackendParams struct { diff --git a/server/boards/server/params.go b/server/boards/server/params.go index e5613fc349..3511620d07 100644 --- a/server/boards/server/params.go +++ b/server/boards/server/params.go @@ -6,14 +6,14 @@ package server import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/ws" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/ws" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Params struct { diff --git a/server/boards/server/post.go b/server/boards/server/post.go index 755d2b70cf..fcafbcb8b5 100644 --- a/server/boards/server/post.go +++ b/server/boards/server/post.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown" ) func postWithBoardsEmbed(post *mm_model.Post) *mm_model.Post { diff --git a/server/boards/server/server.go b/server/boards/server/server.go index d79f30129b..a66e2c3351 100644 --- a/server/boards/server/server.go +++ b/server/boards/server/server.go @@ -19,26 +19,26 @@ import ( "github.com/oklog/run" - "github.com/mattermost/mattermost-server/v6/server/boards/api" - "github.com/mattermost/mattermost-server/v6/server/boards/app" - "github.com/mattermost/mattermost-server/v6/server/boards/auth" - appModel "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/audit" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/boards/services/metrics" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify/notifylogger" - "github.com/mattermost/mattermost-server/v6/server/boards/services/scheduler" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/boards/services/telemetry" - "github.com/mattermost/mattermost-server/v6/server/boards/services/webhook" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/boards/web" - "github.com/mattermost/mattermost-server/v6/server/boards/ws" + "github.com/mattermost/mattermost-server/server/v8/boards/api" + "github.com/mattermost/mattermost-server/server/v8/boards/app" + "github.com/mattermost/mattermost-server/server/v8/boards/auth" + appModel "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/services/metrics" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifylogger" + "github.com/mattermost/mattermost-server/server/v8/boards/services/scheduler" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/telemetry" + "github.com/mattermost/mattermost-server/server/v8/boards/services/webhook" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/web" + "github.com/mattermost/mattermost-server/server/v8/boards/ws" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/audit/audit.go b/server/boards/services/audit/audit.go index a965c977d8..d11dd0915e 100644 --- a/server/boards/services/audit/audit.go +++ b/server/boards/services/audit/audit.go @@ -4,7 +4,7 @@ package audit import ( - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/audit/record.go b/server/boards/services/audit/record.go index 0987bde849..60b55b1293 100644 --- a/server/boards/services/audit/record.go +++ b/server/boards/services/audit/record.go @@ -3,7 +3,7 @@ package audit -import "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" +import "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" // Meta represents metadata that can be added to a audit record as name/value pairs. type Meta struct { diff --git a/server/boards/services/metrics/service.go b/server/boards/services/metrics/service.go index bc3a97eb44..1ffcc7f9d9 100644 --- a/server/boards/services/metrics/service.go +++ b/server/boards/services/metrics/service.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // Service prometheus to run the server. diff --git a/server/boards/services/notify/notifylogger/logger_backend.go b/server/boards/services/notify/notifylogger/logger_backend.go index 52ff8b6bd9..8370988498 100644 --- a/server/boards/services/notify/notifylogger/logger_backend.go +++ b/server/boards/services/notify/notifylogger/logger_backend.go @@ -4,9 +4,9 @@ package notifylogger import ( - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifymentions/app_api.go b/server/boards/services/notify/notifymentions/app_api.go index 1110b54458..ab66fb700f 100644 --- a/server/boards/services/notify/notifymentions/app_api.go +++ b/server/boards/services/notify/notifymentions/app_api.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. package notifymentions -import "github.com/mattermost/mattermost-server/v6/server/boards/model" +import "github.com/mattermost/mattermost-server/server/v8/boards/model" type AppAPI interface { GetMemberForBoard(boardID, userID string) (*model.BoardMember, error) diff --git a/server/boards/services/notify/notifymentions/delivery.go b/server/boards/services/notify/notifymentions/delivery.go index 7e097feb5c..499b582483 100644 --- a/server/boards/services/notify/notifymentions/delivery.go +++ b/server/boards/services/notify/notifymentions/delivery.go @@ -4,9 +4,9 @@ package notifymentions import ( - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) // MentionDelivery provides an interface for delivering @mention notifications to other systems, such as diff --git a/server/boards/services/notify/notifymentions/mentions.go b/server/boards/services/notify/notifymentions/mentions.go index f6e60d95db..00e4a1835d 100644 --- a/server/boards/services/notify/notifymentions/mentions.go +++ b/server/boards/services/notify/notifymentions/mentions.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) var atMentionRegexp = regexp.MustCompile(`\B@[[:alnum:]][[:alnum:]\.\-_:]*`) diff --git a/server/boards/services/notify/notifymentions/mentions_backend.go b/server/boards/services/notify/notifymentions/mentions_backend.go index fdb13b5342..9d0c84190e 100644 --- a/server/boards/services/notify/notifymentions/mentions_backend.go +++ b/server/boards/services/notify/notifymentions/mentions_backend.go @@ -10,11 +10,11 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifymentions/mentions_test.go b/server/boards/services/notify/notifymentions/mentions_test.go index 758e116854..1529c7bc64 100644 --- a/server/boards/services/notify/notifymentions/mentions_test.go +++ b/server/boards/services/notify/notifymentions/mentions_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func Test_extractMentions(t *testing.T) { diff --git a/server/boards/services/notify/notifysubscriptions/app_api.go b/server/boards/services/notify/notifysubscriptions/app_api.go index b2b9333f73..cfbee71019 100644 --- a/server/boards/services/notify/notifysubscriptions/app_api.go +++ b/server/boards/services/notify/notifysubscriptions/app_api.go @@ -6,7 +6,7 @@ package notifysubscriptions import ( "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) type AppAPI interface { diff --git a/server/boards/services/notify/notifysubscriptions/delivery.go b/server/boards/services/notify/notifysubscriptions/delivery.go index 449616efb7..59f0a82382 100644 --- a/server/boards/services/notify/notifysubscriptions/delivery.go +++ b/server/boards/services/notify/notifysubscriptions/delivery.go @@ -4,9 +4,9 @@ package notifysubscriptions import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) // SubscriptionDelivery provides an interface for delivering subscription notifications to other systems, such as diff --git a/server/boards/services/notify/notifysubscriptions/diff.go b/server/boards/services/notify/notifysubscriptions/diff.go index ede57d2949..1e36359799 100644 --- a/server/boards/services/notify/notifysubscriptions/diff.go +++ b/server/boards/services/notify/notifysubscriptions/diff.go @@ -7,9 +7,9 @@ import ( "fmt" "sort" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // Diff represents a difference between two versions of a block. diff --git a/server/boards/services/notify/notifysubscriptions/diff2markdown.go b/server/boards/services/notify/notifysubscriptions/diff2markdown.go index 4d7bc287f0..dfa0de1c03 100644 --- a/server/boards/services/notify/notifysubscriptions/diff2markdown.go +++ b/server/boards/services/notify/notifysubscriptions/diff2markdown.go @@ -8,7 +8,7 @@ import ( "github.com/sergi/go-diff/diffmatchpatch" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func generateMarkdownDiff(oldText string, newText string, logger mlog.LoggerIFace) string { diff --git a/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go b/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go index e94e96614a..fd8904774f 100644 --- a/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go +++ b/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go @@ -13,10 +13,10 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifysubscriptions/notifier.go b/server/boards/services/notify/notifysubscriptions/notifier.go index 22a0f1dde2..c2acb78336 100644 --- a/server/boards/services/notify/notifysubscriptions/notifier.go +++ b/server/boards/services/notify/notifysubscriptions/notifier.go @@ -11,11 +11,11 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go b/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go index 881e9160cf..af020bea6b 100644 --- a/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go +++ b/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go @@ -11,11 +11,11 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifysubscriptions/util.go b/server/boards/services/notify/notifysubscriptions/util.go index 5494ceca9f..04f5b77433 100644 --- a/server/boards/services/notify/notifysubscriptions/util.go +++ b/server/boards/services/notify/notifysubscriptions/util.go @@ -6,7 +6,7 @@ package notifysubscriptions import ( "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func getBoardDescription(board *model.Block) string { diff --git a/server/boards/services/notify/plugindelivery/mention_deliver.go b/server/boards/services/notify/plugindelivery/mention_deliver.go index 330b0b23c3..dbb12e3c3b 100644 --- a/server/boards/services/notify/plugindelivery/mention_deliver.go +++ b/server/boards/services/notify/plugindelivery/mention_deliver.go @@ -6,10 +6,10 @@ package plugindelivery import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/services/notify" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) // MentionDeliver notifies a user they have been mentioned in a blockv ia the plugin API. diff --git a/server/boards/services/notify/plugindelivery/message.go b/server/boards/services/notify/plugindelivery/message.go index 26983bb644..ebaa0f7020 100644 --- a/server/boards/services/notify/plugindelivery/message.go +++ b/server/boards/services/notify/plugindelivery/message.go @@ -6,7 +6,7 @@ package plugindelivery import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) const ( diff --git a/server/boards/services/notify/plugindelivery/plugin_delivery.go b/server/boards/services/notify/plugindelivery/plugin_delivery.go index aa01ec3cb9..890118b3c9 100644 --- a/server/boards/services/notify/plugindelivery/plugin_delivery.go +++ b/server/boards/services/notify/plugindelivery/plugin_delivery.go @@ -4,7 +4,7 @@ package plugindelivery import ( - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) type servicesAPI interface { diff --git a/server/boards/services/notify/plugindelivery/subscription_deliver.go b/server/boards/services/notify/plugindelivery/subscription_deliver.go index 21fc3d7db1..a9353eb442 100644 --- a/server/boards/services/notify/plugindelivery/subscription_deliver.go +++ b/server/boards/services/notify/plugindelivery/subscription_deliver.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) var ( diff --git a/server/boards/services/notify/plugindelivery/user.go b/server/boards/services/notify/plugindelivery/user.go index e7f16931ab..c705a39107 100644 --- a/server/boards/services/notify/plugindelivery/user.go +++ b/server/boards/services/notify/plugindelivery/user.go @@ -6,9 +6,9 @@ package plugindelivery import ( "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/boards/services/notify/plugindelivery/user_test.go b/server/boards/services/notify/plugindelivery/user_test.go index 4702988a87..1c5aeccf4c 100644 --- a/server/boards/services/notify/plugindelivery/user_test.go +++ b/server/boards/services/notify/plugindelivery/user_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) var ( diff --git a/server/boards/services/notify/service.go b/server/boards/services/notify/service.go index 3814920497..308b2e7459 100644 --- a/server/boards/services/notify/service.go +++ b/server/boards/services/notify/service.go @@ -8,9 +8,9 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Action string diff --git a/server/boards/services/permissions/localpermissions/helpers_test.go b/server/boards/services/permissions/localpermissions/helpers_test.go index 26b0524088..13f0bfa389 100644 --- a/server/boards/services/permissions/localpermissions/helpers_test.go +++ b/server/boards/services/permissions/localpermissions/helpers_test.go @@ -6,11 +6,11 @@ package localpermissions import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - permissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/server/boards/services/permissions/localpermissions/localpermissions.go b/server/boards/services/permissions/localpermissions/localpermissions.go index 00c76abeac..ef63b55353 100644 --- a/server/boards/services/permissions/localpermissions/localpermissions.go +++ b/server/boards/services/permissions/localpermissions/localpermissions.go @@ -4,11 +4,11 @@ package localpermissions import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Service struct { diff --git a/server/boards/services/permissions/localpermissions/localpermissions_test.go b/server/boards/services/permissions/localpermissions/localpermissions_test.go index c141413225..8bc65bf49e 100644 --- a/server/boards/services/permissions/localpermissions/localpermissions_test.go +++ b/server/boards/services/permissions/localpermissions/localpermissions_test.go @@ -7,9 +7,9 @@ import ( "database/sql" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/assert" ) diff --git a/server/boards/services/permissions/mmpermissions/helpers_test.go b/server/boards/services/permissions/mmpermissions/helpers_test.go index 3ecfb8b93b..f8be25a1d6 100644 --- a/server/boards/services/permissions/mmpermissions/helpers_test.go +++ b/server/boards/services/permissions/mmpermissions/helpers_test.go @@ -6,12 +6,12 @@ package mmpermissions import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - mmpermissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions/mocks" - permissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mmpermissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions/mocks" + permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/server/boards/services/permissions/mmpermissions/mmpermissions.go b/server/boards/services/permissions/mmpermissions/mmpermissions.go index dba72213b1..671d9b10db 100644 --- a/server/boards/services/permissions/mmpermissions/mmpermissions.go +++ b/server/boards/services/permissions/mmpermissions/mmpermissions.go @@ -4,11 +4,11 @@ package mmpermissions import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type APIInterface interface { diff --git a/server/boards/services/permissions/mmpermissions/mmpermissions_test.go b/server/boards/services/permissions/mmpermissions/mmpermissions_test.go index e2d48cf580..9e532f7b98 100644 --- a/server/boards/services/permissions/mmpermissions/mmpermissions_test.go +++ b/server/boards/services/permissions/mmpermissions/mmpermissions_test.go @@ -1,16 +1,16 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -//go:generate mockgen -copyright_file=../../../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/v6/plugin API +//go:generate mockgen -copyright_file=../../../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/server/v8/plugin API package mmpermissions import ( "database/sql" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/assert" ) diff --git a/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go b/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go index 45cf40000b..612dd07d17 100644 --- a/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go +++ b/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/plugin (interfaces: API) +// Source: github.com/mattermost/mattermost-server/server/v8/plugin (interfaces: API) // Package mocks is a generated GoMock package. package mocks @@ -13,7 +13,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" ) // MockAPI is a mock of API interface. diff --git a/server/boards/services/permissions/mocks/mockstore.go b/server/boards/services/permissions/mocks/mockstore.go index 3bab466231..39fe98f029 100644 --- a/server/boards/services/permissions/mocks/mockstore.go +++ b/server/boards/services/permissions/mocks/mockstore.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/boards/services/permissions (interfaces: Store) +// Source: github.com/mattermost/mattermost-server/server/v8/boards/services/permissions (interfaces: Store) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/server/boards/model" + model "github.com/mattermost/mattermost-server/server/v8/boards/model" ) // MockStore is a mock of Store interface. diff --git a/server/boards/services/permissions/permissions.go b/server/boards/services/permissions/permissions.go index 3c8d8a94fb..2adfdd28a1 100644 --- a/server/boards/services/permissions/permissions.go +++ b/server/boards/services/permissions/permissions.go @@ -6,9 +6,9 @@ package permissions import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) type PermissionsService interface { diff --git a/server/boards/services/store/generators/transactional_store.go.tmpl b/server/boards/services/store/generators/transactional_store.go.tmpl index 517fbc1bf1..ff81becb83 100644 --- a/server/boards/services/store/generators/transactional_store.go.tmpl +++ b/server/boards/services/store/generators/transactional_store.go.tmpl @@ -16,10 +16,10 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - mm_model "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) {{range $index, $element := .Methods}} diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go index e749d5d9cd..669305a076 100644 --- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go +++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go @@ -11,15 +11,15 @@ import ( "net/http" "strings" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var boardsBotID string diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go index caa6bc88c3..fed0665789 100644 --- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go +++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/mock/gomock" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - mockservicesapi "github.com/mattermost/mattermost-server/v6/server/boards/model/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/mockstore/mockstore.go b/server/boards/services/store/mockstore/mockstore.go index 5cd89f13eb..153b7aa7ca 100644 --- a/server/boards/services/store/mockstore/mockstore.go +++ b/server/boards/services/store/mockstore/mockstore.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/boards/services/store (interfaces: Store) +// Source: github.com/mattermost/mattermost-server/server/v8/boards/services/store (interfaces: Store) // Package mockstore is a generated GoMock package. package mockstore @@ -12,8 +12,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/model" - model0 "github.com/mattermost/mattermost-server/v6/server/boards/model" + model "github.com/mattermost/mattermost-server/server/v8/boards/model" + model0 "github.com/mattermost/mattermost-server/server/v8/model" ) // MockStore is a mock of Store interface. @@ -83,10 +83,10 @@ func (mr *MockStoreMockRecorder) CleanUpSessions(arg0 interface{}) *gomock.Call } // CreateBoardsAndBlocks mocks base method. -func (m *MockStore) CreateBoardsAndBlocks(arg0 *model0.BoardsAndBlocks, arg1 string) (*model0.BoardsAndBlocks, error) { +func (m *MockStore) CreateBoardsAndBlocks(arg0 *model.BoardsAndBlocks, arg1 string) (*model.BoardsAndBlocks, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateBoardsAndBlocks", arg0, arg1) - ret0, _ := ret[0].(*model0.BoardsAndBlocks) + ret0, _ := ret[0].(*model.BoardsAndBlocks) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -98,11 +98,11 @@ func (mr *MockStoreMockRecorder) CreateBoardsAndBlocks(arg0, arg1 interface{}) * } // CreateBoardsAndBlocksWithAdmin mocks base method. -func (m *MockStore) CreateBoardsAndBlocksWithAdmin(arg0 *model0.BoardsAndBlocks, arg1 string) (*model0.BoardsAndBlocks, []*model0.BoardMember, error) { +func (m *MockStore) CreateBoardsAndBlocksWithAdmin(arg0 *model.BoardsAndBlocks, arg1 string) (*model.BoardsAndBlocks, []*model.BoardMember, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateBoardsAndBlocksWithAdmin", arg0, arg1) - ret0, _ := ret[0].(*model0.BoardsAndBlocks) - ret1, _ := ret[1].([]*model0.BoardMember) + ret0, _ := ret[0].(*model.BoardsAndBlocks) + ret1, _ := ret[1].([]*model.BoardMember) ret2, _ := ret[2].(error) return ret0, ret1, ret2 } @@ -114,7 +114,7 @@ func (mr *MockStoreMockRecorder) CreateBoardsAndBlocksWithAdmin(arg0, arg1 inter } // CreateCategory mocks base method. -func (m *MockStore) CreateCategory(arg0 model0.Category) error { +func (m *MockStore) CreateCategory(arg0 model.Category) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateCategory", arg0) ret0, _ := ret[0].(error) @@ -128,7 +128,7 @@ func (mr *MockStoreMockRecorder) CreateCategory(arg0 interface{}) *gomock.Call { } // CreateSession mocks base method. -func (m *MockStore) CreateSession(arg0 *model0.Session) error { +func (m *MockStore) CreateSession(arg0 *model.Session) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateSession", arg0) ret0, _ := ret[0].(error) @@ -142,10 +142,10 @@ func (mr *MockStoreMockRecorder) CreateSession(arg0 interface{}) *gomock.Call { } // CreateSubscription mocks base method. -func (m *MockStore) CreateSubscription(arg0 *model0.Subscription) (*model0.Subscription, error) { +func (m *MockStore) CreateSubscription(arg0 *model.Subscription) (*model.Subscription, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateSubscription", arg0) - ret0, _ := ret[0].(*model0.Subscription) + ret0, _ := ret[0].(*model.Subscription) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -157,10 +157,10 @@ func (mr *MockStoreMockRecorder) CreateSubscription(arg0 interface{}) *gomock.Ca } // CreateUser mocks base method. -func (m *MockStore) CreateUser(arg0 *model0.User) (*model0.User, error) { +func (m *MockStore) CreateUser(arg0 *model.User) (*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateUser", arg0) - ret0, _ := ret[0].(*model0.User) + ret0, _ := ret[0].(*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -256,7 +256,7 @@ func (mr *MockStoreMockRecorder) DeleteBoardRecord(arg0, arg1 interface{}) *gomo } // DeleteBoardsAndBlocks mocks base method. -func (m *MockStore) DeleteBoardsAndBlocks(arg0 *model0.DeleteBoardsAndBlocks, arg1 string) error { +func (m *MockStore) DeleteBoardsAndBlocks(arg0 *model.DeleteBoardsAndBlocks, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteBoardsAndBlocks", arg0, arg1) ret0, _ := ret[0].(error) @@ -354,10 +354,10 @@ func (mr *MockStoreMockRecorder) DropAllTables() *gomock.Call { } // DuplicateBlock mocks base method. -func (m *MockStore) DuplicateBlock(arg0, arg1, arg2 string, arg3 bool) ([]*model0.Block, error) { +func (m *MockStore) DuplicateBlock(arg0, arg1, arg2 string, arg3 bool) ([]*model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DuplicateBlock", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].([]*model0.Block) + ret0, _ := ret[0].([]*model.Block) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -369,11 +369,11 @@ func (mr *MockStoreMockRecorder) DuplicateBlock(arg0, arg1, arg2, arg3 interface } // DuplicateBoard mocks base method. -func (m *MockStore) DuplicateBoard(arg0, arg1, arg2 string, arg3 bool) (*model0.BoardsAndBlocks, []*model0.BoardMember, error) { +func (m *MockStore) DuplicateBoard(arg0, arg1, arg2 string, arg3 bool) (*model.BoardsAndBlocks, []*model.BoardMember, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DuplicateBoard", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].(*model0.BoardsAndBlocks) - ret1, _ := ret[1].([]*model0.BoardMember) + ret0, _ := ret[0].(*model.BoardsAndBlocks) + ret1, _ := ret[1].([]*model.BoardMember) ret2, _ := ret[2].(error) return ret0, ret1, ret2 } @@ -400,10 +400,10 @@ func (mr *MockStoreMockRecorder) GetActiveUserCount(arg0 interface{}) *gomock.Ca } // GetAllTeams mocks base method. -func (m *MockStore) GetAllTeams() ([]*model0.Team, error) { +func (m *MockStore) GetAllTeams() ([]*model.Team, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllTeams") - ret0, _ := ret[0].([]*model0.Team) + ret0, _ := ret[0].([]*model.Team) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -415,10 +415,10 @@ func (mr *MockStoreMockRecorder) GetAllTeams() *gomock.Call { } // GetBlock mocks base method. -func (m *MockStore) GetBlock(arg0 string) (*model0.Block, error) { +func (m *MockStore) GetBlock(arg0 string) (*model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBlock", arg0) - ret0, _ := ret[0].(*model0.Block) + ret0, _ := ret[0].(*model.Block) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -445,10 +445,10 @@ func (mr *MockStoreMockRecorder) GetBlockCountsByType() *gomock.Call { } // GetBlockHistory mocks base method. -func (m *MockStore) GetBlockHistory(arg0 string, arg1 model0.QueryBlockHistoryOptions) ([]*model0.Block, error) { +func (m *MockStore) GetBlockHistory(arg0 string, arg1 model.QueryBlockHistoryOptions) ([]*model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBlockHistory", arg0, arg1) - ret0, _ := ret[0].([]*model0.Block) + ret0, _ := ret[0].([]*model.Block) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -460,10 +460,10 @@ func (mr *MockStoreMockRecorder) GetBlockHistory(arg0, arg1 interface{}) *gomock } // GetBlockHistoryDescendants mocks base method. -func (m *MockStore) GetBlockHistoryDescendants(arg0 string, arg1 model0.QueryBlockHistoryOptions) ([]*model0.Block, error) { +func (m *MockStore) GetBlockHistoryDescendants(arg0 string, arg1 model.QueryBlockHistoryOptions) ([]*model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBlockHistoryDescendants", arg0, arg1) - ret0, _ := ret[0].([]*model0.Block) + ret0, _ := ret[0].([]*model.Block) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -475,10 +475,10 @@ func (mr *MockStoreMockRecorder) GetBlockHistoryDescendants(arg0, arg1 interface } // GetBlockHistoryNewestChildren mocks base method. -func (m *MockStore) GetBlockHistoryNewestChildren(arg0 string, arg1 model0.QueryBlockHistoryChildOptions) ([]*model0.Block, bool, error) { +func (m *MockStore) GetBlockHistoryNewestChildren(arg0 string, arg1 model.QueryBlockHistoryChildOptions) ([]*model.Block, bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBlockHistoryNewestChildren", arg0, arg1) - ret0, _ := ret[0].([]*model0.Block) + ret0, _ := ret[0].([]*model.Block) ret1, _ := ret[1].(bool) ret2, _ := ret[2].(error) return ret0, ret1, ret2 @@ -491,10 +491,10 @@ func (mr *MockStoreMockRecorder) GetBlockHistoryNewestChildren(arg0, arg1 interf } // GetBlocks mocks base method. -func (m *MockStore) GetBlocks(arg0 model0.QueryBlocksOptions) ([]*model0.Block, error) { +func (m *MockStore) GetBlocks(arg0 model.QueryBlocksOptions) ([]*model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBlocks", arg0) - ret0, _ := ret[0].([]*model0.Block) + ret0, _ := ret[0].([]*model.Block) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -506,10 +506,10 @@ func (mr *MockStoreMockRecorder) GetBlocks(arg0 interface{}) *gomock.Call { } // GetBlocksByIDs mocks base method. -func (m *MockStore) GetBlocksByIDs(arg0 []string) ([]*model0.Block, error) { +func (m *MockStore) GetBlocksByIDs(arg0 []string) ([]*model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBlocksByIDs", arg0) - ret0, _ := ret[0].([]*model0.Block) + ret0, _ := ret[0].([]*model.Block) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -521,10 +521,10 @@ func (mr *MockStoreMockRecorder) GetBlocksByIDs(arg0 interface{}) *gomock.Call { } // GetBlocksComplianceHistory mocks base method. -func (m *MockStore) GetBlocksComplianceHistory(arg0 model0.QueryBlocksComplianceHistoryOptions) ([]*model0.BlockHistory, bool, error) { +func (m *MockStore) GetBlocksComplianceHistory(arg0 model.QueryBlocksComplianceHistoryOptions) ([]*model.BlockHistory, bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBlocksComplianceHistory", arg0) - ret0, _ := ret[0].([]*model0.BlockHistory) + ret0, _ := ret[0].([]*model.BlockHistory) ret1, _ := ret[1].(bool) ret2, _ := ret[2].(error) return ret0, ret1, ret2 @@ -537,10 +537,10 @@ func (mr *MockStoreMockRecorder) GetBlocksComplianceHistory(arg0 interface{}) *g } // GetBoard mocks base method. -func (m *MockStore) GetBoard(arg0 string) (*model0.Board, error) { +func (m *MockStore) GetBoard(arg0 string) (*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoard", arg0) - ret0, _ := ret[0].(*model0.Board) + ret0, _ := ret[0].(*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -552,11 +552,11 @@ func (mr *MockStoreMockRecorder) GetBoard(arg0 interface{}) *gomock.Call { } // GetBoardAndCard mocks base method. -func (m *MockStore) GetBoardAndCard(arg0 *model0.Block) (*model0.Board, *model0.Block, error) { +func (m *MockStore) GetBoardAndCard(arg0 *model.Block) (*model.Board, *model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardAndCard", arg0) - ret0, _ := ret[0].(*model0.Board) - ret1, _ := ret[1].(*model0.Block) + ret0, _ := ret[0].(*model.Board) + ret1, _ := ret[1].(*model.Block) ret2, _ := ret[2].(error) return ret0, ret1, ret2 } @@ -568,11 +568,11 @@ func (mr *MockStoreMockRecorder) GetBoardAndCard(arg0 interface{}) *gomock.Call } // GetBoardAndCardByID mocks base method. -func (m *MockStore) GetBoardAndCardByID(arg0 string) (*model0.Board, *model0.Block, error) { +func (m *MockStore) GetBoardAndCardByID(arg0 string) (*model.Board, *model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardAndCardByID", arg0) - ret0, _ := ret[0].(*model0.Board) - ret1, _ := ret[1].(*model0.Block) + ret0, _ := ret[0].(*model.Board) + ret1, _ := ret[1].(*model.Block) ret2, _ := ret[2].(error) return ret0, ret1, ret2 } @@ -599,10 +599,10 @@ func (mr *MockStoreMockRecorder) GetBoardCount() *gomock.Call { } // GetBoardHistory mocks base method. -func (m *MockStore) GetBoardHistory(arg0 string, arg1 model0.QueryBoardHistoryOptions) ([]*model0.Board, error) { +func (m *MockStore) GetBoardHistory(arg0 string, arg1 model.QueryBoardHistoryOptions) ([]*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardHistory", arg0, arg1) - ret0, _ := ret[0].([]*model0.Board) + ret0, _ := ret[0].([]*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -614,10 +614,10 @@ func (mr *MockStoreMockRecorder) GetBoardHistory(arg0, arg1 interface{}) *gomock } // GetBoardMemberHistory mocks base method. -func (m *MockStore) GetBoardMemberHistory(arg0, arg1 string, arg2 uint64) ([]*model0.BoardMemberHistoryEntry, error) { +func (m *MockStore) GetBoardMemberHistory(arg0, arg1 string, arg2 uint64) ([]*model.BoardMemberHistoryEntry, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardMemberHistory", arg0, arg1, arg2) - ret0, _ := ret[0].([]*model0.BoardMemberHistoryEntry) + ret0, _ := ret[0].([]*model.BoardMemberHistoryEntry) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -629,10 +629,10 @@ func (mr *MockStoreMockRecorder) GetBoardMemberHistory(arg0, arg1, arg2 interfac } // GetBoardsComplianceHistory mocks base method. -func (m *MockStore) GetBoardsComplianceHistory(arg0 model0.QueryBoardsComplianceHistoryOptions) ([]*model0.BoardHistory, bool, error) { +func (m *MockStore) GetBoardsComplianceHistory(arg0 model.QueryBoardsComplianceHistoryOptions) ([]*model.BoardHistory, bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardsComplianceHistory", arg0) - ret0, _ := ret[0].([]*model0.BoardHistory) + ret0, _ := ret[0].([]*model.BoardHistory) ret1, _ := ret[1].(bool) ret2, _ := ret[2].(error) return ret0, ret1, ret2 @@ -645,10 +645,10 @@ func (mr *MockStoreMockRecorder) GetBoardsComplianceHistory(arg0 interface{}) *g } // GetBoardsForCompliance mocks base method. -func (m *MockStore) GetBoardsForCompliance(arg0 model0.QueryBoardsForComplianceOptions) ([]*model0.Board, bool, error) { +func (m *MockStore) GetBoardsForCompliance(arg0 model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardsForCompliance", arg0) - ret0, _ := ret[0].([]*model0.Board) + ret0, _ := ret[0].([]*model.Board) ret1, _ := ret[1].(bool) ret2, _ := ret[2].(error) return ret0, ret1, ret2 @@ -661,10 +661,10 @@ func (mr *MockStoreMockRecorder) GetBoardsForCompliance(arg0 interface{}) *gomoc } // GetBoardsForUserAndTeam mocks base method. -func (m *MockStore) GetBoardsForUserAndTeam(arg0, arg1 string, arg2 bool) ([]*model0.Board, error) { +func (m *MockStore) GetBoardsForUserAndTeam(arg0, arg1 string, arg2 bool) ([]*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardsForUserAndTeam", arg0, arg1, arg2) - ret0, _ := ret[0].([]*model0.Board) + ret0, _ := ret[0].([]*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -676,10 +676,10 @@ func (mr *MockStoreMockRecorder) GetBoardsForUserAndTeam(arg0, arg1, arg2 interf } // GetBoardsInTeamByIds mocks base method. -func (m *MockStore) GetBoardsInTeamByIds(arg0 []string, arg1 string) ([]*model0.Board, error) { +func (m *MockStore) GetBoardsInTeamByIds(arg0 []string, arg1 string) ([]*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetBoardsInTeamByIds", arg0, arg1) - ret0, _ := ret[0].([]*model0.Board) + ret0, _ := ret[0].([]*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -706,10 +706,10 @@ func (mr *MockStoreMockRecorder) GetCardLimitTimestamp() *gomock.Call { } // GetCategory mocks base method. -func (m *MockStore) GetCategory(arg0 string) (*model0.Category, error) { +func (m *MockStore) GetCategory(arg0 string) (*model.Category, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetCategory", arg0) - ret0, _ := ret[0].(*model0.Category) + ret0, _ := ret[0].(*model.Category) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -721,10 +721,10 @@ func (mr *MockStoreMockRecorder) GetCategory(arg0 interface{}) *gomock.Call { } // GetChannel mocks base method. -func (m *MockStore) GetChannel(arg0, arg1 string) (*model.Channel, error) { +func (m *MockStore) GetChannel(arg0, arg1 string) (*model0.Channel, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetChannel", arg0, arg1) - ret0, _ := ret[0].(*model.Channel) + ret0, _ := ret[0].(*model0.Channel) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -736,10 +736,10 @@ func (mr *MockStoreMockRecorder) GetChannel(arg0, arg1 interface{}) *gomock.Call } // GetCloudLimits mocks base method. -func (m *MockStore) GetCloudLimits() (*model.ProductLimits, error) { +func (m *MockStore) GetCloudLimits() (*model0.ProductLimits, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetCloudLimits") - ret0, _ := ret[0].(*model.ProductLimits) + ret0, _ := ret[0].(*model0.ProductLimits) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -751,10 +751,10 @@ func (mr *MockStoreMockRecorder) GetCloudLimits() *gomock.Call { } // GetFileInfo mocks base method. -func (m *MockStore) GetFileInfo(arg0 string) (*model.FileInfo, error) { +func (m *MockStore) GetFileInfo(arg0 string) (*model0.FileInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetFileInfo", arg0) - ret0, _ := ret[0].(*model.FileInfo) + ret0, _ := ret[0].(*model0.FileInfo) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -766,10 +766,10 @@ func (mr *MockStoreMockRecorder) GetFileInfo(arg0 interface{}) *gomock.Call { } // GetLicense mocks base method. -func (m *MockStore) GetLicense() *model.License { +func (m *MockStore) GetLicense() *model0.License { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetLicense") - ret0, _ := ret[0].(*model.License) + ret0, _ := ret[0].(*model0.License) return ret0 } @@ -780,10 +780,10 @@ func (mr *MockStoreMockRecorder) GetLicense() *gomock.Call { } // GetMemberForBoard mocks base method. -func (m *MockStore) GetMemberForBoard(arg0, arg1 string) (*model0.BoardMember, error) { +func (m *MockStore) GetMemberForBoard(arg0, arg1 string) (*model.BoardMember, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetMemberForBoard", arg0, arg1) - ret0, _ := ret[0].(*model0.BoardMember) + ret0, _ := ret[0].(*model.BoardMember) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -795,10 +795,10 @@ func (mr *MockStoreMockRecorder) GetMemberForBoard(arg0, arg1 interface{}) *gomo } // GetMembersForBoard mocks base method. -func (m *MockStore) GetMembersForBoard(arg0 string) ([]*model0.BoardMember, error) { +func (m *MockStore) GetMembersForBoard(arg0 string) ([]*model.BoardMember, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetMembersForBoard", arg0) - ret0, _ := ret[0].([]*model0.BoardMember) + ret0, _ := ret[0].([]*model.BoardMember) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -810,10 +810,10 @@ func (mr *MockStoreMockRecorder) GetMembersForBoard(arg0 interface{}) *gomock.Ca } // GetMembersForUser mocks base method. -func (m *MockStore) GetMembersForUser(arg0 string) ([]*model0.BoardMember, error) { +func (m *MockStore) GetMembersForUser(arg0 string) ([]*model.BoardMember, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetMembersForUser", arg0) - ret0, _ := ret[0].([]*model0.BoardMember) + ret0, _ := ret[0].([]*model.BoardMember) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -825,10 +825,10 @@ func (mr *MockStoreMockRecorder) GetMembersForUser(arg0 interface{}) *gomock.Cal } // GetNextNotificationHint mocks base method. -func (m *MockStore) GetNextNotificationHint(arg0 bool) (*model0.NotificationHint, error) { +func (m *MockStore) GetNextNotificationHint(arg0 bool) (*model.NotificationHint, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetNextNotificationHint", arg0) - ret0, _ := ret[0].(*model0.NotificationHint) + ret0, _ := ret[0].(*model.NotificationHint) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -840,10 +840,10 @@ func (mr *MockStoreMockRecorder) GetNextNotificationHint(arg0 interface{}) *gomo } // GetNotificationHint mocks base method. -func (m *MockStore) GetNotificationHint(arg0 string) (*model0.NotificationHint, error) { +func (m *MockStore) GetNotificationHint(arg0 string) (*model.NotificationHint, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetNotificationHint", arg0) - ret0, _ := ret[0].(*model0.NotificationHint) + ret0, _ := ret[0].(*model.NotificationHint) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -870,10 +870,10 @@ func (mr *MockStoreMockRecorder) GetRegisteredUserCount() *gomock.Call { } // GetSession mocks base method. -func (m *MockStore) GetSession(arg0 string, arg1 int64) (*model0.Session, error) { +func (m *MockStore) GetSession(arg0 string, arg1 int64) (*model.Session, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSession", arg0, arg1) - ret0, _ := ret[0].(*model0.Session) + ret0, _ := ret[0].(*model.Session) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -885,10 +885,10 @@ func (mr *MockStoreMockRecorder) GetSession(arg0, arg1 interface{}) *gomock.Call } // GetSharing mocks base method. -func (m *MockStore) GetSharing(arg0 string) (*model0.Sharing, error) { +func (m *MockStore) GetSharing(arg0 string) (*model.Sharing, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSharing", arg0) - ret0, _ := ret[0].(*model0.Sharing) + ret0, _ := ret[0].(*model.Sharing) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -900,10 +900,10 @@ func (mr *MockStoreMockRecorder) GetSharing(arg0 interface{}) *gomock.Call { } // GetSubTree2 mocks base method. -func (m *MockStore) GetSubTree2(arg0, arg1 string, arg2 model0.QuerySubtreeOptions) ([]*model0.Block, error) { +func (m *MockStore) GetSubTree2(arg0, arg1 string, arg2 model.QuerySubtreeOptions) ([]*model.Block, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSubTree2", arg0, arg1, arg2) - ret0, _ := ret[0].([]*model0.Block) + ret0, _ := ret[0].([]*model.Block) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -930,10 +930,10 @@ func (mr *MockStoreMockRecorder) GetSubscribersCountForBlock(arg0 interface{}) * } // GetSubscribersForBlock mocks base method. -func (m *MockStore) GetSubscribersForBlock(arg0 string) ([]*model0.Subscriber, error) { +func (m *MockStore) GetSubscribersForBlock(arg0 string) ([]*model.Subscriber, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSubscribersForBlock", arg0) - ret0, _ := ret[0].([]*model0.Subscriber) + ret0, _ := ret[0].([]*model.Subscriber) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -945,10 +945,10 @@ func (mr *MockStoreMockRecorder) GetSubscribersForBlock(arg0 interface{}) *gomoc } // GetSubscription mocks base method. -func (m *MockStore) GetSubscription(arg0, arg1 string) (*model0.Subscription, error) { +func (m *MockStore) GetSubscription(arg0, arg1 string) (*model.Subscription, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSubscription", arg0, arg1) - ret0, _ := ret[0].(*model0.Subscription) + ret0, _ := ret[0].(*model.Subscription) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -960,10 +960,10 @@ func (mr *MockStoreMockRecorder) GetSubscription(arg0, arg1 interface{}) *gomock } // GetSubscriptions mocks base method. -func (m *MockStore) GetSubscriptions(arg0 string) ([]*model0.Subscription, error) { +func (m *MockStore) GetSubscriptions(arg0 string) ([]*model.Subscription, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSubscriptions", arg0) - ret0, _ := ret[0].([]*model0.Subscription) + ret0, _ := ret[0].([]*model.Subscription) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1005,10 +1005,10 @@ func (mr *MockStoreMockRecorder) GetSystemSettings() *gomock.Call { } // GetTeam mocks base method. -func (m *MockStore) GetTeam(arg0 string) (*model0.Team, error) { +func (m *MockStore) GetTeam(arg0 string) (*model.Team, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetTeam", arg0) - ret0, _ := ret[0].(*model0.Team) + ret0, _ := ret[0].(*model.Team) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1020,10 +1020,10 @@ func (mr *MockStoreMockRecorder) GetTeam(arg0 interface{}) *gomock.Call { } // GetTeamBoardsInsights mocks base method. -func (m *MockStore) GetTeamBoardsInsights(arg0 string, arg1 int64, arg2, arg3 int, arg4 []string) (*model0.BoardInsightsList, error) { +func (m *MockStore) GetTeamBoardsInsights(arg0 string, arg1 int64, arg2, arg3 int, arg4 []string) (*model.BoardInsightsList, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetTeamBoardsInsights", arg0, arg1, arg2, arg3, arg4) - ret0, _ := ret[0].(*model0.BoardInsightsList) + ret0, _ := ret[0].(*model.BoardInsightsList) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1050,10 +1050,10 @@ func (mr *MockStoreMockRecorder) GetTeamCount() *gomock.Call { } // GetTeamsForUser mocks base method. -func (m *MockStore) GetTeamsForUser(arg0 string) ([]*model0.Team, error) { +func (m *MockStore) GetTeamsForUser(arg0 string) ([]*model.Team, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetTeamsForUser", arg0) - ret0, _ := ret[0].([]*model0.Team) + ret0, _ := ret[0].([]*model.Team) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1065,10 +1065,10 @@ func (mr *MockStoreMockRecorder) GetTeamsForUser(arg0 interface{}) *gomock.Call } // GetTemplateBoards mocks base method. -func (m *MockStore) GetTemplateBoards(arg0, arg1 string) ([]*model0.Board, error) { +func (m *MockStore) GetTemplateBoards(arg0, arg1 string) ([]*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetTemplateBoards", arg0, arg1) - ret0, _ := ret[0].([]*model0.Board) + ret0, _ := ret[0].([]*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1095,10 +1095,10 @@ func (mr *MockStoreMockRecorder) GetUsedCardsCount() *gomock.Call { } // GetUserBoardsInsights mocks base method. -func (m *MockStore) GetUserBoardsInsights(arg0, arg1 string, arg2 int64, arg3, arg4 int, arg5 []string) (*model0.BoardInsightsList, error) { +func (m *MockStore) GetUserBoardsInsights(arg0, arg1 string, arg2 int64, arg3, arg4 int, arg5 []string) (*model.BoardInsightsList, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserBoardsInsights", arg0, arg1, arg2, arg3, arg4, arg5) - ret0, _ := ret[0].(*model0.BoardInsightsList) + ret0, _ := ret[0].(*model.BoardInsightsList) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1110,10 +1110,10 @@ func (mr *MockStoreMockRecorder) GetUserBoardsInsights(arg0, arg1, arg2, arg3, a } // GetUserByEmail mocks base method. -func (m *MockStore) GetUserByEmail(arg0 string) (*model0.User, error) { +func (m *MockStore) GetUserByEmail(arg0 string) (*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserByEmail", arg0) - ret0, _ := ret[0].(*model0.User) + ret0, _ := ret[0].(*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1125,10 +1125,10 @@ func (mr *MockStoreMockRecorder) GetUserByEmail(arg0 interface{}) *gomock.Call { } // GetUserByID mocks base method. -func (m *MockStore) GetUserByID(arg0 string) (*model0.User, error) { +func (m *MockStore) GetUserByID(arg0 string) (*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserByID", arg0) - ret0, _ := ret[0].(*model0.User) + ret0, _ := ret[0].(*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1140,10 +1140,10 @@ func (mr *MockStoreMockRecorder) GetUserByID(arg0 interface{}) *gomock.Call { } // GetUserByUsername mocks base method. -func (m *MockStore) GetUserByUsername(arg0 string) (*model0.User, error) { +func (m *MockStore) GetUserByUsername(arg0 string) (*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserByUsername", arg0) - ret0, _ := ret[0].(*model0.User) + ret0, _ := ret[0].(*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1155,10 +1155,10 @@ func (mr *MockStoreMockRecorder) GetUserByUsername(arg0 interface{}) *gomock.Cal } // GetUserCategories mocks base method. -func (m *MockStore) GetUserCategories(arg0, arg1 string) ([]model0.Category, error) { +func (m *MockStore) GetUserCategories(arg0, arg1 string) ([]model.Category, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserCategories", arg0, arg1) - ret0, _ := ret[0].([]model0.Category) + ret0, _ := ret[0].([]model.Category) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1170,10 +1170,10 @@ func (mr *MockStoreMockRecorder) GetUserCategories(arg0, arg1 interface{}) *gomo } // GetUserCategoryBoards mocks base method. -func (m *MockStore) GetUserCategoryBoards(arg0, arg1 string) ([]model0.CategoryBoards, error) { +func (m *MockStore) GetUserCategoryBoards(arg0, arg1 string) ([]model.CategoryBoards, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserCategoryBoards", arg0, arg1) - ret0, _ := ret[0].([]model0.CategoryBoards) + ret0, _ := ret[0].([]model.CategoryBoards) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1185,10 +1185,10 @@ func (mr *MockStoreMockRecorder) GetUserCategoryBoards(arg0, arg1 interface{}) * } // GetUserPreferences mocks base method. -func (m *MockStore) GetUserPreferences(arg0 string) (model.Preferences, error) { +func (m *MockStore) GetUserPreferences(arg0 string) (model0.Preferences, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserPreferences", arg0) - ret0, _ := ret[0].(model.Preferences) + ret0, _ := ret[0].(model0.Preferences) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1215,10 +1215,10 @@ func (mr *MockStoreMockRecorder) GetUserTimezone(arg0 interface{}) *gomock.Call } // GetUsersByTeam mocks base method. -func (m *MockStore) GetUsersByTeam(arg0, arg1 string, arg2, arg3 bool) ([]*model0.User, error) { +func (m *MockStore) GetUsersByTeam(arg0, arg1 string, arg2, arg3 bool) ([]*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUsersByTeam", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].([]*model0.User) + ret0, _ := ret[0].([]*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1230,10 +1230,10 @@ func (mr *MockStoreMockRecorder) GetUsersByTeam(arg0, arg1, arg2, arg3 interface } // GetUsersList mocks base method. -func (m *MockStore) GetUsersList(arg0 []string, arg1, arg2 bool) ([]*model0.User, error) { +func (m *MockStore) GetUsersList(arg0 []string, arg1, arg2 bool) ([]*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUsersList", arg0, arg1, arg2) - ret0, _ := ret[0].([]*model0.User) + ret0, _ := ret[0].([]*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1245,7 +1245,7 @@ func (mr *MockStoreMockRecorder) GetUsersList(arg0, arg1, arg2 interface{}) *gom } // InsertBlock mocks base method. -func (m *MockStore) InsertBlock(arg0 *model0.Block, arg1 string) error { +func (m *MockStore) InsertBlock(arg0 *model.Block, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertBlock", arg0, arg1) ret0, _ := ret[0].(error) @@ -1259,7 +1259,7 @@ func (mr *MockStoreMockRecorder) InsertBlock(arg0, arg1 interface{}) *gomock.Cal } // InsertBlocks mocks base method. -func (m *MockStore) InsertBlocks(arg0 []*model0.Block, arg1 string) error { +func (m *MockStore) InsertBlocks(arg0 []*model.Block, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertBlocks", arg0, arg1) ret0, _ := ret[0].(error) @@ -1273,10 +1273,10 @@ func (mr *MockStoreMockRecorder) InsertBlocks(arg0, arg1 interface{}) *gomock.Ca } // InsertBoard mocks base method. -func (m *MockStore) InsertBoard(arg0 *model0.Board, arg1 string) (*model0.Board, error) { +func (m *MockStore) InsertBoard(arg0 *model.Board, arg1 string) (*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertBoard", arg0, arg1) - ret0, _ := ret[0].(*model0.Board) + ret0, _ := ret[0].(*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1288,11 +1288,11 @@ func (mr *MockStoreMockRecorder) InsertBoard(arg0, arg1 interface{}) *gomock.Cal } // InsertBoardWithAdmin mocks base method. -func (m *MockStore) InsertBoardWithAdmin(arg0 *model0.Board, arg1 string) (*model0.Board, *model0.BoardMember, error) { +func (m *MockStore) InsertBoardWithAdmin(arg0 *model.Board, arg1 string) (*model.Board, *model.BoardMember, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InsertBoardWithAdmin", arg0, arg1) - ret0, _ := ret[0].(*model0.Board) - ret1, _ := ret[1].(*model0.BoardMember) + ret0, _ := ret[0].(*model.Board) + ret1, _ := ret[1].(*model.BoardMember) ret2, _ := ret[2].(error) return ret0, ret1, ret2 } @@ -1304,7 +1304,7 @@ func (mr *MockStoreMockRecorder) InsertBoardWithAdmin(arg0, arg1 interface{}) *g } // PatchBlock mocks base method. -func (m *MockStore) PatchBlock(arg0 string, arg1 *model0.BlockPatch, arg2 string) error { +func (m *MockStore) PatchBlock(arg0 string, arg1 *model.BlockPatch, arg2 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "PatchBlock", arg0, arg1, arg2) ret0, _ := ret[0].(error) @@ -1318,7 +1318,7 @@ func (mr *MockStoreMockRecorder) PatchBlock(arg0, arg1, arg2 interface{}) *gomoc } // PatchBlocks mocks base method. -func (m *MockStore) PatchBlocks(arg0 *model0.BlockPatchBatch, arg1 string) error { +func (m *MockStore) PatchBlocks(arg0 *model.BlockPatchBatch, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "PatchBlocks", arg0, arg1) ret0, _ := ret[0].(error) @@ -1332,10 +1332,10 @@ func (mr *MockStoreMockRecorder) PatchBlocks(arg0, arg1 interface{}) *gomock.Cal } // PatchBoard mocks base method. -func (m *MockStore) PatchBoard(arg0 string, arg1 *model0.BoardPatch, arg2 string) (*model0.Board, error) { +func (m *MockStore) PatchBoard(arg0 string, arg1 *model.BoardPatch, arg2 string) (*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "PatchBoard", arg0, arg1, arg2) - ret0, _ := ret[0].(*model0.Board) + ret0, _ := ret[0].(*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1347,10 +1347,10 @@ func (mr *MockStoreMockRecorder) PatchBoard(arg0, arg1, arg2 interface{}) *gomoc } // PatchBoardsAndBlocks mocks base method. -func (m *MockStore) PatchBoardsAndBlocks(arg0 *model0.PatchBoardsAndBlocks, arg1 string) (*model0.BoardsAndBlocks, error) { +func (m *MockStore) PatchBoardsAndBlocks(arg0 *model.PatchBoardsAndBlocks, arg1 string) (*model.BoardsAndBlocks, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "PatchBoardsAndBlocks", arg0, arg1) - ret0, _ := ret[0].(*model0.BoardsAndBlocks) + ret0, _ := ret[0].(*model.BoardsAndBlocks) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1362,10 +1362,10 @@ func (mr *MockStoreMockRecorder) PatchBoardsAndBlocks(arg0, arg1 interface{}) *g } // PatchUserPreferences mocks base method. -func (m *MockStore) PatchUserPreferences(arg0 string, arg1 model0.UserPreferencesPatch) (model.Preferences, error) { +func (m *MockStore) PatchUserPreferences(arg0 string, arg1 model.UserPreferencesPatch) (model0.Preferences, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "PatchUserPreferences", arg0, arg1) - ret0, _ := ret[0].(model.Preferences) + ret0, _ := ret[0].(model0.Preferences) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1391,7 +1391,7 @@ func (mr *MockStoreMockRecorder) PostMessage(arg0, arg1, arg2 interface{}) *gomo } // RefreshSession mocks base method. -func (m *MockStore) RefreshSession(arg0 *model0.Session) error { +func (m *MockStore) RefreshSession(arg0 *model.Session) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RefreshSession", arg0) ret0, _ := ret[0].(error) @@ -1405,7 +1405,7 @@ func (mr *MockStoreMockRecorder) RefreshSession(arg0 interface{}) *gomock.Call { } // RemoveDefaultTemplates mocks base method. -func (m *MockStore) RemoveDefaultTemplates(arg0 []*model0.Board) error { +func (m *MockStore) RemoveDefaultTemplates(arg0 []*model.Board) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemoveDefaultTemplates", arg0) ret0, _ := ret[0].(error) @@ -1464,7 +1464,7 @@ func (mr *MockStoreMockRecorder) RunDataRetention(arg0, arg1 interface{}) *gomoc } // SaveFileInfo mocks base method. -func (m *MockStore) SaveFileInfo(arg0 *model.FileInfo) error { +func (m *MockStore) SaveFileInfo(arg0 *model0.FileInfo) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SaveFileInfo", arg0) ret0, _ := ret[0].(error) @@ -1478,10 +1478,10 @@ func (mr *MockStoreMockRecorder) SaveFileInfo(arg0 interface{}) *gomock.Call { } // SaveMember mocks base method. -func (m *MockStore) SaveMember(arg0 *model0.BoardMember) (*model0.BoardMember, error) { +func (m *MockStore) SaveMember(arg0 *model.BoardMember) (*model.BoardMember, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SaveMember", arg0) - ret0, _ := ret[0].(*model0.BoardMember) + ret0, _ := ret[0].(*model.BoardMember) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1493,10 +1493,10 @@ func (mr *MockStoreMockRecorder) SaveMember(arg0 interface{}) *gomock.Call { } // SearchBoardsForUser mocks base method. -func (m *MockStore) SearchBoardsForUser(arg0 string, arg1 model0.BoardSearchField, arg2 string, arg3 bool) ([]*model0.Board, error) { +func (m *MockStore) SearchBoardsForUser(arg0 string, arg1 model.BoardSearchField, arg2 string, arg3 bool) ([]*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SearchBoardsForUser", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].([]*model0.Board) + ret0, _ := ret[0].([]*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1508,10 +1508,10 @@ func (mr *MockStoreMockRecorder) SearchBoardsForUser(arg0, arg1, arg2, arg3 inte } // SearchBoardsForUserInTeam mocks base method. -func (m *MockStore) SearchBoardsForUserInTeam(arg0, arg1, arg2 string) ([]*model0.Board, error) { +func (m *MockStore) SearchBoardsForUserInTeam(arg0, arg1, arg2 string) ([]*model.Board, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SearchBoardsForUserInTeam", arg0, arg1, arg2) - ret0, _ := ret[0].([]*model0.Board) + ret0, _ := ret[0].([]*model.Board) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1523,10 +1523,10 @@ func (mr *MockStoreMockRecorder) SearchBoardsForUserInTeam(arg0, arg1, arg2 inte } // SearchUserChannels mocks base method. -func (m *MockStore) SearchUserChannels(arg0, arg1, arg2 string) ([]*model.Channel, error) { +func (m *MockStore) SearchUserChannels(arg0, arg1, arg2 string) ([]*model0.Channel, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SearchUserChannels", arg0, arg1, arg2) - ret0, _ := ret[0].([]*model.Channel) + ret0, _ := ret[0].([]*model0.Channel) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1538,10 +1538,10 @@ func (mr *MockStoreMockRecorder) SearchUserChannels(arg0, arg1, arg2 interface{} } // SearchUsersByTeam mocks base method. -func (m *MockStore) SearchUsersByTeam(arg0, arg1, arg2 string, arg3, arg4, arg5 bool) ([]*model0.User, error) { +func (m *MockStore) SearchUsersByTeam(arg0, arg1, arg2 string, arg3, arg4, arg5 bool) ([]*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SearchUsersByTeam", arg0, arg1, arg2, arg3, arg4, arg5) - ret0, _ := ret[0].([]*model0.User) + ret0, _ := ret[0].([]*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1652,7 +1652,7 @@ func (mr *MockStoreMockRecorder) UpdateCardLimitTimestamp(arg0 interface{}) *gom } // UpdateCategory mocks base method. -func (m *MockStore) UpdateCategory(arg0 model0.Category) error { +func (m *MockStore) UpdateCategory(arg0 model.Category) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpdateCategory", arg0) ret0, _ := ret[0].(error) @@ -1666,7 +1666,7 @@ func (mr *MockStoreMockRecorder) UpdateCategory(arg0 interface{}) *gomock.Call { } // UpdateSession mocks base method. -func (m *MockStore) UpdateSession(arg0 *model0.Session) error { +func (m *MockStore) UpdateSession(arg0 *model.Session) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpdateSession", arg0) ret0, _ := ret[0].(error) @@ -1694,10 +1694,10 @@ func (mr *MockStoreMockRecorder) UpdateSubscribersNotifiedAt(arg0, arg1 interfac } // UpdateUser mocks base method. -func (m *MockStore) UpdateUser(arg0 *model0.User) (*model0.User, error) { +func (m *MockStore) UpdateUser(arg0 *model.User) (*model.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpdateUser", arg0) - ret0, _ := ret[0].(*model0.User) + ret0, _ := ret[0].(*model.User) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1737,10 +1737,10 @@ func (mr *MockStoreMockRecorder) UpdateUserPasswordByID(arg0, arg1 interface{}) } // UpsertNotificationHint mocks base method. -func (m *MockStore) UpsertNotificationHint(arg0 *model0.NotificationHint, arg1 time.Duration) (*model0.NotificationHint, error) { +func (m *MockStore) UpsertNotificationHint(arg0 *model.NotificationHint, arg1 time.Duration) (*model.NotificationHint, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpsertNotificationHint", arg0, arg1) - ret0, _ := ret[0].(*model0.NotificationHint) + ret0, _ := ret[0].(*model.NotificationHint) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -1752,7 +1752,7 @@ func (mr *MockStoreMockRecorder) UpsertNotificationHint(arg0, arg1 interface{}) } // UpsertSharing mocks base method. -func (m *MockStore) UpsertSharing(arg0 model0.Sharing) error { +func (m *MockStore) UpsertSharing(arg0 model.Sharing) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpsertSharing", arg0) ret0, _ := ret[0].(error) @@ -1766,7 +1766,7 @@ func (mr *MockStoreMockRecorder) UpsertSharing(arg0 interface{}) *gomock.Call { } // UpsertTeamSettings mocks base method. -func (m *MockStore) UpsertTeamSettings(arg0 model0.Team) error { +func (m *MockStore) UpsertTeamSettings(arg0 model.Team) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpsertTeamSettings", arg0) ret0, _ := ret[0].(error) @@ -1780,7 +1780,7 @@ func (mr *MockStoreMockRecorder) UpsertTeamSettings(arg0 interface{}) *gomock.Ca } // UpsertTeamSignupToken mocks base method. -func (m *MockStore) UpsertTeamSignupToken(arg0 model0.Team) error { +func (m *MockStore) UpsertTeamSignupToken(arg0 model.Team) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpsertTeamSignupToken", arg0) ret0, _ := ret[0].(error) diff --git a/server/boards/services/store/sqlstore/blocks.go b/server/boards/services/store/sqlstore/blocks.go index c20002963e..2e960f918c 100644 --- a/server/boards/services/store/sqlstore/blocks.go +++ b/server/boards/services/store/sqlstore/blocks.go @@ -9,14 +9,14 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" _ "github.com/lib/pq" // postgres driver - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/store/sqlstore/board.go b/server/boards/services/store/sqlstore/board.go index 15ed9dfb6e..f9bbb1188a 100644 --- a/server/boards/services/store/sqlstore/board.go +++ b/server/boards/services/store/sqlstore/board.go @@ -12,13 +12,13 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func boardFields(tableAlias string) []string { diff --git a/server/boards/services/store/sqlstore/board_insights.go b/server/boards/services/store/sqlstore/board_insights.go index 0e59b8b14c..03afbe2203 100644 --- a/server/boards/services/store/sqlstore/board_insights.go +++ b/server/boards/services/store/sqlstore/board_insights.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" sq "github.com/Masterminds/squirrel" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (s *SQLStore) getTeamBoardsInsights(db sq.BaseRunner, teamID string, since int64, offset int, limit int, boardIDs []string) (*model.BoardInsightsList, error) { diff --git a/server/boards/services/store/sqlstore/boards_and_blocks.go b/server/boards/services/store/sqlstore/boards_and_blocks.go index 6a88c78f2a..8221470d94 100644 --- a/server/boards/services/store/sqlstore/boards_and_blocks.go +++ b/server/boards/services/store/sqlstore/boards_and_blocks.go @@ -8,7 +8,7 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) type BlockDoesntBelongToBoardsErr struct { diff --git a/server/boards/services/store/sqlstore/boards_migrator.go b/server/boards/services/store/sqlstore/boards_migrator.go index 79afeddc66..6e8a93dbef 100644 --- a/server/boards/services/store/sqlstore/boards_migrator.go +++ b/server/boards/services/store/sqlstore/boards_migrator.go @@ -18,11 +18,11 @@ import ( embedded "github.com/mattermost/morph/sources/embedded" "github.com/mgdelacroix/foundation" - "github.com/mattermost/mattermost-server/v6/server/channels/db" - mmSqlStore "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/db" + mmSqlStore "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) var tablePrefix = "focalboard_" diff --git a/server/boards/services/store/sqlstore/category.go b/server/boards/services/store/sqlstore/category.go index 98a00d23b4..9df553bd1f 100644 --- a/server/boards/services/store/sqlstore/category.go +++ b/server/boards/services/store/sqlstore/category.go @@ -9,10 +9,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const categorySortOrderGap = 10 diff --git a/server/boards/services/store/sqlstore/category_boards.go b/server/boards/services/store/sqlstore/category_boards.go index 2b40b9998f..9009b6d242 100644 --- a/server/boards/services/store/sqlstore/category_boards.go +++ b/server/boards/services/store/sqlstore/category_boards.go @@ -9,10 +9,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (s *SQLStore) getUserCategoryBoards(db sq.BaseRunner, userID, teamID string) ([]model.CategoryBoards, error) { diff --git a/server/boards/services/store/sqlstore/cloud.go b/server/boards/services/store/sqlstore/cloud.go index 729c69494f..054d71a8f5 100644 --- a/server/boards/services/store/sqlstore/cloud.go +++ b/server/boards/services/store/sqlstore/cloud.go @@ -10,8 +10,8 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) var ErrInvalidCardLimitValue = errors.New("card limit value is invalid") diff --git a/server/boards/services/store/sqlstore/compliance.go b/server/boards/services/store/sqlstore/compliance.go index cd7c468e23..33618ae5ec 100644 --- a/server/boards/services/store/sqlstore/compliance.go +++ b/server/boards/services/store/sqlstore/compliance.go @@ -8,9 +8,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (s *SQLStore) getBoardsForCompliance(db sq.BaseRunner, opts model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) { diff --git a/server/boards/services/store/sqlstore/data_migrations.go b/server/boards/services/store/sqlstore/data_migrations.go index 8e18022319..46756dd412 100644 --- a/server/boards/services/store/sqlstore/data_migrations.go +++ b/server/boards/services/store/sqlstore/data_migrations.go @@ -12,10 +12,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/store/sqlstore/data_migrations_test.go b/server/boards/services/store/sqlstore/data_migrations_test.go index 5a44f9ca2e..f2dad54228 100644 --- a/server/boards/services/store/sqlstore/data_migrations_test.go +++ b/server/boards/services/store/sqlstore/data_migrations_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore/migrationstests" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore/migrationstests" "github.com/mgdelacroix/foundation" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/boards/services/store/sqlstore/data_retention.go b/server/boards/services/store/sqlstore/data_retention.go index 3017cad048..414ad27275 100644 --- a/server/boards/services/store/sqlstore/data_retention.go +++ b/server/boards/services/store/sqlstore/data_retention.go @@ -12,9 +12,9 @@ import ( sq "github.com/Masterminds/squirrel" _ "github.com/lib/pq" // postgres driver - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type RetentionTableDeletionInfo struct { diff --git a/server/boards/services/store/sqlstore/file.go b/server/boards/services/store/sqlstore/file.go index e8afc51e1d..abe3d98e48 100644 --- a/server/boards/services/store/sqlstore/file.go +++ b/server/boards/services/store/sqlstore/file.go @@ -9,10 +9,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (s *SQLStore) saveFileInfo(db sq.BaseRunner, fileInfo *mm_model.FileInfo) error { diff --git a/server/boards/services/store/sqlstore/legacy_blocks.go b/server/boards/services/store/sqlstore/legacy_blocks.go index 92714709ed..38609d6844 100644 --- a/server/boards/services/store/sqlstore/legacy_blocks.go +++ b/server/boards/services/store/sqlstore/legacy_blocks.go @@ -8,13 +8,13 @@ import ( "encoding/json" "strings" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func legacyBoardFields(prefix string) []string { diff --git a/server/boards/services/store/sqlstore/migrate.go b/server/boards/services/store/sqlstore/migrate.go index 08da7df19a..1c876a5168 100644 --- a/server/boards/services/store/sqlstore/migrate.go +++ b/server/boards/services/store/sqlstore/migrate.go @@ -16,9 +16,9 @@ import ( sq "github.com/Masterminds/squirrel" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/morph" drivers "github.com/mattermost/morph/drivers" @@ -28,7 +28,7 @@ import ( _ "github.com/lib/pq" // postgres driver - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) //go:embed migrations/*.sql diff --git a/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go b/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go index a494c9e307..d55b3e704e 100644 --- a/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go b/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go index 9505df77e6..68ad2a04d2 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration35_test.go b/server/boards/services/store/sqlstore/migrationstests/migration35_test.go index ab0fbe4329..814e2b1734 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration35_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration35_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration36_test.go b/server/boards/services/store/sqlstore/migrationstests/migration36_test.go index 409b521956..feedb2d8a6 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration36_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration36_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration37_test.go b/server/boards/services/store/sqlstore/migrationstests/migration37_test.go index 5bb35adf7d..1b9dd71a44 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration37_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration37_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration38_test.go b/server/boards/services/store/sqlstore/migrationstests/migration38_test.go index f76d9ae414..24b62866da 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration38_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration38_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go index cd788cd4b2..5abbf31e91 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go index 651d401895..1b65ef5d54 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go index 92f424635f..f0cbb51ece 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go @@ -9,7 +9,7 @@ import ( "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" ) func Test33RemoveDeletedCategoryBoards(t *testing.T) { diff --git a/server/boards/services/store/sqlstore/notificationhints.go b/server/boards/services/store/sqlstore/notificationhints.go index d19c236c26..ce0337cd02 100644 --- a/server/boards/services/store/sqlstore/notificationhints.go +++ b/server/boards/services/store/sqlstore/notificationhints.go @@ -10,10 +10,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var notificationHintFields = []string{ diff --git a/server/boards/services/store/sqlstore/params.go b/server/boards/services/store/sqlstore/params.go index c75da0a9ed..f08e512eb0 100644 --- a/server/boards/services/store/sqlstore/params.go +++ b/server/boards/services/store/sqlstore/params.go @@ -7,9 +7,9 @@ import ( "database/sql" "fmt" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // servicesAPI is the interface required my the Params to interact with the mattermost-server. diff --git a/server/boards/services/store/sqlstore/public_methods.go b/server/boards/services/store/sqlstore/public_methods.go index df4d3419ea..5947b283e7 100644 --- a/server/boards/services/store/sqlstore/public_methods.go +++ b/server/boards/services/store/sqlstore/public_methods.go @@ -16,10 +16,10 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (s *SQLStore) AddUpdateCategoryBoard(userID string, categoryID string, boardIDs []string) error { diff --git a/server/boards/services/store/sqlstore/schema_table_migration.go b/server/boards/services/store/sqlstore/schema_table_migration.go index 663e5d5026..cdb0f4d628 100644 --- a/server/boards/services/store/sqlstore/schema_table_migration.go +++ b/server/boards/services/store/sqlstore/schema_table_migration.go @@ -12,9 +12,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/mattermost/morph/models" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // EnsureSchemaMigrationFormat checks the schema migrations table diff --git a/server/boards/services/store/sqlstore/session.go b/server/boards/services/store/sqlstore/session.go index 6abe4e987c..967eed002d 100644 --- a/server/boards/services/store/sqlstore/session.go +++ b/server/boards/services/store/sqlstore/session.go @@ -8,8 +8,8 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) // GetActiveUserCount returns the number of users with active sessions within N seconds ago. diff --git a/server/boards/services/store/sqlstore/sharing.go b/server/boards/services/store/sqlstore/sharing.go index 9dc6176d72..2b7cd6faa7 100644 --- a/server/boards/services/store/sqlstore/sharing.go +++ b/server/boards/services/store/sqlstore/sharing.go @@ -4,8 +4,8 @@ package sqlstore import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" ) diff --git a/server/boards/services/store/sqlstore/sqlstore.go b/server/boards/services/store/sqlstore/sqlstore.go index b98befc5a9..8e9fe4b158 100644 --- a/server/boards/services/store/sqlstore/sqlstore.go +++ b/server/boards/services/store/sqlstore/sqlstore.go @@ -11,11 +11,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // SQLStore is a SQL database. diff --git a/server/boards/services/store/sqlstore/sqlstore_test.go b/server/boards/services/store/sqlstore/sqlstore_test.go index fe769a69ca..d0435f4c65 100644 --- a/server/boards/services/store/sqlstore/sqlstore_test.go +++ b/server/boards/services/store/sqlstore/sqlstore_test.go @@ -6,11 +6,11 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store/storetests" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store/storetests" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func TestSQLStore(t *testing.T) { diff --git a/server/boards/services/store/sqlstore/subscriptions.go b/server/boards/services/store/sqlstore/subscriptions.go index a986cf11d5..5c7bfb93a5 100644 --- a/server/boards/services/store/sqlstore/subscriptions.go +++ b/server/boards/services/store/sqlstore/subscriptions.go @@ -9,9 +9,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var subscriptionFields = []string{ diff --git a/server/boards/services/store/sqlstore/system.go b/server/boards/services/store/sqlstore/system.go index e6b6172f45..140fdef5ec 100644 --- a/server/boards/services/store/sqlstore/system.go +++ b/server/boards/services/store/sqlstore/system.go @@ -6,7 +6,7 @@ package sqlstore import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) func (s *SQLStore) getSystemSetting(db sq.BaseRunner, key string) (string, error) { diff --git a/server/boards/services/store/sqlstore/team.go b/server/boards/services/store/sqlstore/team.go index c917b224a8..15b4b292f0 100644 --- a/server/boards/services/store/sqlstore/team.go +++ b/server/boards/services/store/sqlstore/team.go @@ -7,10 +7,10 @@ import ( "database/sql" "encoding/json" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" sq "github.com/Masterminds/squirrel" ) diff --git a/server/boards/services/store/sqlstore/templates.go b/server/boards/services/store/sqlstore/templates.go index d3febf9dd0..730071d0ee 100644 --- a/server/boards/services/store/sqlstore/templates.go +++ b/server/boards/services/store/sqlstore/templates.go @@ -9,9 +9,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/boards/services/store/sqlstore/testlib.go b/server/boards/services/store/sqlstore/testlib.go index a79b2a1643..4a7af3661d 100644 --- a/server/boards/services/store/sqlstore/testlib.go +++ b/server/boards/services/store/sqlstore/testlib.go @@ -9,10 +9,10 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/user.go b/server/boards/services/store/sqlstore/user.go index 5818b4ff6e..49113eb5af 100644 --- a/server/boards/services/store/sqlstore/user.go +++ b/server/boards/services/store/sqlstore/user.go @@ -8,15 +8,15 @@ import ( "errors" "fmt" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/boards/services/store/sqlstore/util.go b/server/boards/services/store/sqlstore/util.go index 0b9340d59c..2f9244f1fa 100644 --- a/server/boards/services/store/sqlstore/util.go +++ b/server/boards/services/store/sqlstore/util.go @@ -10,10 +10,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (s *SQLStore) CloseRows(rows *sql.Rows) { diff --git a/server/boards/services/store/store.go b/server/boards/services/store/store.go index 23b8a3d1c3..d3e994d9e5 100644 --- a/server/boards/services/store/store.go +++ b/server/boards/services/store/store.go @@ -8,9 +8,9 @@ package store import ( "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) const CardLimitTimestampSystemKey = "card_limit_timestamp" diff --git a/server/boards/services/store/storetests/blocks.go b/server/boards/services/store/storetests/blocks.go index 1df3ae288d..b3e48f560a 100644 --- a/server/boards/services/store/storetests/blocks.go +++ b/server/boards/services/store/storetests/blocks.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/boards/services/store/storetests/board_insights.go b/server/boards/services/store/storetests/board_insights.go index 304c57183b..0268178db4 100644 --- a/server/boards/services/store/storetests/board_insights.go +++ b/server/boards/services/store/storetests/board_insights.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) const ( diff --git a/server/boards/services/store/storetests/boards.go b/server/boards/services/store/storetests/boards.go index 7e47e0dbeb..84bae5097d 100644 --- a/server/boards/services/store/storetests/boards.go +++ b/server/boards/services/store/storetests/boards.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/boards_and_blocks.go b/server/boards/services/store/storetests/boards_and_blocks.go index 1b58fc39b6..36be017610 100644 --- a/server/boards/services/store/storetests/boards_and_blocks.go +++ b/server/boards/services/store/storetests/boards_and_blocks.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/category.go b/server/boards/services/store/storetests/category.go index 2e1a849cd8..c7afabe2c4 100644 --- a/server/boards/services/store/storetests/category.go +++ b/server/boards/services/store/storetests/category.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) type testFunc func(t *testing.T, store store.Store) diff --git a/server/boards/services/store/storetests/categoryBoards.go b/server/boards/services/store/storetests/categoryBoards.go index 5f77d461ec..a3552fb058 100644 --- a/server/boards/services/store/storetests/categoryBoards.go +++ b/server/boards/services/store/storetests/categoryBoards.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func StoreTestCategoryBoardsStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/cloud.go b/server/boards/services/store/storetests/cloud.go index d29e53f7b3..792f852a17 100644 --- a/server/boards/services/store/storetests/cloud.go +++ b/server/boards/services/store/storetests/cloud.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - storeservice "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + storeservice "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func StoreTestCloudStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/compliance.go b/server/boards/services/store/storetests/compliance.go index 4818aab0a9..1964b6257d 100644 --- a/server/boards/services/store/storetests/compliance.go +++ b/server/boards/services/store/storetests/compliance.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func StoreTestComplianceHistoryStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/data_retention.go b/server/boards/services/store/storetests/data_retention.go index 47b67b05d7..df8ed9a028 100644 --- a/server/boards/services/store/storetests/data_retention.go +++ b/server/boards/services/store/storetests/data_retention.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/files.go b/server/boards/services/store/storetests/files.go index 9915f76467..52aa98954a 100644 --- a/server/boards/services/store/storetests/files.go +++ b/server/boards/services/store/storetests/files.go @@ -6,10 +6,10 @@ package storetests import ( "testing" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/helpers.go b/server/boards/services/store/storetests/helpers.go index ec85d0c777..b7e85ca551 100644 --- a/server/boards/services/store/storetests/helpers.go +++ b/server/boards/services/store/storetests/helpers.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) func InsertBlocks(t *testing.T, s store.Store, blocks []*model.Block, userID string) { diff --git a/server/boards/services/store/storetests/notificationhints.go b/server/boards/services/store/storetests/notificationhints.go index e07d1f2429..07a31136bd 100644 --- a/server/boards/services/store/storetests/notificationhints.go +++ b/server/boards/services/store/storetests/notificationhints.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func StoreTestNotificationHintsStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/session.go b/server/boards/services/store/storetests/session.go index 73876712b8..b15a71718d 100644 --- a/server/boards/services/store/storetests/session.go +++ b/server/boards/services/store/storetests/session.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) func StoreTestSessionStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/sharing.go b/server/boards/services/store/storetests/sharing.go index 94740df6eb..1bd492c5f8 100644 --- a/server/boards/services/store/storetests/sharing.go +++ b/server/boards/services/store/storetests/sharing.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) func StoreTestSharingStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/subscriptions.go b/server/boards/services/store/storetests/subscriptions.go index f21b72217f..833bcd4ca0 100644 --- a/server/boards/services/store/storetests/subscriptions.go +++ b/server/boards/services/store/storetests/subscriptions.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) //nolint:dupl diff --git a/server/boards/services/store/storetests/system.go b/server/boards/services/store/storetests/system.go index f3c16be6a4..2f0014bc78 100644 --- a/server/boards/services/store/storetests/system.go +++ b/server/boards/services/store/storetests/system.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) func StoreTestSystemStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/teams.go b/server/boards/services/store/storetests/teams.go index e3642f4f38..e2997c5008 100644 --- a/server/boards/services/store/storetests/teams.go +++ b/server/boards/services/store/storetests/teams.go @@ -6,14 +6,14 @@ package storetests import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" "testing" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" ) func StoreTestTeamStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/users.go b/server/boards/services/store/storetests/users.go index 7fbe9ac032..73ff54ddbb 100644 --- a/server/boards/services/store/storetests/users.go +++ b/server/boards/services/store/storetests/users.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) //nolint:dupl diff --git a/server/boards/services/store/storetests/util.go b/server/boards/services/store/storetests/util.go index ba8c4fd14e..976e60448e 100644 --- a/server/boards/services/store/storetests/util.go +++ b/server/boards/services/store/storetests/util.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/store" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" ) func createTestUsers(t *testing.T, store store.Store, num int) []*model.User { diff --git a/server/boards/services/telemetry/mocks/ServerIface.go b/server/boards/services/telemetry/mocks/ServerIface.go index 3b237f22c0..54a00ab2a5 100644 --- a/server/boards/services/telemetry/mocks/ServerIface.go +++ b/server/boards/services/telemetry/mocks/ServerIface.go @@ -5,12 +5,12 @@ package mocks import ( - httpservice "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" + httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" - plugin "github.com/mattermost/mattermost-server/v6/plugin" + plugin "github.com/mattermost/mattermost-server/server/v8/plugin" ) // ServerIface is an autogenerated mock type for the ServerIface type diff --git a/server/boards/services/telemetry/telemetry.go b/server/boards/services/telemetry/telemetry.go index 9719f76f78..256bde2bf6 100644 --- a/server/boards/services/telemetry/telemetry.go +++ b/server/boards/services/telemetry/telemetry.go @@ -10,10 +10,10 @@ import ( rudder "github.com/rudderlabs/analytics-go" - "github.com/mattermost/mattermost-server/v6/server/boards/services/scheduler" + "github.com/mattermost/mattermost-server/server/v8/boards/services/scheduler" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/telemetry/telemetry_test.go b/server/boards/services/telemetry/telemetry_test.go index f84a95affd..ec78a0587a 100644 --- a/server/boards/services/telemetry/telemetry_test.go +++ b/server/boards/services/telemetry/telemetry_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func mockServer() (chan []byte, *httptest.Server) { diff --git a/server/boards/services/webhook/webhook.go b/server/boards/services/webhook/webhook.go index 4fbcc14bde..98c70f5ce6 100644 --- a/server/boards/services/webhook/webhook.go +++ b/server/boards/services/webhook/webhook.go @@ -9,10 +9,10 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // NotifyUpdate calls webhooks. diff --git a/server/boards/services/webhook/webhook_test.go b/server/boards/services/webhook/webhook_test.go index 60ccfad744..9d7c41ec1c 100644 --- a/server/boards/services/webhook/webhook_test.go +++ b/server/boards/services/webhook/webhook_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/services/config" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestClientUpdateNotify(t *testing.T) { diff --git a/server/boards/utils/callbackqueue.go b/server/boards/utils/callbackqueue.go index 87772e18c4..cd1923bad2 100644 --- a/server/boards/utils/callbackqueue.go +++ b/server/boards/utils/callbackqueue.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // CallbackFunc is a func that can enqueued in the callback queue and will be diff --git a/server/boards/utils/callbackqueue_test.go b/server/boards/utils/callbackqueue_test.go index 2eaf16a3c2..5328fda269 100644 --- a/server/boards/utils/callbackqueue_test.go +++ b/server/boards/utils/callbackqueue_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func Test_newChangeNotifier(t *testing.T) { diff --git a/server/boards/utils/utils.go b/server/boards/utils/utils.go index d9b2f4e2e3..a8220e4f62 100644 --- a/server/boards/utils/utils.go +++ b/server/boards/utils/utils.go @@ -9,7 +9,7 @@ import ( "reflect" "time" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) type IDType byte diff --git a/server/boards/web/webserver.go b/server/boards/web/webserver.go index 1b5594eb3f..457767a559 100644 --- a/server/boards/web/webserver.go +++ b/server/boards/web/webserver.go @@ -16,7 +16,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // RoutedService defines the interface that is needed for any service to diff --git a/server/boards/web/webserver_test.go b/server/boards/web/webserver_test.go index 3dd0edcac2..24b0a04dba 100644 --- a/server/boards/web/webserver_test.go +++ b/server/boards/web/webserver_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func Test_NewServer(t *testing.T) { diff --git a/server/boards/ws/adapter.go b/server/boards/ws/adapter.go index 8134da8271..be4160780a 100644 --- a/server/boards/ws/adapter.go +++ b/server/boards/ws/adapter.go @@ -5,7 +5,7 @@ package ws import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) const ( diff --git a/server/boards/ws/common.go b/server/boards/ws/common.go index ab1531eda4..4a5a1794b0 100644 --- a/server/boards/ws/common.go +++ b/server/boards/ws/common.go @@ -4,7 +4,7 @@ package ws import ( - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" ) // UpdateCategoryMessage is sent on block updates. diff --git a/server/boards/ws/helpers_test.go b/server/boards/ws/helpers_test.go index c8840131f5..997e5ef6eb 100644 --- a/server/boards/ws/helpers_test.go +++ b/server/boards/ws/helpers_test.go @@ -6,11 +6,11 @@ package ws import ( "testing" - authMocks "github.com/mattermost/mattermost-server/v6/server/boards/auth/mocks" - wsMocks "github.com/mattermost/mattermost-server/v6/server/boards/ws/mocks" + authMocks "github.com/mattermost/mattermost-server/server/v8/boards/auth/mocks" + wsMocks "github.com/mattermost/mattermost-server/server/v8/boards/ws/mocks" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/golang/mock/gomock" ) diff --git a/server/boards/ws/mocks/mockpluginapi.go b/server/boards/ws/mocks/mockpluginapi.go index 45cf40000b..612dd07d17 100644 --- a/server/boards/ws/mocks/mockpluginapi.go +++ b/server/boards/ws/mocks/mockpluginapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/plugin (interfaces: API) +// Source: github.com/mattermost/mattermost-server/server/v8/plugin (interfaces: API) // Package mocks is a generated GoMock package. package mocks @@ -13,7 +13,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" ) // MockAPI is a mock of API interface. diff --git a/server/boards/ws/mocks/mockstore.go b/server/boards/ws/mocks/mockstore.go index f8693f2dee..58aab276c3 100644 --- a/server/boards/ws/mocks/mockstore.go +++ b/server/boards/ws/mocks/mockstore.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/boards/ws (interfaces: Store) +// Source: github.com/mattermost/mattermost-server/server/v8/boards/ws (interfaces: Store) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/server/boards/model" + model "github.com/mattermost/mattermost-server/server/v8/boards/model" ) // MockStore is a mock of Store interface. diff --git a/server/boards/ws/plugin_adapter.go b/server/boards/ws/plugin_adapter.go index d34a0c350f..c80f2d8e65 100644 --- a/server/boards/ws/plugin_adapter.go +++ b/server/boards/ws/plugin_adapter.go @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -//go:generate mockgen -copyright_file=../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/v6/plugin API +//go:generate mockgen -copyright_file=../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/server/v8/plugin API package ws import ( @@ -11,12 +11,12 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/server/boards/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const websocketMessagePrefix = "custom_boards_" diff --git a/server/boards/ws/plugin_adapter_client.go b/server/boards/ws/plugin_adapter_client.go index 2286681aec..bb24ec5ccf 100644 --- a/server/boards/ws/plugin_adapter_client.go +++ b/server/boards/ws/plugin_adapter_client.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) type PluginAdapterClient struct { diff --git a/server/boards/ws/plugin_adapter_cluster.go b/server/boards/ws/plugin_adapter_cluster.go index 636d86595b..df55772787 100644 --- a/server/boards/ws/plugin_adapter_cluster.go +++ b/server/boards/ws/plugin_adapter_cluster.go @@ -6,8 +6,8 @@ package ws import ( "encoding/json" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type ClusterMessage struct { diff --git a/server/boards/ws/plugin_adapter_test.go b/server/boards/ws/plugin_adapter_test.go index 29dfcf3a9c..88fe421842 100644 --- a/server/boards/ws/plugin_adapter_test.go +++ b/server/boards/ws/plugin_adapter_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/ws/server.go b/server/boards/ws/server.go index 52a3c5a0fb..6c22f39ac3 100644 --- a/server/boards/ws/server.go +++ b/server/boards/ws/server.go @@ -11,11 +11,11 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v6/server/boards/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/model" - "github.com/mattermost/mattermost-server/v6/server/boards/utils" + "github.com/mattermost/mattermost-server/server/v8/boards/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (wss *websocketSession) WriteJSON(v interface{}) error { diff --git a/server/boards/ws/server_test.go b/server/boards/ws/server_test.go index 2b26208d97..337e0205f4 100644 --- a/server/boards/ws/server_test.go +++ b/server/boards/ws/server_test.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v6/server/boards/auth" - "github.com/mattermost/mattermost-server/v6/server/boards/model" + "github.com/mattermost/mattermost-server/server/v8/boards/auth" + "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/gorilla/websocket" "github.com/stretchr/testify/require" diff --git a/server/channels/api4/api.go b/server/channels/api4/api.go index a5e89b5046..5240be9b39 100644 --- a/server/channels/api4/api.go +++ b/server/channels/api4/api.go @@ -10,9 +10,9 @@ import ( graphql "github.com/graph-gophers/graphql-go" _ "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" ) type Routes struct { diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go index 44d6540af5..e41bae3f38 100644 --- a/server/channels/api4/apitestlib.go +++ b/server/channels/api4/apitestlib.go @@ -26,18 +26,18 @@ import ( "github.com/minio/minio-go/v7/pkg/credentials" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/channels/web" - "github.com/mattermost/mattermost-server/v6/server/channels/wsapi" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/wsapi" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type TestHelper struct { diff --git a/server/channels/api4/bleve.go b/server/channels/api4/bleve.go index 122882379d..022445ca82 100644 --- a/server/channels/api4/bleve.go +++ b/server/channels/api4/bleve.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitBleve() { diff --git a/server/channels/api4/bleve_test.go b/server/channels/api4/bleve_test.go index f66aab45ed..29d873d022 100644 --- a/server/channels/api4/bleve_test.go +++ b/server/channels/api4/bleve_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestBlevePurgeIndexes(t *testing.T) { diff --git a/server/channels/api4/bot.go b/server/channels/api4/bot.go index 024cd008be..e76ee02a53 100644 --- a/server/channels/api4/bot.go +++ b/server/channels/api4/bot.go @@ -8,9 +8,9 @@ import ( "net/http" "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitBot() { diff --git a/server/channels/api4/bot_test.go b/server/channels/api4/bot_test.go index 5a76d23f45..555b1b9fc5 100644 --- a/server/channels/api4/bot_test.go +++ b/server/channels/api4/bot_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateBot(t *testing.T) { diff --git a/server/channels/api4/brand.go b/server/channels/api4/brand.go index a1dfbfb2c3..b5e9640a61 100644 --- a/server/channels/api4/brand.go +++ b/server/channels/api4/brand.go @@ -7,8 +7,8 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitBrand() { diff --git a/server/channels/api4/brand_test.go b/server/channels/api4/brand_test.go index 2646191469..ec2e65ea8e 100644 --- a/server/channels/api4/brand_test.go +++ b/server/channels/api4/brand_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" ) func TestGetBrandImage(t *testing.T) { diff --git a/server/channels/api4/channel.go b/server/channels/api4/channel.go index 78aab7f1cc..8425df21b1 100644 --- a/server/channels/api4/channel.go +++ b/server/channels/api4/channel.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitChannel() { diff --git a/server/channels/api4/channel_category.go b/server/channels/api4/channel_category.go index ce0625dacf..2eea5a5045 100644 --- a/server/channels/api4/channel_category.go +++ b/server/channels/api4/channel_category.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func getCategoriesForTeamForUser(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/api4/channel_category_test.go b/server/channels/api4/channel_category_test.go index e58a557ee6..527686d70c 100644 --- a/server/channels/api4/channel_category_test.go +++ b/server/channels/api4/channel_category_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateCategoryForTeamForUser(t *testing.T) { diff --git a/server/channels/api4/channel_local.go b/server/channels/api4/channel_local.go index 7d85edf0c2..c5e6c6b355 100644 --- a/server/channels/api4/channel_local.go +++ b/server/channels/api4/channel_local.go @@ -7,10 +7,10 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitChannelLocal() { diff --git a/server/channels/api4/channel_test.go b/server/channels/api4/channel_test.go index 61a960b5aa..73ae52cf12 100644 --- a/server/channels/api4/channel_test.go +++ b/server/channels/api4/channel_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCreateChannel(t *testing.T) { diff --git a/server/channels/api4/cloud.go b/server/channels/api4/cloud.go index 48a8ddf83f..fc1c6ce33a 100644 --- a/server/channels/api4/cloud.go +++ b/server/channels/api4/cloud.go @@ -11,10 +11,10 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/web" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) func (api *API) InitCloud() { diff --git a/server/channels/api4/cloud_test.go b/server/channels/api4/cloud_test.go index 6b2067ec15..7cfe985df6 100644 --- a/server/channels/api4/cloud_test.go +++ b/server/channels/api4/cloud_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func Test_getCloudLimits(t *testing.T) { diff --git a/server/channels/api4/cluster.go b/server/channels/api4/cluster.go index 74e6e2b26d..233a83f3a0 100644 --- a/server/channels/api4/cluster.go +++ b/server/channels/api4/cluster.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitCluster() { diff --git a/server/channels/api4/cluster_test.go b/server/channels/api4/cluster_test.go index 8fe56ebbeb..175bfd1295 100644 --- a/server/channels/api4/cluster_test.go +++ b/server/channels/api4/cluster_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetClusterStatus(t *testing.T) { diff --git a/server/channels/api4/command.go b/server/channels/api4/command.go index 5bce4b8169..cd2fe01d49 100644 --- a/server/channels/api4/command.go +++ b/server/channels/api4/command.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitCommand() { diff --git a/server/channels/api4/command_help_test.go b/server/channels/api4/command_help_test.go index ca255cc6a5..b7ba178a9c 100644 --- a/server/channels/api4/command_help_test.go +++ b/server/channels/api4/command_help_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestHelpCommand(t *testing.T) { diff --git a/server/channels/api4/command_local.go b/server/channels/api4/command_local.go index 22d60acf0c..3c7f2d44b0 100644 --- a/server/channels/api4/command_local.go +++ b/server/channels/api4/command_local.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitCommandLocal() { diff --git a/server/channels/api4/command_test.go b/server/channels/api4/command_test.go index e2fc67d8f0..8517a344fe 100644 --- a/server/channels/api4/command_test.go +++ b/server/channels/api4/command_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestCreateCommand(t *testing.T) { diff --git a/server/channels/api4/commands_test.go b/server/channels/api4/commands_test.go index 44d3b45345..2ec4450759 100644 --- a/server/channels/api4/commands_test.go +++ b/server/channels/api4/commands_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" - _ "github.com/mattermost/mattermost-server/v6/server/channels/app/slashcommands" + _ "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestEchoCommand(t *testing.T) { diff --git a/server/channels/api4/compliance.go b/server/channels/api4/compliance.go index cdeb7d442d..8d86aa7030 100644 --- a/server/channels/api4/compliance.go +++ b/server/channels/api4/compliance.go @@ -10,9 +10,9 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitCompliance() { diff --git a/server/channels/api4/config.go b/server/channels/api4/config.go index 042636b17e..3d223424e0 100644 --- a/server/channels/api4/config.go +++ b/server/channels/api4/config.go @@ -10,12 +10,12 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var writeFilter func(c *Context, structField reflect.StructField) bool diff --git a/server/channels/api4/config_local.go b/server/channels/api4/config_local.go index c6f7a2dc55..33e4b9cc2f 100644 --- a/server/channels/api4/config_local.go +++ b/server/channels/api4/config_local.go @@ -8,11 +8,11 @@ import ( "net/http" "reflect" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitConfigLocal() { diff --git a/server/channels/api4/config_test.go b/server/channels/api4/config_test.go index 5b6900d6a7..a248254253 100644 --- a/server/channels/api4/config_test.go +++ b/server/channels/api4/config_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetConfig(t *testing.T) { diff --git a/server/channels/api4/cors_test.go b/server/channels/api4/cors_test.go index 8fd130d0c2..f95b764495 100644 --- a/server/channels/api4/cors_test.go +++ b/server/channels/api4/cors_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/api4/data_retention.go b/server/channels/api4/data_retention.go index 73139ab7e0..9acb51b11a 100644 --- a/server/channels/api4/data_retention.go +++ b/server/channels/api4/data_retention.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitDataRetention() { diff --git a/server/channels/api4/drafts.go b/server/channels/api4/drafts.go index bfd1112f94..d48c0b3964 100644 --- a/server/channels/api4/drafts.go +++ b/server/channels/api4/drafts.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitDrafts() { diff --git a/server/channels/api4/drafts_test.go b/server/channels/api4/drafts_test.go index ed3d32c065..f9afe4eae8 100644 --- a/server/channels/api4/drafts_test.go +++ b/server/channels/api4/drafts_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestUpsertDraft(t *testing.T) { diff --git a/server/channels/api4/elasticsearch.go b/server/channels/api4/elasticsearch.go index a8edfa4858..eaede8aa47 100644 --- a/server/channels/api4/elasticsearch.go +++ b/server/channels/api4/elasticsearch.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitElasticsearch() { diff --git a/server/channels/api4/elasticsearch_test.go b/server/channels/api4/elasticsearch_test.go index b20bd74ab4..c814c61b5f 100644 --- a/server/channels/api4/elasticsearch_test.go +++ b/server/channels/api4/elasticsearch_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestElasticsearchTest(t *testing.T) { diff --git a/server/channels/api4/emoji.go b/server/channels/api4/emoji.go index 0cbd7a0073..42db023009 100644 --- a/server/channels/api4/emoji.go +++ b/server/channels/api4/emoji.go @@ -8,11 +8,11 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/web" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/emoji_test.go b/server/channels/api4/emoji_test.go index b4237d2eb6..17f263e188 100644 --- a/server/channels/api4/emoji_test.go +++ b/server/channels/api4/emoji_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateEmoji(t *testing.T) { diff --git a/server/channels/api4/export.go b/server/channels/api4/export.go index 47cd94a5f2..2f1110f031 100644 --- a/server/channels/api4/export.go +++ b/server/channels/api4/export.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitExport() { diff --git a/server/channels/api4/export_test.go b/server/channels/api4/export_test.go index 818493538d..b8c65b8ed8 100644 --- a/server/channels/api4/export_test.go +++ b/server/channels/api4/export_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/channels/api4/file.go b/server/channels/api4/file.go index 901160b3d5..b09d6d1491 100644 --- a/server/channels/api4/file.go +++ b/server/channels/api4/file.go @@ -14,12 +14,12 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/web" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) const ( diff --git a/server/channels/api4/file_test.go b/server/channels/api4/file_test.go index 05005e015e..5e412211ae 100644 --- a/server/channels/api4/file_test.go +++ b/server/channels/api4/file_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) var testDir = "" diff --git a/server/channels/api4/graphql.go b/server/channels/api4/graphql.go index 138a004ab9..486fe117ff 100644 --- a/server/channels/api4/graphql.go +++ b/server/channels/api4/graphql.go @@ -13,9 +13,9 @@ import ( graphql "github.com/graph-gophers/graphql-go" gqlerrors "github.com/graph-gophers/graphql-go/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/web" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type graphQLInput struct { diff --git a/server/channels/api4/graphql_client.go b/server/channels/api4/graphql_client.go index edc893eeee..571560665a 100644 --- a/server/channels/api4/graphql_client.go +++ b/server/channels/api4/graphql_client.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // graphQLClient is an internal test client to run the tests. diff --git a/server/channels/api4/group.go b/server/channels/api4/group.go index d6dbfb0da3..0a465f4c00 100644 --- a/server/channels/api4/group.go +++ b/server/channels/api4/group.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitGroup() { diff --git a/server/channels/api4/group_test.go b/server/channels/api4/group_test.go index 7fdf38147e..f08909dc2a 100644 --- a/server/channels/api4/group_test.go +++ b/server/channels/api4/group_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetGroup(t *testing.T) { diff --git a/server/channels/api4/handlers.go b/server/channels/api4/handlers.go index 2c98381cfb..b7833fac87 100644 --- a/server/channels/api4/handlers.go +++ b/server/channels/api4/handlers.go @@ -8,8 +8,8 @@ import ( "github.com/mattermost/gziphandler" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" ) type Context = web.Context diff --git a/server/channels/api4/handlers_test.go b/server/channels/api4/handlers_test.go index 9c2087cdaa..22a3757294 100644 --- a/server/channels/api4/handlers_test.go +++ b/server/channels/api4/handlers_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/api4/hosted_customer.go b/server/channels/api4/hosted_customer.go index ba791c28cc..da1a3fe545 100644 --- a/server/channels/api4/hosted_customer.go +++ b/server/channels/api4/hosted_customer.go @@ -15,10 +15,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/web" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) // APIs for self-hosted workspaces to communicate with the backing customer & payments system. diff --git a/server/channels/api4/hosted_customer_test.go b/server/channels/api4/hosted_customer_test.go index 25bc35c779..671cc0f86e 100644 --- a/server/channels/api4/hosted_customer_test.go +++ b/server/channels/api4/hosted_customer_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) var valFalse = false diff --git a/server/channels/api4/image.go b/server/channels/api4/image.go index f6f67cd516..3884ed0954 100644 --- a/server/channels/api4/image.go +++ b/server/channels/api4/image.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitImage() { diff --git a/server/channels/api4/image_test.go b/server/channels/api4/image_test.go index 4c552e7d86..5f188f77b8 100644 --- a/server/channels/api4/image_test.go +++ b/server/channels/api4/image_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetImage(t *testing.T) { diff --git a/server/channels/api4/import.go b/server/channels/api4/import.go index 0e4d3d9c34..acb1ade270 100644 --- a/server/channels/api4/import.go +++ b/server/channels/api4/import.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitImport() { diff --git a/server/channels/api4/import_test.go b/server/channels/api4/import_test.go index 2ae8b10b19..7ed85a0224 100644 --- a/server/channels/api4/import_test.go +++ b/server/channels/api4/import_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestListImports(t *testing.T) { diff --git a/server/channels/api4/insights.go b/server/channels/api4/insights.go index dd9e204eae..48e3eee641 100644 --- a/server/channels/api4/insights.go +++ b/server/channels/api4/insights.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitInsights() { diff --git a/server/channels/api4/insights_test.go b/server/channels/api4/insights_test.go index 1acb8496f4..88c40ffb1a 100644 --- a/server/channels/api4/insights_test.go +++ b/server/channels/api4/insights_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) // Top Reactions diff --git a/server/channels/api4/integration_action.go b/server/channels/api4/integration_action.go index f008ece921..bd9d65832f 100644 --- a/server/channels/api4/integration_action.go +++ b/server/channels/api4/integration_action.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitAction() { diff --git a/server/channels/api4/integration_action_test.go b/server/channels/api4/integration_action_test.go index 92b4f2ccbe..d090b6c1ec 100644 --- a/server/channels/api4/integration_action_test.go +++ b/server/channels/api4/integration_action_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type testHandler struct { diff --git a/server/channels/api4/job.go b/server/channels/api4/job.go index a7d0a1e3ed..63368eb1a1 100644 --- a/server/channels/api4/job.go +++ b/server/channels/api4/job.go @@ -10,10 +10,10 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/web" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) func (api *API) InitJob() { diff --git a/server/channels/api4/job_test.go b/server/channels/api4/job_test.go index e80b1e2d14..2ff395202f 100644 --- a/server/channels/api4/job_test.go +++ b/server/channels/api4/job_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateJob(t *testing.T) { diff --git a/server/channels/api4/ldap.go b/server/channels/api4/ldap.go index d914386a12..cfdfe154b0 100644 --- a/server/channels/api4/ldap.go +++ b/server/channels/api4/ldap.go @@ -8,9 +8,9 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type mixedUnlinkedGroup struct { diff --git a/server/channels/api4/ldap_test.go b/server/channels/api4/ldap_test.go index e3583f9293..4187bb25c8 100644 --- a/server/channels/api4/ldap_test.go +++ b/server/channels/api4/ldap_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) var spPrivateKey = `-----BEGIN PRIVATE KEY----- diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go index ff63704774..065ff90fd6 100644 --- a/server/channels/api4/license.go +++ b/server/channels/api4/license.go @@ -11,11 +11,11 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitLicense() { diff --git a/server/channels/api4/license_local.go b/server/channels/api4/license_local.go index f2a30a972b..e1380b3f6f 100644 --- a/server/channels/api4/license_local.go +++ b/server/channels/api4/license_local.go @@ -9,9 +9,9 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitLicenseLocal() { diff --git a/server/channels/api4/license_test.go b/server/channels/api4/license_test.go index d673e13543..d580d6243d 100644 --- a/server/channels/api4/license_test.go +++ b/server/channels/api4/license_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - mocks2 "github.com/mattermost/mattermost-server/v6/server/channels/utils/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + mocks2 "github.com/mattermost/mattermost-server/server/v8/channels/utils/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/server/channels/api4/main_test.go b/server/channels/api4/main_test.go index 85807f03db..e7b1bb91e3 100644 --- a/server/channels/api4/main_test.go +++ b/server/channels/api4/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var replicaFlag bool diff --git a/server/channels/api4/notify_admin.go b/server/channels/api4/notify_admin.go index 36af8263a0..e94f280de9 100644 --- a/server/channels/api4/notify_admin.go +++ b/server/channels/api4/notify_admin.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func handleNotifyAdmin(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/api4/notify_admin_test.go b/server/channels/api4/notify_admin_test.go index 2ba2640451..557ee3297c 100644 --- a/server/channels/api4/notify_admin_test.go +++ b/server/channels/api4/notify_admin_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestNotifyAdmin(t *testing.T) { diff --git a/server/channels/api4/oauth.go b/server/channels/api4/oauth.go index bed603afe3..fb486cc7c2 100644 --- a/server/channels/api4/oauth.go +++ b/server/channels/api4/oauth.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitOAuth() { diff --git a/server/channels/api4/oauth_test.go b/server/channels/api4/oauth_test.go index face6ca564..1ab7ea5191 100644 --- a/server/channels/api4/oauth_test.go +++ b/server/channels/api4/oauth_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateOAuthApp(t *testing.T) { diff --git a/server/channels/api4/openGraph.go b/server/channels/api4/openGraph.go index 789afc3730..0eba8030a8 100644 --- a/server/channels/api4/openGraph.go +++ b/server/channels/api4/openGraph.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitOpenGraph() { diff --git a/server/channels/api4/openGraph_test.go b/server/channels/api4/openGraph_test.go index 5faedfc9ae..5a038fb4da 100644 --- a/server/channels/api4/openGraph_test.go +++ b/server/channels/api4/openGraph_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetOpenGraphMetadata(t *testing.T) { diff --git a/server/channels/api4/permission.go b/server/channels/api4/permission.go index a0aac0a6eb..f732f3afe9 100644 --- a/server/channels/api4/permission.go +++ b/server/channels/api4/permission.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitPermissions() { diff --git a/server/channels/api4/permissions_test.go b/server/channels/api4/permissions_test.go index 1eb4b3d01e..16aa71d135 100644 --- a/server/channels/api4/permissions_test.go +++ b/server/channels/api4/permissions_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetAncillaryPermissions(t *testing.T) { diff --git a/server/channels/api4/plugin.go b/server/channels/api4/plugin.go index e645a5822c..c6aa44961e 100644 --- a/server/channels/api4/plugin.go +++ b/server/channels/api4/plugin.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/plugin_test.go b/server/channels/api4/plugin_test.go index 24c0d5d483..5793041423 100644 --- a/server/channels/api4/plugin_test.go +++ b/server/channels/api4/plugin_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func TestPlugin(t *testing.T) { diff --git a/server/channels/api4/post.go b/server/channels/api4/post.go index 1588a3b913..8690aa4e32 100644 --- a/server/channels/api4/post.go +++ b/server/channels/api4/post.go @@ -9,11 +9,11 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/web" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitPost() { diff --git a/server/channels/api4/post_test.go b/server/channels/api4/post_test.go index fd480eb5d9..6be2cb3223 100644 --- a/server/channels/api4/post_test.go +++ b/server/channels/api4/post_test.go @@ -21,13 +21,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCreatePost(t *testing.T) { diff --git a/server/channels/api4/preference.go b/server/channels/api4/preference.go index fa522de844..4483e00c22 100644 --- a/server/channels/api4/preference.go +++ b/server/channels/api4/preference.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitPreference() { diff --git a/server/channels/api4/preference_test.go b/server/channels/api4/preference_test.go index 8f70c00445..b270995099 100644 --- a/server/channels/api4/preference_test.go +++ b/server/channels/api4/preference_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetPreferences(t *testing.T) { diff --git a/server/channels/api4/reaction.go b/server/channels/api4/reaction.go index b2b65892a1..b58a71e8f9 100644 --- a/server/channels/api4/reaction.go +++ b/server/channels/api4/reaction.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitReaction() { diff --git a/server/channels/api4/reaction_test.go b/server/channels/api4/reaction_test.go index 21aeaa3b0e..45d3aab9a3 100644 --- a/server/channels/api4/reaction_test.go +++ b/server/channels/api4/reaction_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSaveReaction(t *testing.T) { diff --git a/server/channels/api4/remote_cluster.go b/server/channels/api4/remote_cluster.go index f469da5a60..75783f0c98 100644 --- a/server/channels/api4/remote_cluster.go +++ b/server/channels/api4/remote_cluster.go @@ -9,11 +9,11 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitRemoteCluster() { diff --git a/server/channels/api4/resolver.go b/server/channels/api4/resolver.go index 7148325e61..2e46e6d8b2 100644 --- a/server/channels/api4/resolver.go +++ b/server/channels/api4/resolver.go @@ -10,10 +10,10 @@ import ( "github.com/graph-gophers/dataloader/v6" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" ) // cursorPrefix is used to categorize objects diff --git a/server/channels/api4/resolver_channel.go b/server/channels/api4/resolver_channel.go index 1061102b2d..0650248131 100644 --- a/server/channels/api4/resolver_channel.go +++ b/server/channels/api4/resolver_channel.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" ) // channel is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_channel_member.go b/server/channels/api4/resolver_channel_member.go index 22d6a2c380..e26aaca041 100644 --- a/server/channels/api4/resolver_channel_member.go +++ b/server/channels/api4/resolver_channel_member.go @@ -11,8 +11,8 @@ import ( "github.com/graph-gophers/dataloader/v6" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" ) // channelMember is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_channel_member_test.go b/server/channels/api4/resolver_channel_member_test.go index fc55454516..e1c5cc9699 100644 --- a/server/channels/api4/resolver_channel_member_test.go +++ b/server/channels/api4/resolver_channel_member_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGraphQLChannelMembers(t *testing.T) { diff --git a/server/channels/api4/resolver_channel_test.go b/server/channels/api4/resolver_channel_test.go index 891d476393..6d1b535568 100644 --- a/server/channels/api4/resolver_channel_test.go +++ b/server/channels/api4/resolver_channel_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGraphQLChannels(t *testing.T) { diff --git a/server/channels/api4/resolver_sidebar_categories_test.go b/server/channels/api4/resolver_sidebar_categories_test.go index a0882a88f5..5d4b3ee691 100644 --- a/server/channels/api4/resolver_sidebar_categories_test.go +++ b/server/channels/api4/resolver_sidebar_categories_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGraphQLSidebarCategories(t *testing.T) { diff --git a/server/channels/api4/resolver_team.go b/server/channels/api4/resolver_team.go index 42ac606e2f..a94be2cc5a 100644 --- a/server/channels/api4/resolver_team.go +++ b/server/channels/api4/resolver_team.go @@ -9,8 +9,8 @@ import ( "github.com/graph-gophers/dataloader/v6" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" ) func getGraphQLTeam(ctx context.Context, id string) (*model.Team, error) { diff --git a/server/channels/api4/resolver_team_member.go b/server/channels/api4/resolver_team_member.go index 0da4656aab..3036a4d146 100644 --- a/server/channels/api4/resolver_team_member.go +++ b/server/channels/api4/resolver_team_member.go @@ -9,7 +9,7 @@ import ( "github.com/graph-gophers/dataloader/v6" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // teamMember is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_team_member_test.go b/server/channels/api4/resolver_team_member_test.go index 95d003df8e..42b7c9efe1 100644 --- a/server/channels/api4/resolver_team_member_test.go +++ b/server/channels/api4/resolver_team_member_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGraphQLTeamMembers(t *testing.T) { diff --git a/server/channels/api4/resolver_test.go b/server/channels/api4/resolver_test.go index 7911154c08..17eba4b864 100644 --- a/server/channels/api4/resolver_test.go +++ b/server/channels/api4/resolver_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGraphQLConfig(t *testing.T) { diff --git a/server/channels/api4/resolver_user.go b/server/channels/api4/resolver_user.go index 5fa364eeb4..588b961e7f 100644 --- a/server/channels/api4/resolver_user.go +++ b/server/channels/api4/resolver_user.go @@ -9,8 +9,8 @@ import ( "github.com/graph-gophers/dataloader/v6" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" ) // user is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_user_test.go b/server/channels/api4/resolver_user_test.go index 1a13f819a7..b6104a181d 100644 --- a/server/channels/api4/resolver_user_test.go +++ b/server/channels/api4/resolver_user_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGraphQLUser(t *testing.T) { diff --git a/server/channels/api4/role.go b/server/channels/api4/role.go index b7ca855ef7..40d4527bf9 100644 --- a/server/channels/api4/role.go +++ b/server/channels/api4/role.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var notAllowedPermissions = []string{ diff --git a/server/channels/api4/role_test.go b/server/channels/api4/role_test.go index 0a1d3145cd..5bc281a21c 100644 --- a/server/channels/api4/role_test.go +++ b/server/channels/api4/role_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetAllRoles(t *testing.T) { diff --git a/server/channels/api4/saml.go b/server/channels/api4/saml.go index d78b0449f5..4cae4f2d55 100644 --- a/server/channels/api4/saml.go +++ b/server/channels/api4/saml.go @@ -10,9 +10,9 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitSaml() { diff --git a/server/channels/api4/saml_test.go b/server/channels/api4/saml_test.go index 0ededf5ea4..2d41632fe5 100644 --- a/server/channels/api4/saml_test.go +++ b/server/channels/api4/saml_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetSamlMetadata(t *testing.T) { diff --git a/server/channels/api4/scheme.go b/server/channels/api4/scheme.go index 7ff94d3e07..85dc095382 100644 --- a/server/channels/api4/scheme.go +++ b/server/channels/api4/scheme.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitScheme() { diff --git a/server/channels/api4/scheme_test.go b/server/channels/api4/scheme_test.go index ba478a243e..13e4e631d3 100644 --- a/server/channels/api4/scheme_test.go +++ b/server/channels/api4/scheme_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateScheme(t *testing.T) { diff --git a/server/channels/api4/shared_channel.go b/server/channels/api4/shared_channel.go index 5e53ee5f33..8bb40a82d5 100644 --- a/server/channels/api4/shared_channel.go +++ b/server/channels/api4/shared_channel.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitSharedChannels() { diff --git a/server/channels/api4/shared_channel_test.go b/server/channels/api4/shared_channel_test.go index 0f15f6c965..befe9642b6 100644 --- a/server/channels/api4/shared_channel_test.go +++ b/server/channels/api4/shared_channel_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/model" ) var ( diff --git a/server/channels/api4/status.go b/server/channels/api4/status.go index 8ff7eaa248..62a4c0e7ec 100644 --- a/server/channels/api4/status.go +++ b/server/channels/api4/status.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitStatus() { diff --git a/server/channels/api4/status_test.go b/server/channels/api4/status_test.go index 61241a5718..bde3e695b4 100644 --- a/server/channels/api4/status_test.go +++ b/server/channels/api4/status_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetUserStatus(t *testing.T) { diff --git a/server/channels/api4/system.go b/server/channels/api4/system.go index 00143beeb8..bb3442ba54 100644 --- a/server/channels/api4/system.go +++ b/server/channels/api4/system.go @@ -17,12 +17,12 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" - "github.com/mattermost/mattermost-server/v6/server/platform/services/upgrader" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/web" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/services/upgrader" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) const ( diff --git a/server/channels/api4/system_local.go b/server/channels/api4/system_local.go index dc7508c874..65e6d12b1c 100644 --- a/server/channels/api4/system_local.go +++ b/server/channels/api4/system_local.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitSystemLocal() { diff --git a/server/channels/api4/system_test.go b/server/channels/api4/system_test.go index effce7253d..5921e32802 100644 --- a/server/channels/api4/system_test.go +++ b/server/channels/api4/system_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestGetPing(t *testing.T) { diff --git a/server/channels/api4/team.go b/server/channels/api4/team.go index 0049b47c38..bef7d2223d 100644 --- a/server/channels/api4/team.go +++ b/server/channels/api4/team.go @@ -14,9 +14,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/team_local.go b/server/channels/api4/team_local.go index d9b1019ef3..310ea0de84 100644 --- a/server/channels/api4/team_local.go +++ b/server/channels/api4/team_local.go @@ -12,11 +12,11 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/email" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/email" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitTeamLocal() { diff --git a/server/channels/api4/team_test.go b/server/channels/api4/team_test.go index f511ffe3f1..ee4a4ca74d 100644 --- a/server/channels/api4/team_test.go +++ b/server/channels/api4/team_test.go @@ -17,14 +17,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/api4/terms_of_service.go b/server/channels/api4/terms_of_service.go index a5906cc77e..d0d72604f8 100644 --- a/server/channels/api4/terms_of_service.go +++ b/server/channels/api4/terms_of_service.go @@ -7,10 +7,10 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitTermsOfService() { diff --git a/server/channels/api4/terms_of_service_test.go b/server/channels/api4/terms_of_service_test.go index e3699d14a4..eac3ed54fe 100644 --- a/server/channels/api4/terms_of_service_test.go +++ b/server/channels/api4/terms_of_service_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetTermsOfService(t *testing.T) { diff --git a/server/channels/api4/upload.go b/server/channels/api4/upload.go index f94a351149..55850903db 100644 --- a/server/channels/api4/upload.go +++ b/server/channels/api4/upload.go @@ -10,10 +10,10 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitUpload() { diff --git a/server/channels/api4/upload_test.go b/server/channels/api4/upload_test.go index 9606d660bb..9ed6d1eaae 100644 --- a/server/channels/api4/upload_test.go +++ b/server/channels/api4/upload_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateUpload(t *testing.T) { diff --git a/server/channels/api4/usage.go b/server/channels/api4/usage.go index d39ecbead4..fabf880a32 100644 --- a/server/channels/api4/usage.go +++ b/server/channels/api4/usage.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitUsage() { diff --git a/server/channels/api4/usage_test.go b/server/channels/api4/usage_test.go index a8e93dc9f7..b85b2f0029 100644 --- a/server/channels/api4/usage_test.go +++ b/server/channels/api4/usage_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetPostsUsage(t *testing.T) { diff --git a/server/channels/api4/user.go b/server/channels/api4/user.go index 11d4a71e0f..c259922e82 100644 --- a/server/channels/api4/user.go +++ b/server/channels/api4/user.go @@ -12,13 +12,13 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/web" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitUser() { diff --git a/server/channels/api4/user_local.go b/server/channels/api4/user_local.go index ec1d2d2aba..21cc0f800c 100644 --- a/server/channels/api4/user_local.go +++ b/server/channels/api4/user_local.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitUserLocal() { diff --git a/server/channels/api4/user_test.go b/server/channels/api4/user_test.go index b6dde5e2a1..95db64d720 100644 --- a/server/channels/api4/user_test.go +++ b/server/channels/api4/user_test.go @@ -20,13 +20,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" - _ "github.com/mattermost/mattermost-server/v6/model/oauthproviders/gitlab" + _ "github.com/mattermost/mattermost-server/server/v8/model/oauthproviders/gitlab" ) func TestCreateUser(t *testing.T) { diff --git a/server/channels/api4/user_viewmembers_test.go b/server/channels/api4/user_viewmembers_test.go index 1359873866..40c051b0ae 100644 --- a/server/channels/api4/user_viewmembers_test.go +++ b/server/channels/api4/user_viewmembers_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestAPIRestrictedViewMembers(t *testing.T) { diff --git a/server/channels/api4/webhook.go b/server/channels/api4/webhook.go index 36b5aa113a..4d96e08a61 100644 --- a/server/channels/api4/webhook.go +++ b/server/channels/api4/webhook.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitWebhook() { diff --git a/server/channels/api4/webhook_local.go b/server/channels/api4/webhook_local.go index dbe57deb06..eacdf2af88 100644 --- a/server/channels/api4/webhook_local.go +++ b/server/channels/api4/webhook_local.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitWebhookLocal() { diff --git a/server/channels/api4/webhook_test.go b/server/channels/api4/webhook_test.go index 85335dbb35..468fd58082 100644 --- a/server/channels/api4/webhook_test.go +++ b/server/channels/api4/webhook_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateIncomingWebhook(t *testing.T) { diff --git a/server/channels/api4/websocket.go b/server/channels/api4/websocket.go index e2fa25a565..54fea3f4aa 100644 --- a/server/channels/api4/websocket.go +++ b/server/channels/api4/websocket.go @@ -8,9 +8,9 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/websocket_norace_test.go b/server/channels/api4/websocket_norace_test.go index 88d2a508c7..5be1d539c2 100644 --- a/server/channels/api4/websocket_norace_test.go +++ b/server/channels/api4/websocket_norace_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // TestWebSocket is intentionally made to skip -race mode diff --git a/server/channels/api4/websocket_test.go b/server/channels/api4/websocket_test.go index c1a804f3bc..87eef66dbe 100644 --- a/server/channels/api4/websocket_test.go +++ b/server/channels/api4/websocket_test.go @@ -14,9 +14,9 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestWebSocketTrailingSlash(t *testing.T) { diff --git a/server/channels/api4/work_templates.go b/server/channels/api4/work_templates.go index 2f6836682e..bf3d5860b7 100644 --- a/server/channels/api4/work_templates.go +++ b/server/channels/api4/work_templates.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitWorkTemplate() { diff --git a/server/channels/app/admin.go b/server/channels/app/admin.go index fb3ab53000..b559dca1e0 100644 --- a/server/channels/app/admin.go +++ b/server/channels/app/admin.go @@ -10,11 +10,11 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" ) var latestVersionCache = cache.NewLRU(cache.LRUOptions{ diff --git a/server/channels/app/admin_advisor.go b/server/channels/app/admin_advisor.go index 23397e1060..70fb4b4151 100644 --- a/server/channels/app/admin_advisor.go +++ b/server/channels/app/admin_advisor.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) GetWarnMetricsStatus() (map[string]*model.WarnMetricStatus, *model.AppError) { diff --git a/server/channels/app/admin_test.go b/server/channels/app/admin_test.go index 00c0175ead..a583a572e3 100644 --- a/server/channels/app/admin_test.go +++ b/server/channels/app/admin_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetLatestVersion(t *testing.T) { diff --git a/server/channels/app/analytics.go b/server/channels/app/analytics.go index c4582df158..83b8eb043f 100644 --- a/server/channels/app/analytics.go +++ b/server/channels/app/analytics.go @@ -8,8 +8,8 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/app.go b/server/channels/app/app.go index 20387b2234..f7f30c1936 100644 --- a/server/channels/app/app.go +++ b/server/channels/app/app.go @@ -9,16 +9,16 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/services/timezones" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" ) // App is a pure functional component that does not have any fields, except Server. diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go index b402409be2..578699e941 100644 --- a/server/channels/app/app_iface.go +++ b/server/channels/app/app_iface.go @@ -18,23 +18,23 @@ import ( "reflect" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/services/timezones" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // AppIface is extracted from App struct and contains all it's exported methods. It's provided to allow partial interface passing and app layers creation. diff --git a/server/channels/app/app_test.go b/server/channels/app/app_test.go index 291a4daa5f..16b6805276 100644 --- a/server/channels/app/app_test.go +++ b/server/channels/app/app_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) /* Temporarily comment out until MM-11108 diff --git a/server/channels/app/audit.go b/server/channels/app/audit.go index 00d441ddc7..e599d2e9d7 100644 --- a/server/channels/app/audit.go +++ b/server/channels/app/audit.go @@ -9,11 +9,11 @@ import ( "net/http" "os/user" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/channels/app/authentication.go b/server/channels/app/authentication.go index dbac2df81a..aac42c936c 100644 --- a/server/channels/app/authentication.go +++ b/server/channels/app/authentication.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mfa" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa" ) type TokenLocation int diff --git a/server/channels/app/authentication_test.go b/server/channels/app/authentication_test.go index 38e83cc383..eb4ed1d4cf 100644 --- a/server/channels/app/authentication_test.go +++ b/server/channels/app/authentication_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestParseAuthTokenFromRequest(t *testing.T) { diff --git a/server/channels/app/authorization.go b/server/channels/app/authorization.go index 5a115703ef..261dc39a34 100644 --- a/server/channels/app/authorization.go +++ b/server/channels/app/authorization.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) MakePermissionError(s *model.Session, permissions []*model.Permission) *model.AppError { diff --git a/server/channels/app/authorization_test.go b/server/channels/app/authorization_test.go index 9560e76e44..b326c22db7 100644 --- a/server/channels/app/authorization_test.go +++ b/server/channels/app/authorization_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCheckIfRolesGrantPermission(t *testing.T) { diff --git a/server/channels/app/auto_responder.go b/server/channels/app/auto_responder.go index 849509e782..d002cf0ab5 100644 --- a/server/channels/app/auto_responder.go +++ b/server/channels/app/auto_responder.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" ) // check if there is any auto_response type post in channel by the user in a calender day diff --git a/server/channels/app/auto_responder_test.go b/server/channels/app/auto_responder_test.go index a7acc6eca1..8bd9e8493a 100644 --- a/server/channels/app/auto_responder_test.go +++ b/server/channels/app/auto_responder_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSetAutoResponderStatus(t *testing.T) { diff --git a/server/channels/app/bot.go b/server/channels/app/bot.go index 3f8db288b8..ae117a05da 100644 --- a/server/channels/app/bot.go +++ b/server/channels/app/bot.go @@ -9,12 +9,12 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/bot_test.go b/server/channels/app/bot_test.go index 6b77b08fa0..c417678679 100644 --- a/server/channels/app/bot_test.go +++ b/server/channels/app/bot_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateBot(t *testing.T) { diff --git a/server/channels/app/brand.go b/server/channels/app/brand.go index be3b6c32be..3c2abf3650 100644 --- a/server/channels/app/brand.go +++ b/server/channels/app/brand.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/busy.go b/server/channels/app/busy.go index 41b9c758db..a72bb2ce71 100644 --- a/server/channels/app/busy.go +++ b/server/channels/app/busy.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/busy_test.go b/server/channels/app/busy_test.go index 87fe0df323..2b267fa443 100644 --- a/server/channels/app/busy_test.go +++ b/server/channels/app/busy_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestBusySet(t *testing.T) { diff --git a/server/channels/app/channel.go b/server/channels/app/channel.go index e03e627487..09fb2ce1cc 100644 --- a/server/channels/app/channel.go +++ b/server/channels/app/channel.go @@ -14,15 +14,15 @@ import ( "github.com/mattermost/logr/v2" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // channelsWrapper provides an implementation of `product.ChannelService` to be used by products. diff --git a/server/channels/app/channel_category.go b/server/channels/app/channel_category.go index b9758c38d1..6b4ce964d2 100644 --- a/server/channels/app/channel_category.go +++ b/server/channels/app/channel_category.go @@ -8,10 +8,10 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) createInitialSidebarCategories(userID string, opts *store.SidebarCategorySearchOpts) (*model.OrderedSidebarCategories, *model.AppError) { diff --git a/server/channels/app/channel_category_test.go b/server/channels/app/channel_category_test.go index f9759742f6..f697f773d7 100644 --- a/server/channels/app/channel_category_test.go +++ b/server/channels/app/channel_category_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSidebarCategory(t *testing.T) { diff --git a/server/channels/app/channel_test.go b/server/channels/app/channel_test.go index f06449368c..87ab389beb 100644 --- a/server/channels/app/channel_test.go +++ b/server/channels/app/channel_test.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPermanentDeleteChannel(t *testing.T) { diff --git a/server/channels/app/channels.go b/server/channels/app/channels.go index f2ae0e6d11..57252b403a 100644 --- a/server/channels/app/channels.go +++ b/server/channels/app/channels.go @@ -11,16 +11,16 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imaging" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ServerKey product.ServiceKey = "server" diff --git a/server/channels/app/cloud.go b/server/channels/app/cloud.go index 29cd5a50c1..3114368f1f 100644 --- a/server/channels/app/cloud.go +++ b/server/channels/app/cloud.go @@ -10,10 +10,10 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // Ensure cloud service wrapper implements `product.CloudService` diff --git a/server/channels/app/cluster_handlers.go b/server/channels/app/cluster_handlers.go index 896eee9eb1..7c5ce3b983 100644 --- a/server/channels/app/cluster_handlers.go +++ b/server/channels/app/cluster_handlers.go @@ -6,9 +6,9 @@ package app import ( "encoding/json" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func (s *Server) clusterInstallPluginHandler(msg *model.ClusterMessage) { diff --git a/server/channels/app/collection.go b/server/channels/app/collection.go index f144fb3237..dbe7c0d8a3 100644 --- a/server/channels/app/collection.go +++ b/server/channels/app/collection.go @@ -6,8 +6,8 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) RegisterCollectionAndTopic(pluginID, collectionType, topicType string) error { diff --git a/server/channels/app/command.go b/server/channels/app/command.go index acf4e496c2..1e94e5cdad 100644 --- a/server/channels/app/command.go +++ b/server/channels/app/command.go @@ -14,11 +14,11 @@ import ( "sync" "unicode" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/command_autocomplete.go b/server/channels/app/command_autocomplete.go index 434fa3cd20..6132332d31 100644 --- a/server/channels/app/command_autocomplete.go +++ b/server/channels/app/command_autocomplete.go @@ -11,9 +11,9 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // AutocompleteDynamicArgProvider dynamically provides auto-completion args for built-in commands. diff --git a/server/channels/app/command_autocomplete_test.go b/server/channels/app/command_autocomplete_test.go index 19d8bc9817..99e5d40855 100644 --- a/server/channels/app/command_autocomplete_test.go +++ b/server/channels/app/command_autocomplete_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestParseStaticListArgument(t *testing.T) { diff --git a/server/channels/app/compliance.go b/server/channels/app/compliance.go index 95c68ab9ba..40e333825f 100644 --- a/server/channels/app/compliance.go +++ b/server/channels/app/compliance.go @@ -8,9 +8,9 @@ import ( "net/http" "os" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) { diff --git a/server/channels/app/config.go b/server/channels/app/config.go index 39961922c5..93719b3461 100644 --- a/server/channels/app/config.go +++ b/server/channels/app/config.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/config_test.go b/server/channels/app/config_test.go index 65a3ae4d92..102de38754 100644 --- a/server/channels/app/config_test.go +++ b/server/channels/app/config_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestAsymmetricSigningKey(t *testing.T) { diff --git a/server/channels/app/context.go b/server/channels/app/context.go index 5a289e6037..03cb895b37 100644 --- a/server/channels/app/context.go +++ b/server/channels/app/context.go @@ -6,9 +6,9 @@ package app import ( "context" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // WithMaster adds the context value that master DB should be selected for this request. diff --git a/server/channels/app/data_retention.go b/server/channels/app/data_retention.go index e7b914e14d..dd2ef11dca 100644 --- a/server/channels/app/data_retention.go +++ b/server/channels/app/data_retention.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetGlobalRetentionPolicy() (*model.GlobalRetentionPolicy, *model.AppError) { diff --git a/server/channels/app/download.go b/server/channels/app/download.go index 9646c357f7..ec6ddf8b14 100644 --- a/server/channels/app/download.go +++ b/server/channels/app/download.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/download_test.go b/server/channels/app/download_test.go index 7830647d27..172c527c19 100644 --- a/server/channels/app/download_test.go +++ b/server/channels/app/download_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestDownloadFromURL(t *testing.T) { diff --git a/server/channels/app/draft.go b/server/channels/app/draft.go index a8ca1ef9d2..83e9d748ff 100644 --- a/server/channels/app/draft.go +++ b/server/channels/app/draft.go @@ -9,10 +9,10 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) GetDraft(userID, channelID, rootID string) (*model.Draft, *model.AppError) { diff --git a/server/channels/app/draft_test.go b/server/channels/app/draft_test.go index 83c7d090d8..ac19cedac0 100644 --- a/server/channels/app/draft_test.go +++ b/server/channels/app/draft_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetDraft(t *testing.T) { diff --git a/server/channels/app/email/email.go b/server/channels/app/email/email.go index bb64e6efd0..2b3fcacef8 100644 --- a/server/channels/app/email/email.go +++ b/server/channels/app/email/email.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" "github.com/microcosm-cc/bluemonday" ) diff --git a/server/channels/app/email/email_batching.go b/server/channels/app/email/email_batching.go index 91e4bd1204..1988a358cd 100644 --- a/server/channels/app/email/email_batching.go +++ b/server/channels/app/email/email_batching.go @@ -14,9 +14,9 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/email/email_batching_test.go b/server/channels/app/email/email_batching_test.go index 4444bc253d..087351e6a3 100644 --- a/server/channels/app/email/email_batching_test.go +++ b/server/channels/app/email/email_batching_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestHandleNewNotifications(t *testing.T) { diff --git a/server/channels/app/email/email_test.go b/server/channels/app/email/email_test.go index 3fb2e09a7a..7a8c87979e 100644 --- a/server/channels/app/email/email_test.go +++ b/server/channels/app/email/email_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" ) func TestCondenseSiteURL(t *testing.T) { diff --git a/server/channels/app/email/helper_test.go b/server/channels/app/email/helper_test.go index b4c31cf134..52f97c0af7 100644 --- a/server/channels/app/email/helper_test.go +++ b/server/channels/app/email/helper_test.go @@ -9,15 +9,15 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type TestHelper struct { diff --git a/server/channels/app/email/main_test.go b/server/channels/app/email/main_test.go index fc9ea8f28d..a2bcf53cdb 100644 --- a/server/channels/app/email/main_test.go +++ b/server/channels/app/email/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/email/mocks/ServiceInterface.go b/server/channels/app/email/mocks/ServiceInterface.go index 04a6ddbf24..8dcf51de5d 100644 --- a/server/channels/app/email/mocks/ServiceInterface.go +++ b/server/channels/app/email/mocks/ServiceInterface.go @@ -7,13 +7,13 @@ package mocks import ( io "io" - i18n "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + i18n "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" - templates "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + templates "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" throttled "github.com/throttled/throttled" ) diff --git a/server/channels/app/email/notification_email.go b/server/channels/app/email/notification_email.go index 542f43aff5..5bf441be8c 100644 --- a/server/channels/app/email/notification_email.go +++ b/server/channels/app/email/notification_email.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type FieldRow struct { diff --git a/server/channels/app/email/notification_email_test.go b/server/channels/app/email/notification_email_test.go index ee599c988a..f9bf6e6ae1 100644 --- a/server/channels/app/email/notification_email_test.go +++ b/server/channels/app/email/notification_email_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestProcessMessageAttachments(t *testing.T) { diff --git a/server/channels/app/email/service.go b/server/channels/app/email/service.go index 3aa0b658f4..0ddf55f35f 100644 --- a/server/channels/app/email/service.go +++ b/server/channels/app/email/service.go @@ -12,12 +12,12 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" ) const ( diff --git a/server/channels/app/email/utils.go b/server/channels/app/email/utils.go index e13d610ac2..225b9178f0 100644 --- a/server/channels/app/email/utils.go +++ b/server/channels/app/email/utils.go @@ -4,8 +4,8 @@ package email import ( - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" ) func (es *Service) mailServiceConfig(replyToAddress string) *mail.SMTPConfig { diff --git a/server/channels/app/email_test.go b/server/channels/app/email_test.go index c7d3c56e6e..d0969ccd67 100644 --- a/server/channels/app/email_test.go +++ b/server/channels/app/email_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSendInviteEmailRateLimits(t *testing.T) { diff --git a/server/channels/app/emoji.go b/server/channels/app/emoji.go index 92a9662376..5a7a847d0a 100644 --- a/server/channels/app/emoji.go +++ b/server/channels/app/emoji.go @@ -22,11 +22,11 @@ import ( "github.com/disintegration/imaging" _ "golang.org/x/image/webp" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/enterprise.go b/server/channels/app/enterprise.go index f8e913a828..4edd75a534 100644 --- a/server/channels/app/enterprise.go +++ b/server/channels/app/enterprise.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - ejobs "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + ejobs "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/jobs" ) var accountMigrationInterface func(*App) einterfaces.AccountMigrationInterface diff --git a/server/channels/app/enterprise_test.go b/server/channels/app/enterprise_test.go index e518b1b078..79ec61cc6d 100644 --- a/server/channels/app/enterprise_test.go +++ b/server/channels/app/enterprise_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSAMLSettings(t *testing.T) { diff --git a/server/channels/app/expirynotify.go b/server/channels/app/expirynotify.go index 16d56bacf4..6155815b54 100644 --- a/server/channels/app/expirynotify.go +++ b/server/channels/app/expirynotify.go @@ -6,9 +6,9 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/expirynotify_test.go b/server/channels/app/expirynotify_test.go index 42b74e802b..3db5d09003 100644 --- a/server/channels/app/expirynotify_test.go +++ b/server/channels/app/expirynotify_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestNotifySessionsExpired(t *testing.T) { diff --git a/server/channels/app/export.go b/server/channels/app/export.go index 5dd00a33eb..1ba7450bb1 100644 --- a/server/channels/app/export.go +++ b/server/channels/app/export.go @@ -18,11 +18,11 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imports" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // We use this map to identify the exportable preferences. diff --git a/server/channels/app/export_converters.go b/server/channels/app/export_converters.go index 23fd750ff2..10b943caef 100644 --- a/server/channels/app/export_converters.go +++ b/server/channels/app/export_converters.go @@ -6,8 +6,8 @@ package app import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imports" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" + "github.com/mattermost/mattermost-server/server/v8/model" ) func ImportLineFromTeam(team *model.TeamForExport) *imports.LineImportData { diff --git a/server/channels/app/export_test.go b/server/channels/app/export_test.go index 1d97d80826..5a6fa59752 100644 --- a/server/channels/app/export_test.go +++ b/server/channels/app/export_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestReactionsOfPost(t *testing.T) { diff --git a/server/channels/app/extract_plugin_tar.go b/server/channels/app/extract_plugin_tar.go index 9640f5e906..5212e73e12 100644 --- a/server/channels/app/extract_plugin_tar.go +++ b/server/channels/app/extract_plugin_tar.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // extractTarGz takes in an io.Reader containing the bytes for a .tar.gz file and diff --git a/server/channels/app/featureflag/feature_flags_sync.go b/server/channels/app/featureflag/feature_flags_sync.go index 8fb51fdb6a..7d1af97a7a 100644 --- a/server/channels/app/featureflag/feature_flags_sync.go +++ b/server/channels/app/featureflag/feature_flags_sync.go @@ -13,8 +13,8 @@ import ( "github.com/splitio/go-client/v6/splitio/client" "github.com/splitio/go-client/v6/splitio/conf" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SyncParams struct { diff --git a/server/channels/app/featureflag/feature_flags_sync_test.go b/server/channels/app/featureflag/feature_flags_sync_test.go index dc4f59a501..eb967d00da 100644 --- a/server/channels/app/featureflag/feature_flags_sync_test.go +++ b/server/channels/app/featureflag/feature_flags_sync_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetStructFields(t *testing.T) { diff --git a/server/channels/app/featureflag/split_logger.go b/server/channels/app/featureflag/split_logger.go index f806d75793..6a61a9a324 100644 --- a/server/channels/app/featureflag/split_logger.go +++ b/server/channels/app/featureflag/split_logger.go @@ -6,7 +6,7 @@ package featureflag import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type splitLogger struct { diff --git a/server/channels/app/file.go b/server/channels/app/file.go index 826f224dc8..bd7ce30577 100644 --- a/server/channels/app/file.go +++ b/server/channels/app/file.go @@ -24,16 +24,16 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imaging" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/docextractor" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/docextractor" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/pkg/errors" ) diff --git a/server/channels/app/file_bench_test.go b/server/channels/app/file_bench_test.go index 2ab58f51aa..315bc304ef 100644 --- a/server/channels/app/file_bench_test.go +++ b/server/channels/app/file_bench_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) var randomJPEG []byte diff --git a/server/channels/app/file_helper.go b/server/channels/app/file_helper.go index a3059ff30b..309867e3b6 100644 --- a/server/channels/app/file_helper.go +++ b/server/channels/app/file_helper.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // removeInaccessibleContentFromFilesSlice removes content from the files beyond the cloud plan's limit diff --git a/server/channels/app/file_helper_test.go b/server/channels/app/file_helper_test.go index b3de7be086..b1b26be527 100644 --- a/server/channels/app/file_helper_test.go +++ b/server/channels/app/file_helper_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestFilterInaccessibleFiles(t *testing.T) { diff --git a/server/channels/app/file_test.go b/server/channels/app/file_test.go index 842e69fb55..5ba9acef39 100644 --- a/server/channels/app/file_test.go +++ b/server/channels/app/file_test.go @@ -16,13 +16,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - eMocks "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/mocks" - filesStoreMocks "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks" + eMocks "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" + filesStoreMocks "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" ) func TestGeneratePublicLinkHash(t *testing.T) { diff --git a/server/channels/app/group.go b/server/channels/app/group.go index 3faefa869c..d004e4d4d9 100644 --- a/server/channels/app/group.go +++ b/server/channels/app/group.go @@ -8,8 +8,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetGroup(id string, opts *model.GetGroupOpts, viewRestrictions *model.ViewUsersRestrictions) (*model.Group, *model.AppError) { diff --git a/server/channels/app/group_test.go b/server/channels/app/group_test.go index fb53d3e637..bf6b51eeec 100644 --- a/server/channels/app/group_test.go +++ b/server/channels/app/group_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetGroup(t *testing.T) { diff --git a/server/channels/app/helper_test.go b/server/channels/app/helper_test.go index 1b45e5c1b2..ba17c9f0f0 100644 --- a/server/channels/app/helper_test.go +++ b/server/channels/app/helper_test.go @@ -15,16 +15,16 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type TestHelper struct { diff --git a/server/channels/app/hosted_customer.go b/server/channels/app/hosted_customer.go index d27945e85d..8b95353e7f 100644 --- a/server/channels/app/hosted_customer.go +++ b/server/channels/app/hosted_customer.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) NotifySelfHostedSignupProgress(progress string, userId string) { diff --git a/server/channels/app/image.go b/server/channels/app/image.go index e65cf3527a..113402a768 100644 --- a/server/channels/app/image.go +++ b/server/channels/app/image.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imaging" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" ) func checkImageResolutionLimit(w, h int, maxRes int64) error { diff --git a/server/channels/app/imaging/decode_bench_test.go b/server/channels/app/imaging/decode_bench_test.go index 88495c8f32..1fdec80414 100644 --- a/server/channels/app/imaging/decode_bench_test.go +++ b/server/channels/app/imaging/decode_bench_test.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/imaging/decode_test.go b/server/channels/app/imaging/decode_test.go index 070f2ea780..6426999e28 100644 --- a/server/channels/app/imaging/decode_test.go +++ b/server/channels/app/imaging/decode_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/imaging/utils_test.go b/server/channels/app/imaging/utils_test.go index a5330fbc09..e626ddffc1 100644 --- a/server/channels/app/imaging/utils_test.go +++ b/server/channels/app/imaging/utils_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/import.go b/server/channels/app/import.go index 2f094ec788..ec00dc5325 100644 --- a/server/channels/app/import.go +++ b/server/channels/app/import.go @@ -14,10 +14,10 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imports" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type ReactionImportData = imports.ReactionImportData // part of the app interface diff --git a/server/channels/app/import_functions.go b/server/channels/app/import_functions.go index f266d2e30e..1a3bd3eb91 100644 --- a/server/channels/app/import_functions.go +++ b/server/channels/app/import_functions.go @@ -17,14 +17,14 @@ import ( "github.com/mattermost/logr/v2" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imports" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/teams" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/teams" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // -- Bulk Import Functions -- diff --git a/server/channels/app/import_functions_test.go b/server/channels/app/import_functions_test.go index 89fa43b71a..95eb6ec64d 100644 --- a/server/channels/app/import_functions_test.go +++ b/server/channels/app/import_functions_test.go @@ -14,13 +14,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imports" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestImportImportScheme(t *testing.T) { diff --git a/server/channels/app/import_test.go b/server/channels/app/import_test.go index 7d972dd0bd..82ef27fe6a 100644 --- a/server/channels/app/import_test.go +++ b/server/channels/app/import_test.go @@ -16,12 +16,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imports" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func ptrStr(s string) *string { diff --git a/server/channels/app/imports/import_types.go b/server/channels/app/imports/import_types.go index 981a5dd8f8..19e2ad90fd 100644 --- a/server/channels/app/imports/import_types.go +++ b/server/channels/app/imports/import_types.go @@ -7,7 +7,7 @@ import ( "archive/zip" "encoding/json" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // Import Data Models diff --git a/server/channels/app/imports/import_validators.go b/server/channels/app/imports/import_validators.go index 4b60f252b1..d0f98b1482 100644 --- a/server/channels/app/imports/import_validators.go +++ b/server/channels/app/imports/import_validators.go @@ -10,8 +10,8 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func ValidateSchemeImportData(data *SchemeImportData) *model.AppError { diff --git a/server/channels/app/imports/import_validators_test.go b/server/channels/app/imports/import_validators_test.go index 6d57a72e97..318177e191 100644 --- a/server/channels/app/imports/import_validators_test.go +++ b/server/channels/app/imports/import_validators_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestImportValidateSchemeImportData(t *testing.T) { diff --git a/server/channels/app/integration_action.go b/server/channels/app/integration_action.go index f221beb16d..7af3c21886 100644 --- a/server/channels/app/integration_action.go +++ b/server/channels/app/integration_action.go @@ -32,12 +32,12 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) DoPostAction(c *request.Context, postID, actionId, userID, selectedOption string) (string, *model.AppError) { diff --git a/server/channels/app/integration_action_test.go b/server/channels/app/integration_action_test.go index 0651f52ad4..0f69e05ea1 100644 --- a/server/channels/app/integration_action_test.go +++ b/server/channels/app/integration_action_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // Test for MM-13598 where an invalid integration URL was causing a crash @@ -541,8 +541,8 @@ func TestSubmitInteractiveDialog(t *testing.T) { "net/http" "encoding/json" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -833,8 +833,8 @@ func TestPostActionRelativePluginURL(t *testing.T) { "net/http" "encoding/json" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -1035,7 +1035,7 @@ func TestDoPluginRequest(t *testing.T) { "reflect" "sort" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/job.go b/server/channels/app/job.go index 6d2e7c4d26..b3cc6697ce 100644 --- a/server/channels/app/job.go +++ b/server/channels/app/job.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetJob(id string) (*model.Job, *model.AppError) { diff --git a/server/channels/app/job_test.go b/server/channels/app/job_test.go index 270250836d..1dd635f505 100644 --- a/server/channels/app/job_test.go +++ b/server/channels/app/job_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetJob(t *testing.T) { diff --git a/server/channels/app/ldap.go b/server/channels/app/ldap.go index 3753f9cf7a..0735baa74b 100644 --- a/server/channels/app/ldap.go +++ b/server/channels/app/ldap.go @@ -8,9 +8,9 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // SyncLdap starts an LDAP sync job. diff --git a/server/channels/app/license.go b/server/channels/app/license.go index 4b05cf1cf1..3444f244bc 100644 --- a/server/channels/app/license.go +++ b/server/channels/app/license.go @@ -10,9 +10,9 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/license_test.go b/server/channels/app/license_test.go index 996ac5cd58..7b32ee52e6 100644 --- a/server/channels/app/license_test.go +++ b/server/channels/app/license_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestLoadLicense(t *testing.T) { diff --git a/server/channels/app/login.go b/server/channels/app/login.go index a33c31a869..27a7a0caf9 100644 --- a/server/channels/app/login.go +++ b/server/channels/app/login.go @@ -16,12 +16,12 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const cwsTokenEnv = "CWS_CLOUD_TOKEN" diff --git a/server/channels/app/login_test.go b/server/channels/app/login_test.go index 280b0df937..72e596b52b 100644 --- a/server/channels/app/login_test.go +++ b/server/channels/app/login_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCheckForClientSideCert(t *testing.T) { diff --git a/server/channels/app/main_test.go b/server/channels/app/main_test.go index 9edfcf6b62..41e35701e0 100644 --- a/server/channels/app/main_test.go +++ b/server/channels/app/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/migrations.go b/server/channels/app/migrations.go index 70e61ca9b6..a90af5a333 100644 --- a/server/channels/app/migrations.go +++ b/server/channels/app/migrations.go @@ -8,8 +8,8 @@ import ( "fmt" "reflect" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const EmojisPermissionsMigrationKey = "EmojisPermissionsMigrationComplete" diff --git a/server/channels/app/mocks/WorkTemplateExecutor.go b/server/channels/app/mocks/WorkTemplateExecutor.go index 4d2083d8dc..93fb2693c5 100644 --- a/server/channels/app/mocks/WorkTemplateExecutor.go +++ b/server/channels/app/mocks/WorkTemplateExecutor.go @@ -5,11 +5,11 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" - request "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" - worktemplates "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" + worktemplates "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" ) // WorkTemplateExecutor is an autogenerated mock type for the WorkTemplateExecutor type diff --git a/server/channels/app/notification.go b/server/channels/app/notification.go index 54545b5301..d18aeb5b0f 100644 --- a/server/channels/app/notification.go +++ b/server/channels/app/notification.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) canSendPushNotifications() bool { diff --git a/server/channels/app/notification_email.go b/server/channels/app/notification_email.go index 4856affdb0..b540ac066c 100644 --- a/server/channels/app/notification_email.go +++ b/server/channels/app/notification_email.go @@ -14,12 +14,12 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - email "github.com/mattermost/mattermost-server/v6/server/channels/app/email" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + email "github.com/mattermost/mattermost-server/server/v8/channels/app/email" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) sendNotificationEmail(c request.CTX, notification *PostNotification, user *model.User, team *model.Team, senderProfileImage []byte) error { diff --git a/server/channels/app/notification_email_test.go b/server/channels/app/notification_email_test.go index 283e96244c..c6948f0ff5 100644 --- a/server/channels/app/notification_email_test.go +++ b/server/channels/app/notification_email_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/services/timezones" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestGetDirectMessageNotificationEmailSubject(t *testing.T) { diff --git a/server/channels/app/notification_push.go b/server/channels/app/notification_push.go index 0e74dd3098..5c188322f0 100644 --- a/server/channels/app/notification_push.go +++ b/server/channels/app/notification_push.go @@ -14,11 +14,11 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type notificationType string diff --git a/server/channels/app/notification_push_test.go b/server/channels/app/notification_push_test.go index 8c42bdbbca..9d35aa2830 100644 --- a/server/channels/app/notification_push_test.go +++ b/server/channels/app/notification_push_test.go @@ -17,14 +17,14 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/config" - fmocks "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + fmocks "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestDoesNotifyPropsAllowPushNotification(t *testing.T) { diff --git a/server/channels/app/notification_test.go b/server/channels/app/notification_test.go index e9cde44fa5..0fa390dc8d 100644 --- a/server/channels/app/notification_test.go +++ b/server/channels/app/notification_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func getLicWithSkuShortName(skuShortName string) *model.License { diff --git a/server/channels/app/notify_admin.go b/server/channels/app/notify_admin.go index 87a294c55f..3437e392f2 100644 --- a/server/channels/app/notify_admin.go +++ b/server/channels/app/notify_admin.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const lastTrialNotificationTimeStamp = "LAST_TRIAL_NOTIFICATION_TIMESTAMP" diff --git a/server/channels/app/notify_admin_test.go b/server/channels/app/notify_admin_test.go index 2cd0ba719a..a521b3fa05 100644 --- a/server/channels/app/notify_admin_test.go +++ b/server/channels/app/notify_admin_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" ) const PluginIdGithub = "github" diff --git a/server/channels/app/oauth.go b/server/channels/app/oauth.go index b8f0ec4c52..6b3e937abb 100644 --- a/server/channels/app/oauth.go +++ b/server/channels/app/oauth.go @@ -18,14 +18,14 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/oauth_test.go b/server/channels/app/oauth_test.go index 2167973391..8e9d591373 100644 --- a/server/channels/app/oauth_test.go +++ b/server/channels/app/oauth_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestGetOAuthAccessTokenForImplicitFlow(t *testing.T) { diff --git a/server/channels/app/onboarding.go b/server/channels/app/onboarding.go index e50ebe33d7..2dd85749d9 100644 --- a/server/channels/app/onboarding.go +++ b/server/channels/app/onboarding.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) markAdminOnboardingComplete(c *request.Context) *model.AppError { diff --git a/server/channels/app/opengraph.go b/server/channels/app/opengraph.go index c0dd998f17..cf002e50c8 100644 --- a/server/channels/app/opengraph.go +++ b/server/channels/app/opengraph.go @@ -12,7 +12,7 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "golang.org/x/net/html/charset" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go index 48ff40a0ca..440c7a297f 100644 --- a/server/channels/app/opentracing/opentracing_layer.go +++ b/server/channels/app/opentracing/opentracing_layer.go @@ -18,25 +18,25 @@ import ( "reflect" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/services/timezones" - "github.com/mattermost/mattermost-server/v6/server/platform/services/tracing" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" + "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/server/channels/app/options.go b/server/channels/app/options.go index 04b663dd69..fc41523607 100644 --- a/server/channels/app/options.go +++ b/server/channels/app/options.go @@ -4,13 +4,13 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Option func(s *Server) error diff --git a/server/channels/app/permissions.go b/server/channels/app/permissions.go index 35aa5ba00e..374e44be37 100644 --- a/server/channels/app/permissions.go +++ b/server/channels/app/permissions.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/model" ) const permissionsExportBatchSize = 100 diff --git a/server/channels/app/permissions_migrations.go b/server/channels/app/permissions_migrations.go index b6672ff29c..0e2e3135bc 100644 --- a/server/channels/app/permissions_migrations.go +++ b/server/channels/app/permissions_migrations.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" ) type permissionTransformation struct { diff --git a/server/channels/app/permissions_migrations_test.go b/server/channels/app/permissions_migrations_test.go index 50fa179595..6f3418157c 100644 --- a/server/channels/app/permissions_migrations_test.go +++ b/server/channels/app/permissions_migrations_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestApplyPermissionsMap(t *testing.T) { diff --git a/server/channels/app/permissions_test.go b/server/channels/app/permissions_test.go index cdfef0165e..9ae52a1605 100644 --- a/server/channels/app/permissions_test.go +++ b/server/channels/app/permissions_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type testWriter struct { diff --git a/server/channels/app/platform/busy.go b/server/channels/app/platform/busy.go index 71be83b37d..7db12dc3ce 100644 --- a/server/channels/app/platform/busy.go +++ b/server/channels/app/platform/busy.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/platform/busy_test.go b/server/channels/app/platform/busy_test.go index 8c249ff95e..475b8f1408 100644 --- a/server/channels/app/platform/busy_test.go +++ b/server/channels/app/platform/busy_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestBusySet(t *testing.T) { diff --git a/server/channels/app/platform/cluster.go b/server/channels/app/platform/cluster.go index a53ed9870c..b953cd82f1 100644 --- a/server/channels/app/platform/cluster.go +++ b/server/channels/app/platform/cluster.go @@ -8,11 +8,11 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // ensure cluster service wrapper implements `product.ClusterService` diff --git a/server/channels/app/platform/cluster_discovery.go b/server/channels/app/platform/cluster_discovery.go index 5fad2bf6f8..200dfe734f 100644 --- a/server/channels/app/platform/cluster_discovery.go +++ b/server/channels/app/platform/cluster_discovery.go @@ -6,8 +6,8 @@ package platform import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/platform/cluster_discovery_test.go b/server/channels/app/platform/cluster_discovery_test.go index b52739baab..d19ab0c4ad 100644 --- a/server/channels/app/platform/cluster_discovery_test.go +++ b/server/channels/app/platform/cluster_discovery_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestClusterDiscoveryService(t *testing.T) { diff --git a/server/channels/app/platform/cluster_handlers.go b/server/channels/app/platform/cluster_handlers.go index 05b9c668a3..690d912ab0 100644 --- a/server/channels/app/platform/cluster_handlers.go +++ b/server/channels/app/platform/cluster_handlers.go @@ -9,9 +9,9 @@ import ( "fmt" "runtime/debug" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) RegisterClusterHandlers() { diff --git a/server/channels/app/platform/config.go b/server/channels/app/platform/config.go index 5c2ab0a05d..3f4f560209 100644 --- a/server/channels/app/platform/config.go +++ b/server/channels/app/platform/config.go @@ -17,12 +17,12 @@ import ( "reflect" "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // ServiceConfig is used to initialize the PlatformService. diff --git a/server/channels/app/platform/config_test.go b/server/channels/app/platform/config_test.go index b54ab03989..777396feb6 100644 --- a/server/channels/app/platform/config_test.go +++ b/server/channels/app/platform/config_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - smocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + smocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestConfigListener(t *testing.T) { diff --git a/server/channels/app/platform/enterprise.go b/server/channels/app/platform/enterprise.go index 6780f894eb..19c0da9d03 100644 --- a/server/channels/app/platform/enterprise.go +++ b/server/channels/app/platform/enterprise.go @@ -4,8 +4,8 @@ package platform import ( - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) var clusterInterface func(*PlatformService) einterfaces.ClusterInterface diff --git a/server/channels/app/platform/feature_flags.go b/server/channels/app/platform/feature_flags.go index 62e130bfbc..eedee3b95c 100644 --- a/server/channels/app/platform/feature_flags.go +++ b/server/channels/app/platform/feature_flags.go @@ -8,8 +8,8 @@ import ( "os" "time" - "github.com/mattermost/mattermost-server/v6/server/channels/app/featureflag" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/featureflag" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // SetupFeatureFlags called on startup and when the cluster leader changes. diff --git a/server/channels/app/platform/helper_test.go b/server/channels/app/platform/helper_test.go index 5049603f63..98bf1366b2 100644 --- a/server/channels/app/platform/helper_test.go +++ b/server/channels/app/platform/helper_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" ) type TestHelper struct { diff --git a/server/channels/app/platform/license.go b/server/channels/app/platform/license.go index cabe4d36d8..4531acfcc0 100644 --- a/server/channels/app/platform/license.go +++ b/server/channels/app/platform/license.go @@ -14,11 +14,11 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/platform/license_test.go b/server/channels/app/platform/license_test.go index 8f875ea91d..6682348130 100644 --- a/server/channels/app/platform/license_test.go +++ b/server/channels/app/platform/license_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestLoadLicense(t *testing.T) { diff --git a/server/channels/app/platform/link_cache.go b/server/channels/app/platform/link_cache.go index 3c44b11888..d13d30cfc7 100644 --- a/server/channels/app/platform/link_cache.go +++ b/server/channels/app/platform/link_cache.go @@ -6,7 +6,7 @@ package platform import ( "time" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" ) const LinkCacheSize = 10000 diff --git a/server/channels/app/platform/log.go b/server/channels/app/platform/log.go index f04725a04d..eee1b3096e 100644 --- a/server/channels/app/platform/log.go +++ b/server/channels/app/platform/log.go @@ -13,9 +13,9 @@ import ( "os" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) Log() mlog.LoggerIFace { diff --git a/server/channels/app/platform/main_test.go b/server/channels/app/platform/main_test.go index 5eb0ef8389..ca15d20c43 100644 --- a/server/channels/app/platform/main_test.go +++ b/server/channels/app/platform/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/platform/metrics.go b/server/channels/app/platform/metrics.go index a691a41649..9f753d269a 100644 --- a/server/channels/app/platform/metrics.go +++ b/server/channels/app/platform/metrics.go @@ -18,9 +18,9 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const TimeToWaitForConnectionsToCloseOnServerShutdown = time.Second diff --git a/server/channels/app/platform/mocks/SuiteIFace.go b/server/channels/app/platform/mocks/SuiteIFace.go index b919999f6e..8d437058d1 100644 --- a/server/channels/app/platform/mocks/SuiteIFace.go +++ b/server/channels/app/platform/mocks/SuiteIFace.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/app/platform/options.go b/server/channels/app/platform/options.go index 043f18b6ba..656a6d7932 100644 --- a/server/channels/app/platform/options.go +++ b/server/channels/app/platform/options.go @@ -8,13 +8,13 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/localcachelayer" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Option func(ps *PlatformService) error diff --git a/server/channels/app/platform/searchengine.go b/server/channels/app/platform/searchengine.go index c64f12a805..5852965ec7 100644 --- a/server/channels/app/platform/searchengine.go +++ b/server/channels/app/platform/searchengine.go @@ -4,8 +4,8 @@ package platform import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) StartSearchEngine() (string, string) { diff --git a/server/channels/app/platform/service.go b/server/channels/app/platform/service.go index cccc5ef921..5fce0dcee0 100644 --- a/server/channels/app/platform/service.go +++ b/server/channels/app/platform/service.go @@ -11,23 +11,23 @@ import ( "sync" "sync/atomic" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/featureflag" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/localcachelayer" - "github.com/mattermost/mattermost-server/v6/server/channels/store/retrylayer" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/timerlayer" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/featureflag" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store/retrylayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/timerlayer" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // PlatformService is the service for the platform related tasks. It is diff --git a/server/channels/app/platform/service_test.go b/server/channels/app/platform/service_test.go index e79d335fe6..53b045ba3a 100644 --- a/server/channels/app/platform/service_test.go +++ b/server/channels/app/platform/service_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestReadReplicaDisabledBasedOnLicense(t *testing.T) { diff --git a/server/channels/app/platform/session.go b/server/channels/app/platform/session.go index d12127db41..1b09f5c583 100644 --- a/server/channels/app/platform/session.go +++ b/server/channels/app/platform/session.go @@ -8,9 +8,9 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) ReturnSessionToPool(session *model.Session) { diff --git a/server/channels/app/platform/session_test.go b/server/channels/app/platform/session_test.go index e33c2e8e50..6682fb7771 100644 --- a/server/channels/app/platform/session_test.go +++ b/server/channels/app/platform/session_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/platform/shared_channel_notifier.go b/server/channels/app/platform/shared_channel_notifier.go index bb8aff72b3..b04c57a7a9 100644 --- a/server/channels/app/platform/shared_channel_notifier.go +++ b/server/channels/app/platform/shared_channel_notifier.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var sharedChannelEventsForSync model.StringArray = []string{ diff --git a/server/channels/app/platform/shared_channel_notifier_test.go b/server/channels/app/platform/shared_channel_notifier_test.go index a69bb8ab77..7a4ca14c89 100644 --- a/server/channels/app/platform/shared_channel_notifier_test.go +++ b/server/channels/app/platform/shared_channel_notifier_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestServerSyncSharedChannelHandler(t *testing.T) { diff --git a/server/channels/app/platform/shared_channel_service_iface.go b/server/channels/app/platform/shared_channel_service_iface.go index 7406489c0d..7e00d874a1 100644 --- a/server/channels/app/platform/shared_channel_service_iface.go +++ b/server/channels/app/platform/shared_channel_service_iface.go @@ -4,8 +4,8 @@ package platform import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" ) // SharedChannelServiceIFace is the interface to the shared channel service diff --git a/server/channels/app/platform/status.go b/server/channels/app/platform/status.go index cd5fdd800e..eba8034838 100644 --- a/server/channels/app/platform/status.go +++ b/server/channels/app/platform/status.go @@ -8,9 +8,9 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) AddStatusCacheSkipClusterSend(status *model.Status) { diff --git a/server/channels/app/platform/status_test.go b/server/channels/app/platform/status_test.go index c0dabc5c98..2f341f2f0b 100644 --- a/server/channels/app/platform/status_test.go +++ b/server/channels/app/platform/status_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSaveStatus(t *testing.T) { diff --git a/server/channels/app/platform/web_conn.go b/server/channels/app/platform/web_conn.go index ac72c98cdf..6b770b8726 100644 --- a/server/channels/app/platform/web_conn.go +++ b/server/channels/app/platform/web_conn.go @@ -20,10 +20,10 @@ import ( "github.com/gorilla/websocket" "github.com/vmihailenco/msgpack/v5" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/channels/app/platform/web_conn_test.go b/server/channels/app/platform/web_conn_test.go index 149f7d019d..d0d0b3b350 100644 --- a/server/channels/app/platform/web_conn_test.go +++ b/server/channels/app/platform/web_conn_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type hookRunner struct { diff --git a/server/channels/app/platform/web_hub.go b/server/channels/app/platform/web_hub.go index 02652adf58..341c2bf287 100644 --- a/server/channels/app/platform/web_hub.go +++ b/server/channels/app/platform/web_hub.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/platform/web_hub_test.go b/server/channels/app/platform/web_hub_test.go index 0fc45e730c..de3e007fc1 100644 --- a/server/channels/app/platform/web_hub_test.go +++ b/server/channels/app/platform/web_hub_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - platform_mocks "github.com/mattermost/mattermost-server/v6/server/channels/app/platform/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + platform_mocks "github.com/mattermost/mattermost-server/server/v8/channels/app/platform/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func dummyWebsocketHandler(t *testing.T) http.HandlerFunc { diff --git a/server/channels/app/platform/websocket_router.go b/server/channels/app/platform/websocket_router.go index 563c72a3b4..d8b0c8167a 100644 --- a/server/channels/app/platform/websocket_router.go +++ b/server/channels/app/platform/websocket_router.go @@ -6,9 +6,9 @@ package platform import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type webSocketHandler interface { diff --git a/server/channels/app/plugin.go b/server/channels/app/plugin.go index 64e9d176f9..95c4fc5cae 100644 --- a/server/channels/app/plugin.go +++ b/server/channels/app/plugin.go @@ -20,14 +20,14 @@ import ( svg "github.com/h2non/go-is-svg" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/marketplace" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/marketplace" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const prepackagedPluginsDir = "prepackaged_plugins" diff --git a/server/channels/app/plugin_api.go b/server/channels/app/plugin_api.go index 6e202efb16..71fefaa2aa 100644 --- a/server/channels/app/plugin_api.go +++ b/server/channels/app/plugin_api.go @@ -14,10 +14,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type PluginAPI struct { diff --git a/server/channels/app/plugin_api_test.go b/server/channels/app/plugin_api_test.go index 0feb32df2a..877b019439 100644 --- a/server/channels/app/plugin_api_test.go +++ b/server/channels/app/plugin_api_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func getDefaultPluginSettingsSchema() string { @@ -143,7 +143,7 @@ func TestPublicFilesPathConfiguration(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -759,7 +759,7 @@ func TestPluginAPILoadPluginConfiguration(t *testing.T) { cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson }) - testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests") + testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests") require.True(t, found, "Cannot find tests folder") fullPath := path.Join(testFolder, "manual.test_load_configuration_plugin", "main.go") @@ -794,7 +794,7 @@ func TestPluginAPILoadPluginConfigurationDefaults(t *testing.T) { cfg.PluginSettings.Plugins["testloadpluginconfig"] = pluginJson }) - testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests") + testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests") require.True(t, found, "Cannot find tests folder") fullPath := path.Join(testFolder, "manual.test_load_configuration_defaults_plugin", "main.go") @@ -830,7 +830,7 @@ func TestPluginAPIGetPlugins(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -982,7 +982,7 @@ func TestInstallPlugin(t *testing.T) { "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type configuration struct { @@ -1160,7 +1160,7 @@ func pluginAPIHookTest(t *testing.T, th *TestHelper, fileName string, id string, func TestBasicAPIPlugins(t *testing.T) { defaultSchema := getDefaultPluginSettingsSchema() - testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests") + testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests") require.True(t, found, "Cannot read find app folder") dirs, err := os.ReadDir(testFolder) require.NoError(t, err, "Cannot read test folder %v", testFolder) @@ -1498,7 +1498,7 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" "bytes" "net/http" ) @@ -1539,8 +1539,8 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" "bytes" "net/http" "io" @@ -1644,8 +1644,8 @@ func TestAPIMetrics(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -1746,7 +1746,7 @@ func TestPluginHTTPConnHijack(t *testing.T) { th := Setup(t) defer th.TearDown() - testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests") + testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests") require.True(t, found, "Cannot find tests folder") fullPath := path.Join(testFolder, "manual.test_http_hijack_plugin", "main.go") @@ -1781,7 +1781,7 @@ func TestPluginHTTPUpgradeWebSocket(t *testing.T) { th := Setup(t) defer th.TearDown() - testFolder, found := fileutils.FindDir("mattermost-server/server/channels/app/plugin_api_tests") + testFolder, found := fileutils.FindDir("channels/app/plugin_api_tests") require.True(t, found, "Cannot find tests folder") fullPath := path.Join(testFolder, "manual.test_http_upgrade_websocket_plugin", "main.go") @@ -2044,7 +2044,7 @@ func TestRegisterCollectionAndTopic(t *testing.T) { import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -2112,8 +2112,8 @@ func TestPluginUploadsAPI(t *testing.T) { "fmt" "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type TestPlugin struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go index cb2ec08b94..4d9a744d13 100644 --- a/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go @@ -6,7 +6,7 @@ package main import ( "net/http" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type Plugin struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go index 96930d7fbe..2d301d192b 100644 --- a/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type Plugin struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go index 8c17342a13..03d9b4376a 100644 --- a/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type configuration struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go index d393c07ba2..287f526240 100644 --- a/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type configuration struct { diff --git a/server/channels/app/plugin_api_tests/test_bots_plugin/main.go b/server/channels/app/plugin_api_tests/test_bots_plugin/main.go index 694c20ae89..4b1660efad 100644 --- a/server/channels/app/plugin_api_tests/test_bots_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_bots_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go b/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go index dc21bc3acf..fbe4c004b8 100644 --- a/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go @@ -6,8 +6,8 @@ package main import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type PluginUsingLogAPI struct { diff --git a/server/channels/app/plugin_api_tests/test_db_driver/main.go b/server/channels/app/plugin_api_tests/test_db_driver/main.go index d99a64166a..010a906978 100644 --- a/server/channels/app/plugin_api_tests/test_db_driver/main.go +++ b/server/channels/app/plugin_api_tests/test_db_driver/main.go @@ -7,12 +7,12 @@ import ( "database/sql" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/driver" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/driver" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go index 096aabe4c0..3a9aed3369 100644 --- a/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go @@ -7,9 +7,9 @@ import ( "fmt" "path/filepath" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go index d903985f47..04574a56c8 100644 --- a/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go index 317164bd1f..cd2c7b402c 100644 --- a/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go index 09297c8f90..b4c8857345 100644 --- a/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go index 15bbc6e46b..95aad7da56 100644 --- a/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_kv/main.go b/server/channels/app/plugin_api_tests/test_kv/main.go index 6c4338e5d6..0d9cf00fed 100644 --- a/server/channels/app/plugin_api_tests/test_kv/main.go +++ b/server/channels/app/plugin_api_tests/test_kv/main.go @@ -7,9 +7,9 @@ import ( "bytes" "fmt" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go b/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go index 7d1907f627..901be0098b 100644 --- a/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_members_plugin/main.go b/server/channels/app/plugin_api_tests/test_members_plugin/main.go index 18743f2b4f..2f34426b35 100644 --- a/server/channels/app/plugin_api_tests/test_members_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_members_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go index 345c61f38e..f37e59700a 100644 --- a/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go index ceab1b553b..fa9a252f99 100644 --- a/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go index 1ab06341c2..225af48903 100644 --- a/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go b/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go index 28248fe443..5b2d0e551e 100644 --- a/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go b/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go index 0417d78bb8..2a3fd4bf76 100644 --- a/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go b/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go index 4025fd6d72..0980ee2bfa 100644 --- a/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go @@ -10,9 +10,9 @@ import ( "image/color" "image/png" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go b/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go index 863814c30f..1ada1da272 100644 --- a/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go @@ -4,9 +4,9 @@ package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go b/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go index fdd57ec8e9..dceee1f502 100644 --- a/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_commands.go b/server/channels/app/plugin_commands.go index ffb4f00d9d..fb47b6373d 100644 --- a/server/channels/app/plugin_commands.go +++ b/server/channels/app/plugin_commands.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type PluginCommand struct { diff --git a/server/channels/app/plugin_commands_test.go b/server/channels/app/plugin_commands_test.go index 9d80070206..89516aa3b5 100644 --- a/server/channels/app/plugin_commands_test.go +++ b/server/channels/app/plugin_commands_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func TestPluginCommand(t *testing.T) { @@ -43,8 +43,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type configuration struct { @@ -124,8 +124,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type configuration struct { @@ -231,8 +231,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type configuration struct { @@ -296,8 +296,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -341,8 +341,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -392,8 +392,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type configuration struct { @@ -549,8 +549,8 @@ func TestProductCommands(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type configuration struct { diff --git a/server/channels/app/plugin_db_driver.go b/server/channels/app/plugin_db_driver.go index a29fa7467f..d13a7df35d 100644 --- a/server/channels/app/plugin_db_driver.go +++ b/server/channels/app/plugin_db_driver.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // DriverImpl implements the plugin.Driver interface on the server-side. diff --git a/server/channels/app/plugin_deadlock_test.go b/server/channels/app/plugin_deadlock_test.go index 359b9c4f41..227f72c57e 100644 --- a/server/channels/app/plugin_deadlock_test.go +++ b/server/channels/app/plugin_deadlock_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPluginDeadlock(t *testing.T) { @@ -24,8 +24,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -147,8 +147,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -218,8 +218,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_event.go b/server/channels/app/plugin_event.go index c30e2d1af5..3391a792aa 100644 --- a/server/channels/app/plugin_event.go +++ b/server/channels/app/plugin_event.go @@ -6,7 +6,7 @@ package app import ( "encoding/json" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (ch *Channels) notifyClusterPluginEvent(event model.ClusterEvent, data model.PluginEventData) { diff --git a/server/channels/app/plugin_health_check_test.go b/server/channels/app/plugin_health_check_test.go index 1c2d67f87f..73e0c31f21 100644 --- a/server/channels/app/plugin_health_check_test.go +++ b/server/channels/app/plugin_health_check_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func TestHealthCheckJob(t *testing.T) { @@ -21,8 +21,8 @@ func TestHealthCheckJob(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_hooks_test.go b/server/channels/app/plugin_hooks_test.go index f6324908b0..4cb3134fc5 100644 --- a/server/channels/app/plugin_hooks_test.go +++ b/server/channels/app/plugin_hooks_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest" ) func SetAppEnvironmentWithPlugins(t *testing.T, pluginCode []string, app *App, apiFunc func(*model.Manifest) plugin.API) (func(), []string, []error) { @@ -72,8 +72,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -153,8 +153,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -196,8 +196,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -240,8 +240,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -262,8 +262,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -308,8 +308,8 @@ func TestHookMessageHasBeenPosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -346,8 +346,8 @@ func TestHookMessageWillBeUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -394,8 +394,8 @@ func TestHookMessageHasBeenUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -442,8 +442,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -487,8 +487,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "fmt" "io" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -536,8 +536,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -593,8 +593,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { "io" "fmt" "bytes" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -661,8 +661,8 @@ func TestUserWillLogIn_Blocked(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -700,8 +700,8 @@ func TestUserWillLogInIn_Passed(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -740,8 +740,8 @@ func TestUserHasLoggedIn(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -782,8 +782,8 @@ func TestUserHasBeenCreated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -831,7 +831,7 @@ func TestErrorString(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -860,8 +860,8 @@ func TestErrorString(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -913,8 +913,8 @@ func TestHookContext(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -956,8 +956,8 @@ func TestActiveHooks(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -1042,8 +1042,8 @@ func TestHookMetrics(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -1129,8 +1129,8 @@ func TestHookReactionHasBeenAdded(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -1171,8 +1171,8 @@ func TestHookReactionHasBeenRemoved(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -1211,7 +1211,7 @@ func TestHookRunDataRetention(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -1255,7 +1255,7 @@ func TestHookOnSendDailyTelemetry(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -1298,8 +1298,8 @@ func TestHookOnCloudLimitsUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_install.go b/server/channels/app/plugin_install.go index 2d666c7d47..de40c6838a 100644 --- a/server/channels/app/plugin_install.go +++ b/server/channels/app/plugin_install.go @@ -45,11 +45,11 @@ import ( "github.com/blang/semver" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // managedPluginFileName is the file name of the flag file that marks diff --git a/server/channels/app/plugin_install_test.go b/server/channels/app/plugin_install_test.go index ecbb75e164..0b2b912ff3 100644 --- a/server/channels/app/plugin_install_test.go +++ b/server/channels/app/plugin_install_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type nilReadSeeker struct { diff --git a/server/channels/app/plugin_key_value_store.go b/server/channels/app/plugin_key_value_store.go index adf3ab4bf8..a10d3fc3fb 100644 --- a/server/channels/app/plugin_key_value_store.go +++ b/server/channels/app/plugin_key_value_store.go @@ -9,9 +9,9 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func getKeyHash(key string) string { diff --git a/server/channels/app/plugin_requests.go b/server/channels/app/plugin_requests.go index 92475f4ed3..4db8b9b425 100644 --- a/server/channels/app/plugin_requests.go +++ b/server/channels/app/plugin_requests.go @@ -13,10 +13,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func (ch *Channels) ServePluginRequest(w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/app/plugin_requests_test.go b/server/channels/app/plugin_requests_test.go index 143a23c7ef..cc869a72a2 100644 --- a/server/channels/app/plugin_requests_test.go +++ b/server/channels/app/plugin_requests_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestServePluginPublicRequest(t *testing.T) { diff --git a/server/channels/app/plugin_shutdown_test.go b/server/channels/app/plugin_shutdown_test.go index 293d882f1f..193c2b9d1c 100644 --- a/server/channels/app/plugin_shutdown_test.go +++ b/server/channels/app/plugin_shutdown_test.go @@ -24,7 +24,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -39,7 +39,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_signature.go b/server/channels/app/plugin_signature.go index b27f2fe834..ed9a126105 100644 --- a/server/channels/app/plugin_signature.go +++ b/server/channels/app/plugin_signature.go @@ -13,9 +13,9 @@ import ( "golang.org/x/crypto/openpgp" //nolint:staticcheck "golang.org/x/crypto/openpgp/armor" //nolint:staticcheck - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // GetPublicKey will return the actual public key saved in the `name` file. diff --git a/server/channels/app/plugin_signature_test.go b/server/channels/app/plugin_signature_test.go index e38af4a7ea..10db749b03 100644 --- a/server/channels/app/plugin_signature_test.go +++ b/server/channels/app/plugin_signature_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPluginPublicKeys(t *testing.T) { diff --git a/server/channels/app/plugin_statuses.go b/server/channels/app/plugin_statuses.go index 399d58e5b2..e3493199ba 100644 --- a/server/channels/app/plugin_statuses.go +++ b/server/channels/app/plugin_statuses.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // GetPluginStatus returns the status for a plugin installed on this server. diff --git a/server/channels/app/plugin_test.go b/server/channels/app/plugin_test.go index 0c8fb3e232..0df3f4d6ab 100644 --- a/server/channels/app/plugin_test.go +++ b/server/channels/app/plugin_test.go @@ -20,12 +20,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func getHashedKey(key string) string { @@ -729,8 +729,8 @@ func TestPluginPanicLogs(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -778,7 +778,7 @@ func TestPluginStatusActivateError(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/post.go b/server/channels/app/post.go index 35d6f8b6d6..d0b7304ea1 100644 --- a/server/channels/app/post.go +++ b/server/channels/app/post.go @@ -15,15 +15,15 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/channels/app/post_acknowledgements.go b/server/channels/app/post_acknowledgements.go index e170676638..259dea4f90 100644 --- a/server/channels/app/post_acknowledgements.go +++ b/server/channels/app/post_acknowledgements.go @@ -8,10 +8,10 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) SaveAcknowledgementForPost(c *request.Context, postID, userID string) (*model.PostAcknowledgement, *model.AppError) { diff --git a/server/channels/app/post_acknowledgements_test.go b/server/channels/app/post_acknowledgements_test.go index 86f95548d5..aa54200dcb 100644 --- a/server/channels/app/post_acknowledgements_test.go +++ b/server/channels/app/post_acknowledgements_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPostAcknowledgementsApp(t *testing.T) { diff --git a/server/channels/app/post_helpers.go b/server/channels/app/post_helpers.go index d57a25a2da..625cfe458b 100644 --- a/server/channels/app/post_helpers.go +++ b/server/channels/app/post_helpers.go @@ -7,7 +7,7 @@ import ( "net/http" "sort" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type filterPostOptions struct { diff --git a/server/channels/app/post_helpers_test.go b/server/channels/app/post_helpers_test.go index c8d479b352..8bcbbdcc84 100644 --- a/server/channels/app/post_helpers_test.go +++ b/server/channels/app/post_helpers_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetTimeSortedPostAccessibleBounds(t *testing.T) { diff --git a/server/channels/app/post_metadata.go b/server/channels/app/post_metadata.go index 9048f3c5d3..33b50e00ff 100644 --- a/server/channels/app/post_metadata.go +++ b/server/channels/app/post_metadata.go @@ -19,12 +19,12 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "golang.org/x/net/idna" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/imgutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type linkMetadataCache struct { diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go index 9b3e0602fa..caaa423818 100644 --- a/server/channels/app/post_metadata_test.go +++ b/server/channels/app/post_metadata_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/stretchr/testify/mock" "github.com/dyatlov/go-opengraph/opengraph" @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" ) func TestPreparePostListForClient(t *testing.T) { diff --git a/server/channels/app/post_priority.go b/server/channels/app/post_priority.go index d4efd534b8..cc0a74f490 100644 --- a/server/channels/app/post_priority.go +++ b/server/channels/app/post_priority.go @@ -7,7 +7,7 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetPriorityForPost(postId string) (*model.PostPriority, *model.AppError) { diff --git a/server/channels/app/post_test.go b/server/channels/app/post_test.go index 6d9e044573..b894136848 100644 --- a/server/channels/app/post_test.go +++ b/server/channels/app/post_test.go @@ -16,17 +16,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - eMocks "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/services/imageproxy" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + eMocks "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCreatePostDeduplicate(t *testing.T) { @@ -60,8 +60,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { @@ -109,8 +109,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" "time" ) diff --git a/server/channels/app/preference.go b/server/channels/app/preference.go index f3fc58dca2..4fdf19cb66 100644 --- a/server/channels/app/preference.go +++ b/server/channels/app/preference.go @@ -8,8 +8,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/model" ) // Ensure preferences service wrapper implements `product.PreferencesService` diff --git a/server/channels/app/product.go b/server/channels/app/product.go index f03a1c5446..4da937eefa 100644 --- a/server/channels/app/product.go +++ b/server/channels/app/product.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/mattermost/mattermost-server/v6/server/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/product" ) func (s *Server) initializeProducts( diff --git a/server/channels/app/product_notices.go b/server/channels/app/product_notices.go index 3c1c0a41de..1d4f47aa07 100644 --- a/server/channels/app/product_notices.go +++ b/server/channels/app/product_notices.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/errors" date_constraints "github.com/reflog/dateconstraints" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const MaxRepeatViewings = 3 diff --git a/server/channels/app/product_notices_test.go b/server/channels/app/product_notices_test.go index a7d657b511..50959cc902 100644 --- a/server/channels/app/product_notices_test.go +++ b/server/channels/app/product_notices_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestNoticeValidation(t *testing.T) { diff --git a/server/channels/app/product_test.go b/server/channels/app/product_test.go index 481f8bca6a..55942aea5f 100644 --- a/server/channels/app/product_test.go +++ b/server/channels/app/product_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/config" ) const ( diff --git a/server/channels/app/ratelimit.go b/server/channels/app/ratelimit.go index 55644b670a..49c34930ba 100644 --- a/server/channels/app/ratelimit.go +++ b/server/channels/app/ratelimit.go @@ -13,10 +13,10 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type RateLimiter struct { diff --git a/server/channels/app/ratelimit_test.go b/server/channels/app/ratelimit_test.go index 9e1818f6f6..d976816e45 100644 --- a/server/channels/app/ratelimit_test.go +++ b/server/channels/app/ratelimit_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func genRateLimitSettings(useAuth, useIP bool, header string) *model.RateLimitSettings { diff --git a/server/channels/app/reaction.go b/server/channels/app/reaction.go index e4c6630dc9..6242b30b4d 100644 --- a/server/channels/app/reaction.go +++ b/server/channels/app/reaction.go @@ -8,10 +8,10 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) func (a *App) SaveReactionForPost(c *request.Context, reaction *model.Reaction) (*model.Reaction, *model.AppError) { diff --git a/server/channels/app/reaction_test.go b/server/channels/app/reaction_test.go index d9990d34c1..1d75d91003 100644 --- a/server/channels/app/reaction_test.go +++ b/server/channels/app/reaction_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSharedChannelSyncForReactionActions(t *testing.T) { diff --git a/server/channels/app/remote_cluster.go b/server/channels/app/remote_cluster.go index 10ab821134..6c6c67dc93 100644 --- a/server/channels/app/remote_cluster.go +++ b/server/channels/app/remote_cluster.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) AddRemoteCluster(rc *model.RemoteCluster) (*model.RemoteCluster, *model.AppError) { diff --git a/server/channels/app/remote_cluster_service_mock.go b/server/channels/app/remote_cluster_service_mock.go index b6409d7775..69fee0fd62 100644 --- a/server/channels/app/remote_cluster_service_mock.go +++ b/server/channels/app/remote_cluster_service_mock.go @@ -6,8 +6,8 @@ package app import ( "context" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" ) // MockOptionRemoteClusterService a mock of the remote cluster service diff --git a/server/channels/app/remote_cluster_test.go b/server/channels/app/remote_cluster_test.go index fe47ecaf85..508220ac40 100644 --- a/server/channels/app/remote_cluster_test.go +++ b/server/channels/app/remote_cluster_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestAddRemoteCluster(t *testing.T) { diff --git a/server/channels/app/request/context.go b/server/channels/app/request/context.go index 96eb70accb..df3809ffe4 100644 --- a/server/channels/app/request/context.go +++ b/server/channels/app/request/context.go @@ -6,9 +6,9 @@ package request import ( "context" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Context struct { diff --git a/server/channels/app/role.go b/server/channels/app/role.go index 657efba69a..ca8a159eb7 100644 --- a/server/channels/app/role.go +++ b/server/channels/app/role.go @@ -11,9 +11,9 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetRole(id string) (*model.Role, *model.AppError) { diff --git a/server/channels/app/role_test.go b/server/channels/app/role_test.go index 835e5f0832..c9db5a8c27 100644 --- a/server/channels/app/role_test.go +++ b/server/channels/app/role_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type permissionInheritanceTestData struct { diff --git a/server/channels/app/saml.go b/server/channels/app/saml.go index 7a995651c9..09cd1b0e12 100644 --- a/server/channels/app/saml.go +++ b/server/channels/app/saml.go @@ -13,7 +13,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/scheme.go b/server/channels/app/scheme.go index d765938396..abe442195e 100644 --- a/server/channels/app/scheme.go +++ b/server/channels/app/scheme.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) { diff --git a/server/channels/app/searchengine.go b/server/channels/app/searchengine.go index 345edefb05..fb9539cb1a 100644 --- a/server/channels/app/searchengine.go +++ b/server/channels/app/searchengine.go @@ -6,8 +6,8 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError { diff --git a/server/channels/app/security_update_check.go b/server/channels/app/security_update_check.go index b2dcc37758..edd31cf48b 100644 --- a/server/channels/app/security_update_check.go +++ b/server/channels/app/security_update_check.go @@ -11,10 +11,10 @@ import ( "runtime" "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/server.go b/server/channels/app/server.go index 65c3dbf371..7b8c1d2946 100644 --- a/server/channels/app/server.go +++ b/server/channels/app/server.go @@ -27,50 +27,50 @@ import ( "github.com/rs/cors" "golang.org/x/crypto/acme/autocert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/scheduler" - "github.com/mattermost/mattermost-server/v6/server/channels/app/email" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/teams" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/active_users" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/expirynotify" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/export_delete" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/export_process" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/extract_content" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/hosted_purchase_screening" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/import_delete" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/import_process" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/last_accessible_file" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/last_accessible_post" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/migrations" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/notify_admin" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/product_notices" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs/resend_invitation_email" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/services/awsmeter" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine/indexer" - "github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel" - "github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry" - "github.com/mattermost/mattermost-server/v6/server/platform/services/timezones" - "github.com/mattermost/mattermost-server/v6/server/platform/services/tracing" - "github.com/mattermost/mattermost-server/v6/server/platform/services/upgrader" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mail" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/channels/app/email" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/teams" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/active_users" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/expirynotify" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/export_delete" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/export_process" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/extract_content" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/hosted_purchase_screening" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/import_delete" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/import_process" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/last_accessible_file" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/last_accessible_post" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/migrations" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/notify_admin" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/product_notices" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs/resend_invitation_email" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/awsmeter" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine/indexer" + "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" + "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" + "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" + "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" + "github.com/mattermost/mattermost-server/server/v8/platform/services/upgrader" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/plugin/scheduler" ) // declaring this as var to allow overriding in tests diff --git a/server/channels/app/server_test.go b/server/channels/app/server_test.go index 00d2c66f71..e9f08ba776 100644 --- a/server/channels/app/server_test.go +++ b/server/channels/app/server_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func newServerWithConfig(t *testing.T, f func(cfg *model.Config)) (*Server, error) { diff --git a/server/channels/app/session.go b/server/channels/app/session.go index b7fecbfd17..4fd1bfeffc 100644 --- a/server/channels/app/session.go +++ b/server/channels/app/session.go @@ -10,12 +10,12 @@ import ( "net/http" "os" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) CreateSession(session *model.Session) (*model.Session, *model.AppError) { diff --git a/server/channels/app/session_test.go b/server/channels/app/session_test.go index 7760bed82a..a4af3e93e4 100644 --- a/server/channels/app/session_test.go +++ b/server/channels/app/session_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetSessionIdleTimeoutInMinutes(t *testing.T) { diff --git a/server/channels/app/shared_channel.go b/server/channels/app/shared_channel.go index e6c241b1d3..82ccb7a624 100644 --- a/server/channels/app/shared_channel.go +++ b/server/channels/app/shared_channel.go @@ -8,9 +8,9 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) checkChannelNotShared(c request.CTX, channelId string) error { diff --git a/server/channels/app/shared_channel_service_iface.go b/server/channels/app/shared_channel_service_iface.go index c6b93359ce..c599b5f11d 100644 --- a/server/channels/app/shared_channel_service_iface.go +++ b/server/channels/app/shared_channel_service_iface.go @@ -5,8 +5,8 @@ package app // TODO: platform: remove this and use from platform package import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/sharedchannel" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" ) // SharedChannelServiceIFace is the interface to the shared channel service diff --git a/server/channels/app/shared_channel_test.go b/server/channels/app/shared_channel_test.go index d01269116c..44175c0f44 100644 --- a/server/channels/app/shared_channel_test.go +++ b/server/channels/app/shared_channel_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestApp_CheckCanInviteToSharedChannel(t *testing.T) { diff --git a/server/channels/app/slack.go b/server/channels/app/slack.go index 7f956137ea..76e3dc96dd 100644 --- a/server/channels/app/slack.go +++ b/server/channels/app/slack.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/slackimport" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/slackimport" ) func (a *App) SlackImport(c *request.Context, fileData multipart.File, fileSize int64, teamID string) (*model.AppError, *bytes.Buffer) { diff --git a/server/channels/app/slack_test.go b/server/channels/app/slack_test.go index e82eb097f1..21f968281e 100644 --- a/server/channels/app/slack_test.go +++ b/server/channels/app/slack_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestProcessSlackText(t *testing.T) { diff --git a/server/channels/app/slashcommands/auto_channels.go b/server/channels/app/slashcommands/auto_channels.go index a79ffd4985..073f281221 100644 --- a/server/channels/app/slashcommands/auto_channels.go +++ b/server/channels/app/slashcommands/auto_channels.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type AutoChannelCreator struct { diff --git a/server/channels/app/slashcommands/auto_constants.go b/server/channels/app/slashcommands/auto_constants.go index 1a269dab96..880e06eee6 100644 --- a/server/channels/app/slashcommands/auto_constants.go +++ b/server/channels/app/slashcommands/auto_constants.go @@ -4,8 +4,8 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/slashcommands/auto_environment.go b/server/channels/app/slashcommands/auto_environment.go index cba8fa02fe..f3e7d50957 100644 --- a/server/channels/app/slashcommands/auto_environment.go +++ b/server/channels/app/slashcommands/auto_environment.go @@ -7,10 +7,10 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type TestEnvironment struct { diff --git a/server/channels/app/slashcommands/auto_posts.go b/server/channels/app/slashcommands/auto_posts.go index 08abb4061e..e375f97403 100644 --- a/server/channels/app/slashcommands/auto_posts.go +++ b/server/channels/app/slashcommands/auto_posts.go @@ -9,11 +9,11 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type AutoPostCreator struct { diff --git a/server/channels/app/slashcommands/auto_teams.go b/server/channels/app/slashcommands/auto_teams.go index dea793cd76..30cd1ef97b 100644 --- a/server/channels/app/slashcommands/auto_teams.go +++ b/server/channels/app/slashcommands/auto_teams.go @@ -4,8 +4,8 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type TeamEnvironment struct { diff --git a/server/channels/app/slashcommands/auto_users.go b/server/channels/app/slashcommands/auto_users.go index 5e944b60cd..ed2125da79 100644 --- a/server/channels/app/slashcommands/auto_users.go +++ b/server/channels/app/slashcommands/auto_users.go @@ -7,11 +7,11 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type AutoUserCreator struct { diff --git a/server/channels/app/slashcommands/command_away.go b/server/channels/app/slashcommands/command_away.go index 6f8efaeebf..bc64e53461 100644 --- a/server/channels/app/slashcommands/command_away.go +++ b/server/channels/app/slashcommands/command_away.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type AwayProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_header.go b/server/channels/app/slashcommands/command_channel_header.go index 06f7bb0a04..5f8bad0dd5 100644 --- a/server/channels/app/slashcommands/command_channel_header.go +++ b/server/channels/app/slashcommands/command_channel_header.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type HeaderProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_header_test.go b/server/channels/app/slashcommands/command_channel_header_test.go index 1cf7d4d6a4..7f48a978b4 100644 --- a/server/channels/app/slashcommands/command_channel_header_test.go +++ b/server/channels/app/slashcommands/command_channel_header_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestHeaderProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_channel_purpose.go b/server/channels/app/slashcommands/command_channel_purpose.go index 31691d31e7..1477142ae0 100644 --- a/server/channels/app/slashcommands/command_channel_purpose.go +++ b/server/channels/app/slashcommands/command_channel_purpose.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type PurposeProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_purpose_test.go b/server/channels/app/slashcommands/command_channel_purpose_test.go index 3f6e9a71d9..5663690cac 100644 --- a/server/channels/app/slashcommands/command_channel_purpose_test.go +++ b/server/channels/app/slashcommands/command_channel_purpose_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPurposeProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_channel_rename.go b/server/channels/app/slashcommands/command_channel_rename.go index ee9a0edfe3..6cf8b1a139 100644 --- a/server/channels/app/slashcommands/command_channel_rename.go +++ b/server/channels/app/slashcommands/command_channel_rename.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type RenameProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_rename_test.go b/server/channels/app/slashcommands/command_channel_rename_test.go index ff8aabbb64..4530e6d917 100644 --- a/server/channels/app/slashcommands/command_channel_rename_test.go +++ b/server/channels/app/slashcommands/command_channel_rename_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRenameProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_code.go b/server/channels/app/slashcommands/command_code.go index 085f89b55b..bb57353e94 100644 --- a/server/channels/app/slashcommands/command_code.go +++ b/server/channels/app/slashcommands/command_code.go @@ -6,10 +6,10 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type CodeProvider struct { diff --git a/server/channels/app/slashcommands/command_code_test.go b/server/channels/app/slashcommands/command_code_test.go index e43bd6d469..cdc0bc6d68 100644 --- a/server/channels/app/slashcommands/command_code_test.go +++ b/server/channels/app/slashcommands/command_code_test.go @@ -6,7 +6,7 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCodeProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_custom_status.go b/server/channels/app/slashcommands/command_custom_status.go index 2a85e93b8c..c7a60acd2a 100644 --- a/server/channels/app/slashcommands/command_custom_status.go +++ b/server/channels/app/slashcommands/command_custom_status.go @@ -8,11 +8,11 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type CustomStatusProvider struct { diff --git a/server/channels/app/slashcommands/command_custom_status_test.go b/server/channels/app/slashcommands/command_custom_status_test.go index 560ba2e181..359b8c11c9 100644 --- a/server/channels/app/slashcommands/command_custom_status_test.go +++ b/server/channels/app/slashcommands/command_custom_status_test.go @@ -6,7 +6,7 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetCustomStatus(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_dnd.go b/server/channels/app/slashcommands/command_dnd.go index 5dca6ae9ad..f028f3eb22 100644 --- a/server/channels/app/slashcommands/command_dnd.go +++ b/server/channels/app/slashcommands/command_dnd.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type DndProvider struct { diff --git a/server/channels/app/slashcommands/command_echo.go b/server/channels/app/slashcommands/command_echo.go index f2105ab1f4..58dd39e5f5 100644 --- a/server/channels/app/slashcommands/command_echo.go +++ b/server/channels/app/slashcommands/command_echo.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var echoSem chan bool diff --git a/server/channels/app/slashcommands/command_expand_collapse.go b/server/channels/app/slashcommands/command_expand_collapse.go index f243cc76af..477a027935 100644 --- a/server/channels/app/slashcommands/command_expand_collapse.go +++ b/server/channels/app/slashcommands/command_expand_collapse.go @@ -7,10 +7,10 @@ import ( "encoding/json" "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ExpandProvider struct { diff --git a/server/channels/app/slashcommands/command_groupmsg.go b/server/channels/app/slashcommands/command_groupmsg.go index 507fd524c6..4083b2f628 100644 --- a/server/channels/app/slashcommands/command_groupmsg.go +++ b/server/channels/app/slashcommands/command_groupmsg.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type groupmsgProvider struct { diff --git a/server/channels/app/slashcommands/command_groupmsg_test.go b/server/channels/app/slashcommands/command_groupmsg_test.go index 5db0a977b3..6743a57de7 100644 --- a/server/channels/app/slashcommands/command_groupmsg_test.go +++ b/server/channels/app/slashcommands/command_groupmsg_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestGroupMsgUsernames(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_help.go b/server/channels/app/slashcommands/command_help.go index 15a53ed5f0..61b85dd7b9 100644 --- a/server/channels/app/slashcommands/command_help.go +++ b/server/channels/app/slashcommands/command_help.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type HelpProvider struct { diff --git a/server/channels/app/slashcommands/command_invite.go b/server/channels/app/slashcommands/command_invite.go index 9fcf79de19..906b9596ae 100644 --- a/server/channels/app/slashcommands/command_invite.go +++ b/server/channels/app/slashcommands/command_invite.go @@ -6,10 +6,10 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type InviteProvider struct { diff --git a/server/channels/app/slashcommands/command_invite_people.go b/server/channels/app/slashcommands/command_invite_people.go index f1e895cc7c..11040ac74f 100644 --- a/server/channels/app/slashcommands/command_invite_people.go +++ b/server/channels/app/slashcommands/command_invite_people.go @@ -6,11 +6,11 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type InvitePeopleProvider struct { diff --git a/server/channels/app/slashcommands/command_invite_people_test.go b/server/channels/app/slashcommands/command_invite_people_test.go index 8956b884b5..09112b3f57 100644 --- a/server/channels/app/slashcommands/command_invite_people_test.go +++ b/server/channels/app/slashcommands/command_invite_people_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestInvitePeopleProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_invite_test.go b/server/channels/app/slashcommands/command_invite_test.go index b2163fb4a7..b2e2532168 100644 --- a/server/channels/app/slashcommands/command_invite_test.go +++ b/server/channels/app/slashcommands/command_invite_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestInviteProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_join.go b/server/channels/app/slashcommands/command_join.go index 3f2c1f6053..9b87073e27 100644 --- a/server/channels/app/slashcommands/command_join.go +++ b/server/channels/app/slashcommands/command_join.go @@ -6,10 +6,10 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type JoinProvider struct { diff --git a/server/channels/app/slashcommands/command_join_test.go b/server/channels/app/slashcommands/command_join_test.go index c30c0b1621..850a4bcc31 100644 --- a/server/channels/app/slashcommands/command_join_test.go +++ b/server/channels/app/slashcommands/command_join_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestJoinCommandNoChannel(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_leave.go b/server/channels/app/slashcommands/command_leave.go index e1868d24ea..2711d73c2b 100644 --- a/server/channels/app/slashcommands/command_leave.go +++ b/server/channels/app/slashcommands/command_leave.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type LeaveProvider struct { diff --git a/server/channels/app/slashcommands/command_leave_test.go b/server/channels/app/slashcommands/command_leave_test.go index 1abbc9048f..e7e2d149cd 100644 --- a/server/channels/app/slashcommands/command_leave_test.go +++ b/server/channels/app/slashcommands/command_leave_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestLeaveProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_loadtest.go b/server/channels/app/slashcommands/command_loadtest.go index a0b02267b4..a3beb9bc23 100644 --- a/server/channels/app/slashcommands/command_loadtest.go +++ b/server/channels/app/slashcommands/command_loadtest.go @@ -14,12 +14,12 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var usage = `Mattermost testing commands to help configure the system diff --git a/server/channels/app/slashcommands/command_logout.go b/server/channels/app/slashcommands/command_logout.go index cda4db774f..a8df517bf9 100644 --- a/server/channels/app/slashcommands/command_logout.go +++ b/server/channels/app/slashcommands/command_logout.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type LogoutProvider struct { diff --git a/server/channels/app/slashcommands/command_marketplace.go b/server/channels/app/slashcommands/command_marketplace.go index b33e987883..5ffbd49d2b 100644 --- a/server/channels/app/slashcommands/command_marketplace.go +++ b/server/channels/app/slashcommands/command_marketplace.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type MarketplaceProvider struct { diff --git a/server/channels/app/slashcommands/command_marketplace_test.go b/server/channels/app/slashcommands/command_marketplace_test.go index e023869204..0b6fe14bdf 100644 --- a/server/channels/app/slashcommands/command_marketplace_test.go +++ b/server/channels/app/slashcommands/command_marketplace_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestMarketplaceProviderGetCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_me.go b/server/channels/app/slashcommands/command_me.go index b557ed4a8d..8415d21d2c 100644 --- a/server/channels/app/slashcommands/command_me.go +++ b/server/channels/app/slashcommands/command_me.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type MeProvider struct { diff --git a/server/channels/app/slashcommands/command_me_test.go b/server/channels/app/slashcommands/command_me_test.go index 20472e745b..467374f817 100644 --- a/server/channels/app/slashcommands/command_me_test.go +++ b/server/channels/app/slashcommands/command_me_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestMeProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_msg.go b/server/channels/app/slashcommands/command_msg.go index e336ace857..7daae35e74 100644 --- a/server/channels/app/slashcommands/command_msg.go +++ b/server/channels/app/slashcommands/command_msg.go @@ -7,12 +7,12 @@ import ( "errors" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type msgProvider struct { diff --git a/server/channels/app/slashcommands/command_msg_test.go b/server/channels/app/slashcommands/command_msg_test.go index 549f703b3f..4f8fd0d172 100644 --- a/server/channels/app/slashcommands/command_msg_test.go +++ b/server/channels/app/slashcommands/command_msg_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestMsgProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_mute.go b/server/channels/app/slashcommands/command_mute.go index de2dfd4d6a..8b83b7fa5d 100644 --- a/server/channels/app/slashcommands/command_mute.go +++ b/server/channels/app/slashcommands/command_mute.go @@ -6,10 +6,10 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type MuteProvider struct { diff --git a/server/channels/app/slashcommands/command_mute_test.go b/server/channels/app/slashcommands/command_mute_test.go index 9d62c4b6cc..5cc43352b6 100644 --- a/server/channels/app/slashcommands/command_mute_test.go +++ b/server/channels/app/slashcommands/command_mute_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestMuteCommandNoChannel(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_offline.go b/server/channels/app/slashcommands/command_offline.go index ba8a2624e4..c11729cf62 100644 --- a/server/channels/app/slashcommands/command_offline.go +++ b/server/channels/app/slashcommands/command_offline.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type OfflineProvider struct { diff --git a/server/channels/app/slashcommands/command_online.go b/server/channels/app/slashcommands/command_online.go index e17fb7fa18..df38029fd1 100644 --- a/server/channels/app/slashcommands/command_online.go +++ b/server/channels/app/slashcommands/command_online.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type OnlineProvider struct { diff --git a/server/channels/app/slashcommands/command_open.go b/server/channels/app/slashcommands/command_open.go index e9003f48a1..904a5f50ac 100644 --- a/server/channels/app/slashcommands/command_open.go +++ b/server/channels/app/slashcommands/command_open.go @@ -4,9 +4,9 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type OpenProvider struct { diff --git a/server/channels/app/slashcommands/command_remote.go b/server/channels/app/slashcommands/command_remote.go index b86cf561c5..ca50466586 100644 --- a/server/channels/app/slashcommands/command_remote.go +++ b/server/channels/app/slashcommands/command_remote.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) const ( diff --git a/server/channels/app/slashcommands/command_remove.go b/server/channels/app/slashcommands/command_remove.go index 0baf47c295..e021c976a6 100644 --- a/server/channels/app/slashcommands/command_remove.go +++ b/server/channels/app/slashcommands/command_remove.go @@ -6,11 +6,11 @@ package slashcommands import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type RemoveProvider struct { diff --git a/server/channels/app/slashcommands/command_remove_test.go b/server/channels/app/slashcommands/command_remove_test.go index 32fe1a2213..2d1c7821e6 100644 --- a/server/channels/app/slashcommands/command_remove_test.go +++ b/server/channels/app/slashcommands/command_remove_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRemoveProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_search.go b/server/channels/app/slashcommands/command_search.go index a38327ceb4..1587ae46b1 100644 --- a/server/channels/app/slashcommands/command_search.go +++ b/server/channels/app/slashcommands/command_search.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type SearchProvider struct { diff --git a/server/channels/app/slashcommands/command_settings.go b/server/channels/app/slashcommands/command_settings.go index bbc0acda94..dc19789e1f 100644 --- a/server/channels/app/slashcommands/command_settings.go +++ b/server/channels/app/slashcommands/command_settings.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type SettingsProvider struct { diff --git a/server/channels/app/slashcommands/command_share.go b/server/channels/app/slashcommands/command_share.go index 510b1dac34..0827eaf733 100644 --- a/server/channels/app/slashcommands/command_share.go +++ b/server/channels/app/slashcommands/command_share.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ShareProvider struct { diff --git a/server/channels/app/slashcommands/command_share_test.go b/server/channels/app/slashcommands/command_share_test.go index 66f9a3a548..1d4e6a8fdf 100644 --- a/server/channels/app/slashcommands/command_share_test.go +++ b/server/channels/app/slashcommands/command_share_test.go @@ -9,14 +9,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestShareProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_shortcuts.go b/server/channels/app/slashcommands/command_shortcuts.go index 7c0591992e..cad9369d16 100644 --- a/server/channels/app/slashcommands/command_shortcuts.go +++ b/server/channels/app/slashcommands/command_shortcuts.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ShortcutsProvider struct { diff --git a/server/channels/app/slashcommands/command_shrug.go b/server/channels/app/slashcommands/command_shrug.go index 5653dd6714..019ed4e6c6 100644 --- a/server/channels/app/slashcommands/command_shrug.go +++ b/server/channels/app/slashcommands/command_shrug.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ShrugProvider struct { diff --git a/server/channels/app/slashcommands/command_templates.go b/server/channels/app/slashcommands/command_templates.go index 0dca8d6631..04fa5aaba1 100644 --- a/server/channels/app/slashcommands/command_templates.go +++ b/server/channels/app/slashcommands/command_templates.go @@ -4,10 +4,10 @@ package slashcommands import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type TemplatesProvider struct { diff --git a/server/channels/app/slashcommands/command_test.go b/server/channels/app/slashcommands/command_test.go index 2de89a0feb..1ca8d861d6 100644 --- a/server/channels/app/slashcommands/command_test.go +++ b/server/channels/app/slashcommands/command_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) type InfiniteReader struct { diff --git a/server/channels/app/slashcommands/helper_test.go b/server/channels/app/slashcommands/helper_test.go index 1941b7c355..ec2f44727b 100644 --- a/server/channels/app/slashcommands/helper_test.go +++ b/server/channels/app/slashcommands/helper_test.go @@ -13,12 +13,12 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type TestHelper struct { diff --git a/server/channels/app/slashcommands/main_test.go b/server/channels/app/slashcommands/main_test.go index 6cbb4c352d..ab5797f831 100644 --- a/server/channels/app/slashcommands/main_test.go +++ b/server/channels/app/slashcommands/main_test.go @@ -6,7 +6,7 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/slashcommands/util.go b/server/channels/app/slashcommands/util.go index ee46154456..5ebd3273c2 100644 --- a/server/channels/app/slashcommands/util.go +++ b/server/channels/app/slashcommands/util.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) const ( diff --git a/server/channels/app/status.go b/server/channels/app/status.go index 828296babd..0ae8ea0a58 100644 --- a/server/channels/app/status.go +++ b/server/channels/app/status.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // GetUserStatusesByIds used by apiV4 diff --git a/server/channels/app/status_test.go b/server/channels/app/status_test.go index e4ffef4585..4b12665359 100644 --- a/server/channels/app/status_test.go +++ b/server/channels/app/status_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCustomStatus(t *testing.T) { diff --git a/server/channels/app/support_packet.go b/server/channels/app/support_packet.go index 66e88eb7ea..96d5ccff07 100644 --- a/server/channels/app/support_packet.go +++ b/server/channels/app/support_packet.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GenerateSupportPacket() []model.FileData { diff --git a/server/channels/app/support_packet_test.go b/server/channels/app/support_packet_test.go index 8158db50e8..72a206b9fd 100644 --- a/server/channels/app/support_packet_test.go +++ b/server/channels/app/support_packet_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreatePluginsFile(t *testing.T) { diff --git a/server/channels/app/syncables.go b/server/channels/app/syncables.go index 9e1024c0b6..f4ba78f235 100644 --- a/server/channels/app/syncables.go +++ b/server/channels/app/syncables.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // createDefaultChannelMemberships adds users to channels based on their group memberships and how those groups are diff --git a/server/channels/app/syncables_test.go b/server/channels/app/syncables_test.go index 0908a859a2..85dad92182 100644 --- a/server/channels/app/syncables_test.go +++ b/server/channels/app/syncables_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateDefaultMemberships(t *testing.T) { diff --git a/server/channels/app/team.go b/server/channels/app/team.go index 4a08fcd9ab..c2dd10c606 100644 --- a/server/channels/app/team.go +++ b/server/channels/app/team.go @@ -18,20 +18,20 @@ import ( "sort" "strings" - fb_model "github.com/mattermost/mattermost-server/v6/server/boards/model" + fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/email" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imaging" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/teams" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/email" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/teams" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // teamServiceWrapper provides an implementation of `product.TeamService` to be used by products. @@ -207,7 +207,7 @@ func (a *App) shouldCreateOnboardingLinkedBoard(c request.CTX, teamId string) bo func (a *App) createOnboardingLinkedBoard(c request.CTX, teamId string) (*fb_model.Board, *model.AppError) { const defaultTemplatesTeam = "0" - // see https://github.com/mattermost/mattermost-server/v6/server/boards/blob/main/server/services/store/sqlstore/board.go#L302 + // see https://github.com/mattermost/mattermost-server/server/v8/boards/blob/main/server/services/store/sqlstore/board.go#L302 // and https://github.com/mattermost/mattermost-server/pull/22201#discussion_r1099536430 const defaultTemplateTitle = "Welcome to Boards!" welcomeToBoardsTemplateId := fmt.Sprintf("%x", md5.Sum([]byte(defaultTemplateTitle))) diff --git a/server/channels/app/team_test.go b/server/channels/app/team_test.go index d29fdeda3b..14bda61c4c 100644 --- a/server/channels/app/team_test.go +++ b/server/channels/app/team_test.go @@ -18,15 +18,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/email" - emailmocks "github.com/mattermost/mattermost-server/v6/server/channels/app/email/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/app/teams" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/app/email" + emailmocks "github.com/mattermost/mattermost-server/server/v8/channels/app/email/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/app/teams" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/app/teams/helper_test.go b/server/channels/app/teams/helper_test.go index 67f78fd45b..b7265d9d61 100644 --- a/server/channels/app/teams/helper_test.go +++ b/server/channels/app/teams/helper_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" ) type TestHelper struct { diff --git a/server/channels/app/teams/main_test.go b/server/channels/app/teams/main_test.go index b17fb1528e..621c97f30d 100644 --- a/server/channels/app/teams/main_test.go +++ b/server/channels/app/teams/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/teams/service.go b/server/channels/app/teams/service.go index 76c773c06d..54336fa6b1 100644 --- a/server/channels/app/teams/service.go +++ b/server/channels/app/teams/service.go @@ -6,8 +6,8 @@ package teams import ( "errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type TeamService struct { diff --git a/server/channels/app/teams/teams.go b/server/channels/app/teams/teams.go index 71480a33e5..e5b12a3d57 100644 --- a/server/channels/app/teams/teams.go +++ b/server/channels/app/teams/teams.go @@ -6,8 +6,8 @@ package teams import ( "context" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func (ts *TeamService) CreateTeam(team *model.Team) (*model.Team, error) { diff --git a/server/channels/app/teams/teams_test.go b/server/channels/app/teams/teams_test.go index a573b729c7..04a01cf897 100644 --- a/server/channels/app/teams/teams_test.go +++ b/server/channels/app/teams/teams_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/app/teams/utils.go b/server/channels/app/teams/utils.go index 14bef9b549..a2e12a589f 100644 --- a/server/channels/app/teams/utils.go +++ b/server/channels/app/teams/utils.go @@ -6,7 +6,7 @@ package teams import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // By default the list will be (not necessarily in this order): diff --git a/server/channels/app/telemetry.go b/server/channels/app/telemetry.go index 423bbffc5b..2258d837fb 100644 --- a/server/channels/app/telemetry.go +++ b/server/channels/app/telemetry.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry" +import "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" func (s *Server) GetTelemetryService() *telemetry.TelemetryService { return s.telemetryService diff --git a/server/channels/app/terms_of_service.go b/server/channels/app/terms_of_service.go index a8f33d79d5..fca66abaa1 100644 --- a/server/channels/app/terms_of_service.go +++ b/server/channels/app/terms_of_service.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) CreateTermsOfService(text, userID string) (*model.TermsOfService, *model.AppError) { diff --git a/server/channels/app/true_up.go b/server/channels/app/true_up.go index 02aefbdde9..ab90154fd7 100644 --- a/server/channels/app/true_up.go +++ b/server/channels/app/true_up.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" ) func pluginActivated(pluginStates map[string]*model.PluginState, pluginId string) bool { diff --git a/server/channels/app/upload.go b/server/channels/app/upload.go index c534c53a7e..c8944eb27a 100644 --- a/server/channels/app/upload.go +++ b/server/channels/app/upload.go @@ -13,11 +13,11 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const minFirstPartSize = 5 * 1024 * 1024 // 5MB diff --git a/server/channels/app/upload_test.go b/server/channels/app/upload_test.go index 51a21ab7b7..7946d29b20 100644 --- a/server/channels/app/upload_test.go +++ b/server/channels/app/upload_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/imgutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateUploadSession(t *testing.T) { diff --git a/server/channels/app/usage.go b/server/channels/app/usage.go index f3b132e757..31ba2257c9 100644 --- a/server/channels/app/usage.go +++ b/server/channels/app/usage.go @@ -6,8 +6,8 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) // GetPostsUsage returns the total posts count rounded down to the most diff --git a/server/channels/app/usage_test.go b/server/channels/app/usage_test.go index 11e6b60809..9a561d9711 100644 --- a/server/channels/app/usage_test.go +++ b/server/channels/app/usage_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" ) func TestGetPostsUsage(t *testing.T) { diff --git a/server/channels/app/user.go b/server/channels/app/user.go index f0b6b7c826..9e08824168 100644 --- a/server/channels/app/user.go +++ b/server/channels/app/user.go @@ -19,17 +19,17 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app/email" - "github.com/mattermost/mattermost-server/v6/server/channels/app/imaging" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mfa" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/email" + "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/channels/app/user_terms_of_service.go b/server/channels/app/user_terms_of_service.go index a9c5152a23..73360d739d 100644 --- a/server/channels/app/user_terms_of_service.go +++ b/server/channels/app/user_terms_of_service.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GetUserTermsOfService(userID string) (*model.UserTermsOfService, *model.AppError) { diff --git a/server/channels/app/user_test.go b/server/channels/app/user_test.go index 2d52d1e19a..2cc279e62e 100644 --- a/server/channels/app/user_test.go +++ b/server/channels/app/user_test.go @@ -18,15 +18,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - oauthgitlab "github.com/mattermost/mattermost-server/v6/model/oauthproviders/gitlab" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/users" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - storemocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/users" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + oauthgitlab "github.com/mattermost/mattermost-server/server/v8/model/oauthproviders/gitlab" ) func TestCreateOAuthUser(t *testing.T) { @@ -255,8 +255,8 @@ func TestCreateUser(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MyPlugin struct { diff --git a/server/channels/app/user_viewmembers_test.go b/server/channels/app/user_viewmembers_test.go index 9a14fc652c..4d57018516 100644 --- a/server/channels/app/user_viewmembers_test.go +++ b/server/channels/app/user_viewmembers_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRestrictedViewMembers(t *testing.T) { diff --git a/server/channels/app/users/helper_test.go b/server/channels/app/users/helper_test.go index de347336a6..c979ba2d08 100644 --- a/server/channels/app/users/helper_test.go +++ b/server/channels/app/users/helper_test.go @@ -10,10 +10,10 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" ) var initBasicOnce sync.Once diff --git a/server/channels/app/users/main_test.go b/server/channels/app/users/main_test.go index a2d3b828dc..6d731849d8 100644 --- a/server/channels/app/users/main_test.go +++ b/server/channels/app/users/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/users/password.go b/server/channels/app/users/password.go index b8c004231f..81dfa30529 100644 --- a/server/channels/app/users/password.go +++ b/server/channels/app/users/password.go @@ -9,7 +9,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func CheckUserPassword(user *model.User, password string) error { diff --git a/server/channels/app/users/password_test.go b/server/channels/app/users/password_test.go index 500abb14a1..84ef4e2971 100644 --- a/server/channels/app/users/password_test.go +++ b/server/channels/app/users/password_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestComparePassword(t *testing.T) { diff --git a/server/channels/app/users/profile_picture.go b/server/channels/app/users/profile_picture.go index 0d1fba9914..68eb890e0d 100644 --- a/server/channels/app/users/profile_picture.go +++ b/server/channels/app/users/profile_picture.go @@ -19,9 +19,9 @@ import ( "github.com/golang/freetype" "github.com/golang/freetype/truetype" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" ) const ( diff --git a/server/channels/app/users/service.go b/server/channels/app/users/service.go index cefc015f38..f1db3b2a35 100644 --- a/server/channels/app/users/service.go +++ b/server/channels/app/users/service.go @@ -6,9 +6,9 @@ package users import ( "errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type UserService struct { diff --git a/server/channels/app/users/service_test.go b/server/channels/app/users/service_test.go index 389037c63f..5d5d50e231 100644 --- a/server/channels/app/users/service_test.go +++ b/server/channels/app/users/service_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestNew(t *testing.T) { diff --git a/server/channels/app/users/users.go b/server/channels/app/users/users.go index f424c88663..543be78956 100644 --- a/server/channels/app/users/users.go +++ b/server/channels/app/users/users.go @@ -8,11 +8,11 @@ import ( "encoding/base64" "fmt" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mfa" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/pkg/errors" ) diff --git a/server/channels/app/users/users_test.go b/server/channels/app/users/users_test.go index 8dfd14dc1c..d68b223122 100644 --- a/server/channels/app/users/users_test.go +++ b/server/channels/app/users/users_test.go @@ -6,7 +6,7 @@ package users import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/users/utils.go b/server/channels/app/users/utils.go index 52545432bc..f4cb7017ca 100644 --- a/server/channels/app/users/utils.go +++ b/server/channels/app/users/utils.go @@ -6,7 +6,7 @@ package users import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // CheckUserDomain checks that a user's email domain matches a list of space-delimited domains as a string. diff --git a/server/channels/app/web_conn.go b/server/channels/app/web_conn.go index 43f1255cd9..2ec1537586 100644 --- a/server/channels/app/web_conn.go +++ b/server/channels/app/web_conn.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/model" ) // PopulateWebConnConfig checks if the connection id already exists in the hub, diff --git a/server/channels/app/web_conn_test.go b/server/channels/app/web_conn_test.go index cd55ddf6a0..099caf6ca3 100644 --- a/server/channels/app/web_conn_test.go +++ b/server/channels/app/web_conn_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestWebConnShouldSendEvent(t *testing.T) { diff --git a/server/channels/app/web_hub.go b/server/channels/app/web_hub.go index d65dfb4bf4..a064562039 100644 --- a/server/channels/app/web_hub.go +++ b/server/channels/app/web_hub.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) TotalWebsocketConnections() int { diff --git a/server/channels/app/webhook.go b/server/channels/app/webhook.go index dc94fd5bce..7395086130 100644 --- a/server/channels/app/webhook.go +++ b/server/channels/app/webhook.go @@ -14,11 +14,11 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/webhook_test.go b/server/channels/app/webhook_test.go index f00c2d913f..caac38a08b 100644 --- a/server/channels/app/webhook_test.go +++ b/server/channels/app/webhook_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) func TestCreateIncomingWebhookForChannel(t *testing.T) { diff --git a/server/channels/app/webhub_fuzz.go b/server/channels/app/webhub_fuzz.go index eb88bb200f..829aeb2025 100644 --- a/server/channels/app/webhub_fuzz.go +++ b/server/channels/app/webhub_fuzz.go @@ -18,9 +18,9 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) // This is a file used to fuzz test the web_hub code. @@ -41,7 +41,7 @@ import ( // 1. go get -u github.com/dvyukov/go-fuzz/go-fuzz github.com/dvyukov/go-fuzz/go-fuzz-build // 2. mv app/helper_test.go app/helper.go // (Also reduce the number of push notification workers to 1 to debug stack traces easily.) -// 3. go-fuzz-build github.com/mattermost/mattermost-server/v6/server/channels/app +// 3. go-fuzz-build github.com/mattermost/mattermost-server/server/v8/channels/app // 4. Generate a corpus dir. It's just a directory with files containing random data // for go-fuzz to use as an initial seed. Use the generateInitialCorpus function for that. // 5. go-fuzz -bin=app-fuzz.zip -workdir=./workdir diff --git a/server/channels/app/websocket_router.go b/server/channels/app/websocket_router.go index ce15e90daa..e76223860f 100644 --- a/server/channels/app/websocket_router.go +++ b/server/channels/app/websocket_router.go @@ -6,9 +6,9 @@ package app // import ( // "net/http" -// "github.com/mattermost/mattermost-server/v6/model" -// "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" -// "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" +// "github.com/mattermost/mattermost-server/server/v8/model" +// "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" +// "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" // ) // type webSocketHandler interface { diff --git a/server/channels/app/work_template_executor.go b/server/channels/app/work_template_executor.go index a290434b37..360feb2427 100644 --- a/server/channels/app/work_template_executor.go +++ b/server/channels/app/work_template_executor.go @@ -10,16 +10,16 @@ import ( "regexp" "strings" - pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" - fb_model "github.com/mattermost/mattermost-server/v6/server/boards/model" + fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type WorkTemplateExecutor interface { diff --git a/server/channels/app/work_templates.go b/server/channels/app/work_templates.go index 43bff0dfee..c2754da849 100644 --- a/server/channels/app/work_templates.go +++ b/server/channels/app/work_templates.go @@ -6,10 +6,10 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func (a *App) GetWorkTemplateCategories(t i18n.TranslateFunc) ([]*model.WorkTemplateCategory, *model.AppError) { diff --git a/server/channels/app/work_templates_test.go b/server/channels/app/work_templates_test.go index 6d90b33665..1ca5332f3a 100644 --- a/server/channels/app/work_templates_test.go +++ b/server/channels/app/work_templates_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/channels/app/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/model" - pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) func TestGetWorkTemplateCategories(t *testing.T) { diff --git a/server/channels/app/worktemplates/generator/main.go b/server/channels/app/worktemplates/generator/main.go index bc072fc7a5..1282ae416a 100644 --- a/server/channels/app/worktemplates/generator/main.go +++ b/server/channels/app/worktemplates/generator/main.go @@ -19,7 +19,7 @@ import ( "golang.org/x/tools/imports" "gopkg.in/yaml.v3" - "github.com/mattermost/mattermost-server/v6/server/channels/app/worktemplates" + "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" ) type WorkTemplateWithMD5 struct { diff --git a/server/channels/app/worktemplates/model.go b/server/channels/app/worktemplates/model.go index 88223820d3..418df3b690 100644 --- a/server/channels/app/worktemplates/model.go +++ b/server/channels/app/worktemplates/model.go @@ -6,9 +6,9 @@ import ( "errors" "net/http" - pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type ExecutionRequest struct { diff --git a/server/channels/app/worktemplates/model_test.go b/server/channels/app/worktemplates/model_test.go index 53e737a55c..fb131ffab6 100644 --- a/server/channels/app/worktemplates/model_test.go +++ b/server/channels/app/worktemplates/model_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" - pbclient "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) func TestCanBeExecuted(t *testing.T) { diff --git a/server/channels/app/worktemplates/types.go b/server/channels/app/worktemplates/types.go index 2b4cbedbb1..a75db605aa 100644 --- a/server/channels/app/worktemplates/types.go +++ b/server/channels/app/worktemplates/types.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type WorkTemplateCategory struct { diff --git a/server/channels/audit/audit.go b/server/channels/audit/audit.go index 098032c5f7..9259051919 100644 --- a/server/channels/audit/audit.go +++ b/server/channels/audit/audit.go @@ -6,7 +6,7 @@ package audit import ( "fmt" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Audit struct { diff --git a/server/channels/audit/audit_test.go b/server/channels/audit/audit_test.go index b12a523971..ed526b3457 100644 --- a/server/channels/audit/audit_test.go +++ b/server/channels/audit/audit_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestAudit_LogRecord(t *testing.T) { diff --git a/server/channels/einterfaces/account_migration.go b/server/channels/einterfaces/account_migration.go index 901bb73cd5..54c87458cf 100644 --- a/server/channels/einterfaces/account_migration.go +++ b/server/channels/einterfaces/account_migration.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type AccountMigrationInterface interface { diff --git a/server/channels/einterfaces/cloud.go b/server/channels/einterfaces/cloud.go index fc5446cd34..231afc0d49 100644 --- a/server/channels/einterfaces/cloud.go +++ b/server/channels/einterfaces/cloud.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type CloudInterface interface { diff --git a/server/channels/einterfaces/cluster.go b/server/channels/einterfaces/cluster.go index 6ba89cd299..1bea4f521b 100644 --- a/server/channels/einterfaces/cluster.go +++ b/server/channels/einterfaces/cluster.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type ClusterMessageHandler func(msg *model.ClusterMessage) diff --git a/server/channels/einterfaces/compliance.go b/server/channels/einterfaces/compliance.go index ce607f79b6..5e895ab878 100644 --- a/server/channels/einterfaces/compliance.go +++ b/server/channels/einterfaces/compliance.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type ComplianceInterface interface { diff --git a/server/channels/einterfaces/data_retention.go b/server/channels/einterfaces/data_retention.go index 9f317bd598..e64083b9fc 100644 --- a/server/channels/einterfaces/data_retention.go +++ b/server/channels/einterfaces/data_retention.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type DataRetentionInterface interface { diff --git a/server/channels/einterfaces/jobs/cloud_interface.go b/server/channels/einterfaces/jobs/cloud_interface.go index 62619cbbd6..5f5e762c80 100644 --- a/server/channels/einterfaces/jobs/cloud_interface.go +++ b/server/channels/einterfaces/jobs/cloud_interface.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type CloudJobInterface interface { diff --git a/server/channels/einterfaces/jobs/data_retention.go b/server/channels/einterfaces/jobs/data_retention.go index c00ad5b20e..aebc121bd1 100644 --- a/server/channels/einterfaces/jobs/data_retention.go +++ b/server/channels/einterfaces/jobs/data_retention.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type DataRetentionJobInterface interface { diff --git a/server/channels/einterfaces/jobs/elasticsearch.go b/server/channels/einterfaces/jobs/elasticsearch.go index 2078895127..aed3df9ef6 100644 --- a/server/channels/einterfaces/jobs/elasticsearch.go +++ b/server/channels/einterfaces/jobs/elasticsearch.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type ElasticsearchIndexerInterface interface { diff --git a/server/channels/einterfaces/jobs/indexer_interface.go b/server/channels/einterfaces/jobs/indexer_interface.go index 09035b84e0..5fa9f1ed06 100644 --- a/server/channels/einterfaces/jobs/indexer_interface.go +++ b/server/channels/einterfaces/jobs/indexer_interface.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type IndexerJobInterface interface { diff --git a/server/channels/einterfaces/jobs/ldap_sync.go b/server/channels/einterfaces/jobs/ldap_sync.go index 01f855043e..e38824680f 100644 --- a/server/channels/einterfaces/jobs/ldap_sync.go +++ b/server/channels/einterfaces/jobs/ldap_sync.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LdapSyncInterface interface { diff --git a/server/channels/einterfaces/jobs/message_export.go b/server/channels/einterfaces/jobs/message_export.go index 5d699d73bb..bfd9bd5d9c 100644 --- a/server/channels/einterfaces/jobs/message_export.go +++ b/server/channels/einterfaces/jobs/message_export.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MessageExportJobInterface interface { diff --git a/server/channels/einterfaces/ldap.go b/server/channels/einterfaces/ldap.go index 685ebfdf61..ba04eacccd 100644 --- a/server/channels/einterfaces/ldap.go +++ b/server/channels/einterfaces/ldap.go @@ -4,8 +4,8 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LdapInterface interface { diff --git a/server/channels/einterfaces/license.go b/server/channels/einterfaces/license.go index 3a66ebe56f..864050577f 100644 --- a/server/channels/einterfaces/license.go +++ b/server/channels/einterfaces/license.go @@ -3,7 +3,7 @@ package einterfaces -import "github.com/mattermost/mattermost-server/v6/model" +import "github.com/mattermost/mattermost-server/server/v8/model" type LicenseInterface interface { CanStartTrial() (bool, error) diff --git a/server/channels/einterfaces/message_export.go b/server/channels/einterfaces/message_export.go index 27cc753a9d..d06f3f26c2 100644 --- a/server/channels/einterfaces/message_export.go +++ b/server/channels/einterfaces/message_export.go @@ -6,7 +6,7 @@ package einterfaces import ( "context" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MessageExportInterface interface { diff --git a/server/channels/einterfaces/metrics.go b/server/channels/einterfaces/metrics.go index 6c260d6ab2..06f44f7b66 100644 --- a/server/channels/einterfaces/metrics.go +++ b/server/channels/einterfaces/metrics.go @@ -6,8 +6,8 @@ package einterfaces import ( "database/sql" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type MetricsInterface interface { diff --git a/server/channels/einterfaces/mfa.go b/server/channels/einterfaces/mfa.go index e3b89cabc0..b3315970e2 100644 --- a/server/channels/einterfaces/mfa.go +++ b/server/channels/einterfaces/mfa.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MfaInterface interface { diff --git a/server/channels/einterfaces/mocks/AccountMigrationInterface.go b/server/channels/einterfaces/mocks/AccountMigrationInterface.go index d8d9209476..edaafe5e76 100644 --- a/server/channels/einterfaces/mocks/AccountMigrationInterface.go +++ b/server/channels/einterfaces/mocks/AccountMigrationInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/AppContextInterface.go b/server/channels/einterfaces/mocks/AppContextInterface.go index 6dd47b04d4..6780bc23c2 100644 --- a/server/channels/einterfaces/mocks/AppContextInterface.go +++ b/server/channels/einterfaces/mocks/AppContextInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/CloudInterface.go b/server/channels/einterfaces/mocks/CloudInterface.go index 5800844da0..03d084411e 100644 --- a/server/channels/einterfaces/mocks/CloudInterface.go +++ b/server/channels/einterfaces/mocks/CloudInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/CloudJobInterface.go b/server/channels/einterfaces/mocks/CloudJobInterface.go index 5e08488c1b..ff5c7377c8 100644 --- a/server/channels/einterfaces/mocks/CloudJobInterface.go +++ b/server/channels/einterfaces/mocks/CloudJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/ClusterInterface.go b/server/channels/einterfaces/mocks/ClusterInterface.go index e957a860d2..4e4b0134f5 100644 --- a/server/channels/einterfaces/mocks/ClusterInterface.go +++ b/server/channels/einterfaces/mocks/ClusterInterface.go @@ -5,10 +5,10 @@ package mocks import ( - einterfaces "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + einterfaces "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" ) // ClusterInterface is an autogenerated mock type for the ClusterInterface type diff --git a/server/channels/einterfaces/mocks/ClusterMessageHandler.go b/server/channels/einterfaces/mocks/ClusterMessageHandler.go index b29eb7ce1b..f280d52a0b 100644 --- a/server/channels/einterfaces/mocks/ClusterMessageHandler.go +++ b/server/channels/einterfaces/mocks/ClusterMessageHandler.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/ComplianceInterface.go b/server/channels/einterfaces/mocks/ComplianceInterface.go index ae4f1f772b..2cc9c75ccd 100644 --- a/server/channels/einterfaces/mocks/ComplianceInterface.go +++ b/server/channels/einterfaces/mocks/ComplianceInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/DataRetentionInterface.go b/server/channels/einterfaces/mocks/DataRetentionInterface.go index 5d5932b9ff..ff7f344445 100644 --- a/server/channels/einterfaces/mocks/DataRetentionInterface.go +++ b/server/channels/einterfaces/mocks/DataRetentionInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/DataRetentionJobInterface.go b/server/channels/einterfaces/mocks/DataRetentionJobInterface.go index 7e6d4769c3..b18fd3e5d1 100644 --- a/server/channels/einterfaces/mocks/DataRetentionJobInterface.go +++ b/server/channels/einterfaces/mocks/DataRetentionJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go b/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go index 3c821c7603..722d2b7ed5 100644 --- a/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go +++ b/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go b/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go index eea9855926..c68daf5c15 100644 --- a/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go +++ b/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/IndexerJobInterface.go b/server/channels/einterfaces/mocks/IndexerJobInterface.go index b040153342..639c245c3b 100644 --- a/server/channels/einterfaces/mocks/IndexerJobInterface.go +++ b/server/channels/einterfaces/mocks/IndexerJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/LdapInterface.go b/server/channels/einterfaces/mocks/LdapInterface.go index fa6173fb42..dd4d187884 100644 --- a/server/channels/einterfaces/mocks/LdapInterface.go +++ b/server/channels/einterfaces/mocks/LdapInterface.go @@ -5,8 +5,8 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" - request "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/LdapSyncInterface.go b/server/channels/einterfaces/mocks/LdapSyncInterface.go index 078cbe105f..4ded7caa1d 100644 --- a/server/channels/einterfaces/mocks/LdapSyncInterface.go +++ b/server/channels/einterfaces/mocks/LdapSyncInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/LicenseInterface.go b/server/channels/einterfaces/mocks/LicenseInterface.go index e7aa66322f..29595d46f5 100644 --- a/server/channels/einterfaces/mocks/LicenseInterface.go +++ b/server/channels/einterfaces/mocks/LicenseInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/MessageExportInterface.go b/server/channels/einterfaces/mocks/MessageExportInterface.go index 229aa48f13..770330ff89 100644 --- a/server/channels/einterfaces/mocks/MessageExportInterface.go +++ b/server/channels/einterfaces/mocks/MessageExportInterface.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" ) // MessageExportInterface is an autogenerated mock type for the MessageExportInterface type diff --git a/server/channels/einterfaces/mocks/MessageExportJobInterface.go b/server/channels/einterfaces/mocks/MessageExportJobInterface.go index 50b3763035..9bad367308 100644 --- a/server/channels/einterfaces/mocks/MessageExportJobInterface.go +++ b/server/channels/einterfaces/mocks/MessageExportJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/MetricsInterface.go b/server/channels/einterfaces/mocks/MetricsInterface.go index 6d98d3607e..0d6f799ee5 100644 --- a/server/channels/einterfaces/mocks/MetricsInterface.go +++ b/server/channels/einterfaces/mocks/MetricsInterface.go @@ -8,7 +8,7 @@ import ( logr "github.com/mattermost/logr/v2" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" sql "database/sql" ) diff --git a/server/channels/einterfaces/mocks/MfaInterface.go b/server/channels/einterfaces/mocks/MfaInterface.go index 3df6e4bb67..737da86700 100644 --- a/server/channels/einterfaces/mocks/MfaInterface.go +++ b/server/channels/einterfaces/mocks/MfaInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/NotificationInterface.go b/server/channels/einterfaces/mocks/NotificationInterface.go index 2c67239fca..06a155c285 100644 --- a/server/channels/einterfaces/mocks/NotificationInterface.go +++ b/server/channels/einterfaces/mocks/NotificationInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/OAuthProvider.go b/server/channels/einterfaces/mocks/OAuthProvider.go index 5568ebd5a3..3a8a563398 100644 --- a/server/channels/einterfaces/mocks/OAuthProvider.go +++ b/server/channels/einterfaces/mocks/OAuthProvider.go @@ -7,7 +7,7 @@ package mocks import ( io "io" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go b/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go index 8e69694e71..20853c78eb 100644 --- a/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go +++ b/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/SamlInterface.go b/server/channels/einterfaces/mocks/SamlInterface.go index f7908898c9..e7200b4ccf 100644 --- a/server/channels/einterfaces/mocks/SamlInterface.go +++ b/server/channels/einterfaces/mocks/SamlInterface.go @@ -5,8 +5,8 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" - request "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/notification.go b/server/channels/einterfaces/notification.go index 9a63d9da26..65d933d2dd 100644 --- a/server/channels/einterfaces/notification.go +++ b/server/channels/einterfaces/notification.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type NotificationInterface interface { diff --git a/server/channels/einterfaces/oauthproviders.go b/server/channels/einterfaces/oauthproviders.go index de60c9459f..a095921e5b 100644 --- a/server/channels/einterfaces/oauthproviders.go +++ b/server/channels/einterfaces/oauthproviders.go @@ -6,7 +6,7 @@ package einterfaces import ( "io" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type OAuthProvider interface { diff --git a/server/channels/einterfaces/saml.go b/server/channels/einterfaces/saml.go index 41fb2bbd2b..81fab6b17b 100644 --- a/server/channels/einterfaces/saml.go +++ b/server/channels/einterfaces/saml.go @@ -4,8 +4,8 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SamlInterface interface { diff --git a/server/channels/imports/boards_imports.go b/server/channels/imports/boards_imports.go index 6e79d935ee..ca7aa36124 100644 --- a/server/channels/imports/boards_imports.go +++ b/server/channels/imports/boards_imports.go @@ -5,5 +5,5 @@ package imports import ( // Needed to ensure the init() method in the FocalBoard product is run. - _ "github.com/mattermost/mattermost-server/v6/server/boards/product" + _ "github.com/mattermost/mattermost-server/server/v8/boards/product" ) diff --git a/server/channels/imports/playbooks_imports.go b/server/channels/imports/playbooks_imports.go index 3ffc936df8..260e41af12 100644 --- a/server/channels/imports/playbooks_imports.go +++ b/server/channels/imports/playbooks_imports.go @@ -5,5 +5,5 @@ package imports import ( // Needed to ensure the init() method in the Playbooks product is run. - _ "github.com/mattermost/mattermost-server/v6/server/playbooks/product" + _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" ) diff --git a/server/channels/jobs/active_users/scheduler.go b/server/channels/jobs/active_users/scheduler.go index bc6c55de92..e1cd95a93c 100644 --- a/server/channels/jobs/active_users/scheduler.go +++ b/server/channels/jobs/active_users/scheduler.go @@ -6,8 +6,8 @@ package active_users import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 10 * time.Minute diff --git a/server/channels/jobs/active_users/worker.go b/server/channels/jobs/active_users/worker.go index 3d5fc3e65a..c078a87ad3 100644 --- a/server/channels/jobs/active_users/worker.go +++ b/server/channels/jobs/active_users/worker.go @@ -4,10 +4,10 @@ package active_users import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/base_schedulers.go b/server/channels/jobs/base_schedulers.go index 0de90b2d2f..5b198a59af 100644 --- a/server/channels/jobs/base_schedulers.go +++ b/server/channels/jobs/base_schedulers.go @@ -8,7 +8,7 @@ import ( "math/big" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type PeriodicScheduler struct { diff --git a/server/channels/jobs/base_workers.go b/server/channels/jobs/base_workers.go index d8344b383a..92bd3041d0 100644 --- a/server/channels/jobs/base_workers.go +++ b/server/channels/jobs/base_workers.go @@ -6,8 +6,8 @@ package jobs import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SimpleWorker struct { diff --git a/server/channels/jobs/expirynotify/scheduler.go b/server/channels/jobs/expirynotify/scheduler.go index c22fb6a370..6cf302b239 100644 --- a/server/channels/jobs/expirynotify/scheduler.go +++ b/server/channels/jobs/expirynotify/scheduler.go @@ -6,8 +6,8 @@ package expirynotify import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 10 * time.Minute diff --git a/server/channels/jobs/expirynotify/worker.go b/server/channels/jobs/expirynotify/worker.go index eef266a645..67662b8de2 100644 --- a/server/channels/jobs/expirynotify/worker.go +++ b/server/channels/jobs/expirynotify/worker.go @@ -4,8 +4,8 @@ package expirynotify import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/export_delete/scheduler.go b/server/channels/jobs/export_delete/scheduler.go index 651232891e..6348b88a10 100644 --- a/server/channels/jobs/export_delete/scheduler.go +++ b/server/channels/jobs/export_delete/scheduler.go @@ -6,8 +6,8 @@ package export_delete import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/export_delete/worker.go b/server/channels/jobs/export_delete/worker.go index e1c17dc913..372e6a3221 100644 --- a/server/channels/jobs/export_delete/worker.go +++ b/server/channels/jobs/export_delete/worker.go @@ -9,10 +9,10 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ExportDelete" diff --git a/server/channels/jobs/export_process/worker.go b/server/channels/jobs/export_process/worker.go index dab103da6c..ef496a98c2 100644 --- a/server/channels/jobs/export_process/worker.go +++ b/server/channels/jobs/export_process/worker.go @@ -8,11 +8,11 @@ import ( "io" "path/filepath" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ExportProcess" diff --git a/server/channels/jobs/extract_content/worker.go b/server/channels/jobs/extract_content/worker.go index 3e777e70ee..af2b819ccb 100644 --- a/server/channels/jobs/extract_content/worker.go +++ b/server/channels/jobs/extract_content/worker.go @@ -6,10 +6,10 @@ package extract_content import ( "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ignoredFiles = map[string]bool{ diff --git a/server/channels/jobs/hosted_purchase_screening/scheduler.go b/server/channels/jobs/hosted_purchase_screening/scheduler.go index b7fd279a5d..612bc89188 100644 --- a/server/channels/jobs/hosted_purchase_screening/scheduler.go +++ b/server/channels/jobs/hosted_purchase_screening/scheduler.go @@ -6,8 +6,8 @@ package hosted_purchase_screening import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/hosted_purchase_screening/worker.go b/server/channels/jobs/hosted_purchase_screening/worker.go index 28037c3239..7a00705a2f 100644 --- a/server/channels/jobs/hosted_purchase_screening/worker.go +++ b/server/channels/jobs/hosted_purchase_screening/worker.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/import_delete/scheduler.go b/server/channels/jobs/import_delete/scheduler.go index e81e0fc311..16191741a8 100644 --- a/server/channels/jobs/import_delete/scheduler.go +++ b/server/channels/jobs/import_delete/scheduler.go @@ -6,8 +6,8 @@ package import_delete import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/import_delete/worker.go b/server/channels/jobs/import_delete/worker.go index 257ab50904..9d4eb4c0b3 100644 --- a/server/channels/jobs/import_delete/worker.go +++ b/server/channels/jobs/import_delete/worker.go @@ -10,11 +10,11 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ImportDelete" diff --git a/server/channels/jobs/import_process/worker.go b/server/channels/jobs/import_process/worker.go index 0437256f5c..e87e6792d2 100644 --- a/server/channels/jobs/import_process/worker.go +++ b/server/channels/jobs/import_process/worker.go @@ -12,12 +12,12 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ImportProcess" diff --git a/server/channels/jobs/jobs.go b/server/channels/jobs/jobs.go index a7b1c0912d..03322c9874 100644 --- a/server/channels/jobs/jobs.go +++ b/server/channels/jobs/jobs.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/jobs/jobs_test.go b/server/channels/jobs/jobs_test.go index f094fdda65..f3f05a9acf 100644 --- a/server/channels/jobs/jobs_test.go +++ b/server/channels/jobs/jobs_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func makeJobServer(t *testing.T) (*JobServer, *storetest.Store, *mocks.MetricsInterface) { diff --git a/server/channels/jobs/jobs_watcher.go b/server/channels/jobs/jobs_watcher.go index c17d870906..f28a816074 100644 --- a/server/channels/jobs/jobs_watcher.go +++ b/server/channels/jobs/jobs_watcher.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // Default polling interval for jobs termination. diff --git a/server/channels/jobs/last_accessible_file/scheduler.go b/server/channels/jobs/last_accessible_file/scheduler.go index 06a4ad8249..e31fd06983 100644 --- a/server/channels/jobs/last_accessible_file/scheduler.go +++ b/server/channels/jobs/last_accessible_file/scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const schedFreq = 2 * time.Hour diff --git a/server/channels/jobs/last_accessible_file/worker.go b/server/channels/jobs/last_accessible_file/worker.go index 8ffa41ed7f..e11ff23797 100644 --- a/server/channels/jobs/last_accessible_file/worker.go +++ b/server/channels/jobs/last_accessible_file/worker.go @@ -4,8 +4,8 @@ package last_accessible_file import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/last_accessible_post/scheduler.go b/server/channels/jobs/last_accessible_post/scheduler.go index 0927a6df9e..f9195c5755 100644 --- a/server/channels/jobs/last_accessible_post/scheduler.go +++ b/server/channels/jobs/last_accessible_post/scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const schedFreq = 30 * time.Minute diff --git a/server/channels/jobs/last_accessible_post/worker.go b/server/channels/jobs/last_accessible_post/worker.go index 0bf338b05c..0c7eb11695 100644 --- a/server/channels/jobs/last_accessible_post/worker.go +++ b/server/channels/jobs/last_accessible_post/worker.go @@ -4,8 +4,8 @@ package last_accessible_post import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/migrations/advanced_permissions_phase_2.go b/server/channels/jobs/migrations/advanced_permissions_phase_2.go index 9912679451..2fa16316ef 100644 --- a/server/channels/jobs/migrations/advanced_permissions_phase_2.go +++ b/server/channels/jobs/migrations/advanced_permissions_phase_2.go @@ -9,8 +9,8 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type AdvancedPermissionsPhase2Progress struct { diff --git a/server/channels/jobs/migrations/helper_test.go b/server/channels/jobs/migrations/helper_test.go index 90722b8e33..54f2e59ab5 100644 --- a/server/channels/jobs/migrations/helper_test.go +++ b/server/channels/jobs/migrations/helper_test.go @@ -6,8 +6,8 @@ package migrations import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func Setup(tb testing.TB) store.Store { diff --git a/server/channels/jobs/migrations/main_test.go b/server/channels/jobs/migrations/main_test.go index 3d6aabd776..abc6339e8c 100644 --- a/server/channels/jobs/migrations/main_test.go +++ b/server/channels/jobs/migrations/main_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/jobs/migrations/migrations.go b/server/channels/jobs/migrations/migrations.go index 1783fd58e7..2e38b827aa 100644 --- a/server/channels/jobs/migrations/migrations.go +++ b/server/channels/jobs/migrations/migrations.go @@ -6,8 +6,8 @@ package migrations import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/migrations/migrations_test.go b/server/channels/jobs/migrations/migrations_test.go index fee7830c0d..73e7602d4e 100644 --- a/server/channels/jobs/migrations/migrations_test.go +++ b/server/channels/jobs/migrations/migrations_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetMigrationState(t *testing.T) { diff --git a/server/channels/jobs/migrations/scheduler.go b/server/channels/jobs/migrations/scheduler.go index 52969f3f35..9607cb8381 100644 --- a/server/channels/jobs/migrations/scheduler.go +++ b/server/channels/jobs/migrations/scheduler.go @@ -6,10 +6,10 @@ package migrations import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/jobs/migrations/worker.go b/server/channels/jobs/migrations/worker.go index dcfd8ef47d..bc3d340747 100644 --- a/server/channels/jobs/migrations/worker.go +++ b/server/channels/jobs/migrations/worker.go @@ -9,10 +9,10 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/jobs/notify_admin/install_plugin_scheduler.go b/server/channels/jobs/notify_admin/install_plugin_scheduler.go index 91ebdb79c1..241697b9f9 100644 --- a/server/channels/jobs/notify_admin/install_plugin_scheduler.go +++ b/server/channels/jobs/notify_admin/install_plugin_scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const installPluginSchedFreq = 24 * time.Hour diff --git a/server/channels/jobs/notify_admin/scheduler.go b/server/channels/jobs/notify_admin/scheduler.go index c2ba31f16e..84974bd87c 100644 --- a/server/channels/jobs/notify_admin/scheduler.go +++ b/server/channels/jobs/notify_admin/scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/notify_admin/worker.go b/server/channels/jobs/notify_admin/worker.go index 283b1647dd..f6fa418204 100644 --- a/server/channels/jobs/notify_admin/worker.go +++ b/server/channels/jobs/notify_admin/worker.go @@ -4,8 +4,8 @@ package notify_admin import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/product_notices/scheduler.go b/server/channels/jobs/product_notices/scheduler.go index 4dee2b72db..a4008772b7 100644 --- a/server/channels/jobs/product_notices/scheduler.go +++ b/server/channels/jobs/product_notices/scheduler.go @@ -6,8 +6,8 @@ package product_notices import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) type Scheduler struct { diff --git a/server/channels/jobs/product_notices/worker.go b/server/channels/jobs/product_notices/worker.go index e268735790..65bee0bcc2 100644 --- a/server/channels/jobs/product_notices/worker.go +++ b/server/channels/jobs/product_notices/worker.go @@ -4,9 +4,9 @@ package product_notices import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ProductNotices" diff --git a/server/channels/jobs/resend_invitation_email/worker.go b/server/channels/jobs/resend_invitation_email/worker.go index 48a228795c..9bcdaf6473 100644 --- a/server/channels/jobs/resend_invitation_email/worker.go +++ b/server/channels/jobs/resend_invitation_email/worker.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const FourtyEightHoursInMillis int64 = 172800000 diff --git a/server/channels/jobs/schedulers.go b/server/channels/jobs/schedulers.go index 03f3a18834..73afae178f 100644 --- a/server/channels/jobs/schedulers.go +++ b/server/channels/jobs/schedulers.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Schedulers struct { diff --git a/server/channels/jobs/schedulers_test.go b/server/channels/jobs/schedulers_test.go index dc65c04f29..6bd51981ee 100644 --- a/server/channels/jobs/schedulers_test.go +++ b/server/channels/jobs/schedulers_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type MockScheduler struct { diff --git a/server/channels/jobs/server.go b/server/channels/jobs/server.go index 7ddcf1eccc..90d045a68b 100644 --- a/server/channels/jobs/server.go +++ b/server/channels/jobs/server.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" ) type JobServer struct { diff --git a/server/channels/jobs/workers.go b/server/channels/jobs/workers.go index ac77e5e82a..d09b783d5a 100644 --- a/server/channels/jobs/workers.go +++ b/server/channels/jobs/workers.go @@ -6,9 +6,9 @@ package jobs import ( "errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Workers struct { diff --git a/server/channels/manualtesting/manual_testing.go b/server/channels/manualtesting/manual_testing.go index b17114cf73..7e07d26bd2 100644 --- a/server/channels/manualtesting/manual_testing.go +++ b/server/channels/manualtesting/manual_testing.go @@ -12,14 +12,14 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/api4" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/slashcommands" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/web" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // TestEnvironment is a helper struct used for tests in manualtesting. diff --git a/server/channels/manualtesting/test_autolink.go b/server/channels/manualtesting/test_autolink.go index 777c9b66dd..844b70858e 100644 --- a/server/channels/manualtesting/test_autolink.go +++ b/server/channels/manualtesting/test_autolink.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const linkPostText = ` diff --git a/server/channels/product/README.md b/server/channels/product/README.md index 494631f6c5..1134e7da7e 100644 --- a/server/channels/product/README.md +++ b/server/channels/product/README.md @@ -17,7 +17,7 @@ type Product interface { } ``` -The `app.Server` will take care of starting and stopping products. The product shall register itself via a function called `RegisterProduct` provided by `github.com/mattermost/mattermost-server/v6/server/app` package. To register a product, +The `app.Server` will take care of starting and stopping products. The product shall register itself via a function called `RegisterProduct` provided by `github.com/mattermost/mattermost-server/server/v8/channels/app` package. To register a product, a product initializer is required. The signature of a product initializer is defined as following: ```Go diff --git a/server/channels/product/api.go b/server/channels/product/api.go index 663bab9487..73cff0a451 100644 --- a/server/channels/product/api.go +++ b/server/channels/product/api.go @@ -8,12 +8,12 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - fb_model "github.com/mattermost/mattermost-server/v6/server/boards/model" + fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model" ) // RouterService enables registering the product router to the server. After registering the diff --git a/server/channels/product/hooks.go b/server/channels/product/hooks.go index f5b5c30701..aa06b5e92f 100644 --- a/server/channels/product/hooks.go +++ b/server/channels/product/hooks.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type HooksManager struct { diff --git a/server/channels/store/layer_generators/opentracing_layer.go.tmpl b/server/channels/store/layer_generators/opentracing_layer.go.tmpl index af3af10ce7..0215c6489f 100644 --- a/server/channels/store/layer_generators/opentracing_layer.go.tmpl +++ b/server/channels/store/layer_generators/opentracing_layer.go.tmpl @@ -10,9 +10,9 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/tracing" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" + "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/server/channels/store/layer_generators/retry_layer.go.tmpl b/server/channels/store/layer_generators/retry_layer.go.tmpl index 327831895a..4f192b2b7f 100644 --- a/server/channels/store/layer_generators/retry_layer.go.tmpl +++ b/server/channels/store/layer_generators/retry_layer.go.tmpl @@ -12,8 +12,8 @@ import ( "time" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/pkg/errors" "github.com/go-sql-driver/mysql" ) diff --git a/server/channels/store/layer_generators/timer_layer.go.tmpl b/server/channels/store/layer_generators/timer_layer.go.tmpl index 6942e68fce..6549449af4 100644 --- a/server/channels/store/layer_generators/timer_layer.go.tmpl +++ b/server/channels/store/layer_generators/timer_layer.go.tmpl @@ -10,9 +10,9 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/channels/store" ) type {{.Name}} struct { diff --git a/server/channels/store/localcachelayer/channel_layer.go b/server/channels/store/localcachelayer/channel_layer.go index 3d26edaaaa..0dec2eb1bc 100644 --- a/server/channels/store/localcachelayer/channel_layer.go +++ b/server/channels/store/localcachelayer/channel_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheChannelStore struct { diff --git a/server/channels/store/localcachelayer/channel_layer_test.go b/server/channels/store/localcachelayer/channel_layer_test.go index ccbb1e4a8b..618db4cb92 100644 --- a/server/channels/store/localcachelayer/channel_layer_test.go +++ b/server/channels/store/localcachelayer/channel_layer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestChannelStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/emoji_layer.go b/server/channels/store/localcachelayer/emoji_layer.go index c552f42903..35cce34576 100644 --- a/server/channels/store/localcachelayer/emoji_layer.go +++ b/server/channels/store/localcachelayer/emoji_layer.go @@ -8,9 +8,9 @@ import ( "context" "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheEmojiStore struct { diff --git a/server/channels/store/localcachelayer/emoji_layer_test.go b/server/channels/store/localcachelayer/emoji_layer_test.go index 237f0ee213..8882c26ef5 100644 --- a/server/channels/store/localcachelayer/emoji_layer_test.go +++ b/server/channels/store/localcachelayer/emoji_layer_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestEmojiStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/file_info_layer.go b/server/channels/store/localcachelayer/file_info_layer.go index e09d0dd9b6..45017b45f4 100644 --- a/server/channels/store/localcachelayer/file_info_layer.go +++ b/server/channels/store/localcachelayer/file_info_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheFileInfoStore struct { diff --git a/server/channels/store/localcachelayer/file_info_layer_test.go b/server/channels/store/localcachelayer/file_info_layer_test.go index fffeecd850..313a2dbfea 100644 --- a/server/channels/store/localcachelayer/file_info_layer_test.go +++ b/server/channels/store/localcachelayer/file_info_layer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestFileInfoStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/layer.go b/server/channels/store/localcachelayer/layer.go index d534b5df09..66130657a0 100644 --- a/server/channels/store/localcachelayer/layer.go +++ b/server/channels/store/localcachelayer/layer.go @@ -7,10 +7,10 @@ import ( "runtime" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" ) const ( diff --git a/server/channels/store/localcachelayer/layer_test.go b/server/channels/store/localcachelayer/layer_test.go index b4ca7c1e52..4a94793ae1 100644 --- a/server/channels/store/localcachelayer/layer_test.go +++ b/server/channels/store/localcachelayer/layer_test.go @@ -8,10 +8,10 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" ) type storeType struct { diff --git a/server/channels/store/localcachelayer/main_test.go b/server/channels/store/localcachelayer/main_test.go index 649990cb69..c76f6e9cbc 100644 --- a/server/channels/store/localcachelayer/main_test.go +++ b/server/channels/store/localcachelayer/main_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" - cachemocks "github.com/mattermost/mattermost-server/v6/server/platform/services/cache/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + cachemocks "github.com/mattermost/mattermost-server/server/v8/platform/services/cache/mocks" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/store/localcachelayer/post_layer.go b/server/channels/store/localcachelayer/post_layer.go index 56de5cd5c9..80e0995a7f 100644 --- a/server/channels/store/localcachelayer/post_layer.go +++ b/server/channels/store/localcachelayer/post_layer.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCachePostStore struct { diff --git a/server/channels/store/localcachelayer/post_layer_test.go b/server/channels/store/localcachelayer/post_layer_test.go index 6a1cce2e30..9d2f1c6aec 100644 --- a/server/channels/store/localcachelayer/post_layer_test.go +++ b/server/channels/store/localcachelayer/post_layer_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPostStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/reaction_layer.go b/server/channels/store/localcachelayer/reaction_layer.go index 9ef3d6142a..5dc191c2e2 100644 --- a/server/channels/store/localcachelayer/reaction_layer.go +++ b/server/channels/store/localcachelayer/reaction_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheReactionStore struct { diff --git a/server/channels/store/localcachelayer/reaction_layer_test.go b/server/channels/store/localcachelayer/reaction_layer_test.go index 377eb1a138..523bbd7d26 100644 --- a/server/channels/store/localcachelayer/reaction_layer_test.go +++ b/server/channels/store/localcachelayer/reaction_layer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestReactionStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/role_layer.go b/server/channels/store/localcachelayer/role_layer.go index 145465d84d..24525386fc 100644 --- a/server/channels/store/localcachelayer/role_layer.go +++ b/server/channels/store/localcachelayer/role_layer.go @@ -9,8 +9,8 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheRoleStore struct { diff --git a/server/channels/store/localcachelayer/role_layer_test.go b/server/channels/store/localcachelayer/role_layer_test.go index 1a421ed0c4..9e709634d9 100644 --- a/server/channels/store/localcachelayer/role_layer_test.go +++ b/server/channels/store/localcachelayer/role_layer_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRoleStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/scheme_layer.go b/server/channels/store/localcachelayer/scheme_layer.go index b80837d6a4..1d32cfb5b3 100644 --- a/server/channels/store/localcachelayer/scheme_layer.go +++ b/server/channels/store/localcachelayer/scheme_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheSchemeStore struct { diff --git a/server/channels/store/localcachelayer/scheme_layer_test.go b/server/channels/store/localcachelayer/scheme_layer_test.go index 165ed4a765..414708a558 100644 --- a/server/channels/store/localcachelayer/scheme_layer_test.go +++ b/server/channels/store/localcachelayer/scheme_layer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSchemeStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/team_layer.go b/server/channels/store/localcachelayer/team_layer.go index 16712a24c4..88ddfb974a 100644 --- a/server/channels/store/localcachelayer/team_layer.go +++ b/server/channels/store/localcachelayer/team_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheTeamStore struct { diff --git a/server/channels/store/localcachelayer/team_layer_test.go b/server/channels/store/localcachelayer/team_layer_test.go index 8be69f494e..2a32f2fdd6 100644 --- a/server/channels/store/localcachelayer/team_layer_test.go +++ b/server/channels/store/localcachelayer/team_layer_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" ) func TestTeamStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/terms_of_service_layer.go b/server/channels/store/localcachelayer/terms_of_service_layer.go index bba94f3d57..4589103795 100644 --- a/server/channels/store/localcachelayer/terms_of_service_layer.go +++ b/server/channels/store/localcachelayer/terms_of_service_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/localcachelayer/terms_of_service_layer_test.go b/server/channels/store/localcachelayer/terms_of_service_layer_test.go index 13c4575954..8a454f1385 100644 --- a/server/channels/store/localcachelayer/terms_of_service_layer_test.go +++ b/server/channels/store/localcachelayer/terms_of_service_layer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/user_layer.go b/server/channels/store/localcachelayer/user_layer.go index df1d7d6dbc..a0170f1ec0 100644 --- a/server/channels/store/localcachelayer/user_layer.go +++ b/server/channels/store/localcachelayer/user_layer.go @@ -9,9 +9,9 @@ import ( "sort" "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheUserStore struct { diff --git a/server/channels/store/localcachelayer/user_layer_test.go b/server/channels/store/localcachelayer/user_layer_test.go index 3f50534662..f25fb84178 100644 --- a/server/channels/store/localcachelayer/user_layer_test.go +++ b/server/channels/store/localcachelayer/user_layer_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestUserStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/webhook_layer.go b/server/channels/store/localcachelayer/webhook_layer.go index 7b53dd71a8..19c4617348 100644 --- a/server/channels/store/localcachelayer/webhook_layer.go +++ b/server/channels/store/localcachelayer/webhook_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheWebhookStore struct { diff --git a/server/channels/store/localcachelayer/webhook_layer_test.go b/server/channels/store/localcachelayer/webhook_layer_test.go index a09cc4cb85..b5a3ec4aca 100644 --- a/server/channels/store/localcachelayer/webhook_layer_test.go +++ b/server/channels/store/localcachelayer/webhook_layer_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestWebhookStore(t *testing.T) { diff --git a/server/channels/store/opentracinglayer/opentracinglayer.go b/server/channels/store/opentracinglayer/opentracinglayer.go index 5a193bcb76..941704a2f4 100644 --- a/server/channels/store/opentracinglayer/opentracinglayer.go +++ b/server/channels/store/opentracinglayer/opentracinglayer.go @@ -10,9 +10,9 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/tracing" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/server/channels/store/retrylayer/retrylayer.go b/server/channels/store/retrylayer/retrylayer.go index f7ec2bfd27..91a3209c44 100644 --- a/server/channels/store/retrylayer/retrylayer.go +++ b/server/channels/store/retrylayer/retrylayer.go @@ -13,8 +13,8 @@ import ( "github.com/go-sql-driver/mysql" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" ) diff --git a/server/channels/store/retrylayer/retrylayer_test.go b/server/channels/store/retrylayer/retrylayer_test.go index c052b48090..511cd70a02 100644 --- a/server/channels/store/retrylayer/retrylayer_test.go +++ b/server/channels/store/retrylayer/retrylayer_test.go @@ -10,8 +10,8 @@ import ( "github.com/lib/pq" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) func genStore() *mocks.Store { diff --git a/server/channels/store/searchlayer/channel_layer.go b/server/channels/store/searchlayer/channel_layer.go index 1cd3eede1a..01022bf9d7 100644 --- a/server/channels/store/searchlayer/channel_layer.go +++ b/server/channels/store/searchlayer/channel_layer.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchChannelStore struct { diff --git a/server/channels/store/searchlayer/file_info_layer.go b/server/channels/store/searchlayer/file_info_layer.go index 85253841aa..81d25cc1c4 100644 --- a/server/channels/store/searchlayer/file_info_layer.go +++ b/server/channels/store/searchlayer/file_info_layer.go @@ -4,10 +4,10 @@ package searchlayer import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchFileInfoStore struct { diff --git a/server/channels/store/searchlayer/layer.go b/server/channels/store/searchlayer/layer.go index e2f68f3df0..a71cd011ac 100644 --- a/server/channels/store/searchlayer/layer.go +++ b/server/channels/store/searchlayer/layer.go @@ -7,10 +7,10 @@ import ( "context" "sync/atomic" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchStore struct { diff --git a/server/channels/store/searchlayer/layer_test.go b/server/channels/store/searchlayer/layer_test.go index 3d5948c9c2..b3e7f5a86b 100644 --- a/server/channels/store/searchlayer/layer_test.go +++ b/server/channels/store/searchlayer/layer_test.go @@ -8,12 +8,12 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) // Test to verify race condition on UpdateConfig. The test must run with -race flag in order to verify diff --git a/server/channels/store/searchlayer/post_layer.go b/server/channels/store/searchlayer/post_layer.go index 451e990b2f..a7ad58da30 100644 --- a/server/channels/store/searchlayer/post_layer.go +++ b/server/channels/store/searchlayer/post_layer.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchPostStore struct { diff --git a/server/channels/store/searchlayer/team_layer.go b/server/channels/store/searchlayer/team_layer.go index e80099752f..ed6e8bd124 100644 --- a/server/channels/store/searchlayer/team_layer.go +++ b/server/channels/store/searchlayer/team_layer.go @@ -4,8 +4,8 @@ package searchlayer import ( - model "github.com/mattermost/mattermost-server/v6/model" - store "github.com/mattermost/mattermost-server/v6/server/channels/store" + store "github.com/mattermost/mattermost-server/server/v8/channels/store" + model "github.com/mattermost/mattermost-server/server/v8/model" ) type SearchTeamStore struct { diff --git a/server/channels/store/searchlayer/user_layer.go b/server/channels/store/searchlayer/user_layer.go index fff37e0262..6de44b4213 100644 --- a/server/channels/store/searchlayer/user_layer.go +++ b/server/channels/store/searchlayer/user_layer.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchUserStore struct { diff --git a/server/channels/store/searchtest/channel_layer.go b/server/channels/store/searchtest/channel_layer.go index e5f192412c..f27c2ec2e6 100644 --- a/server/channels/store/searchtest/channel_layer.go +++ b/server/channels/store/searchtest/channel_layer.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) var searchChannelStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/file_info_layer.go b/server/channels/store/searchtest/file_info_layer.go index ff68961da2..09cab23b48 100644 --- a/server/channels/store/searchtest/file_info_layer.go +++ b/server/channels/store/searchtest/file_info_layer.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) var searchFileInfoStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/helper.go b/server/channels/store/searchtest/helper.go index c43aaf8cfa..ff7cec449c 100644 --- a/server/channels/store/searchtest/helper.go +++ b/server/channels/store/searchtest/helper.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SearchTestHelper struct { diff --git a/server/channels/store/searchtest/post_layer.go b/server/channels/store/searchtest/post_layer.go index f152d1e751..8201666dc8 100644 --- a/server/channels/store/searchtest/post_layer.go +++ b/server/channels/store/searchtest/post_layer.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) var searchPostStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/testlib.go b/server/channels/store/searchtest/testlib.go index 0678aa2f35..470caa3113 100644 --- a/server/channels/store/searchtest/testlib.go +++ b/server/channels/store/searchtest/testlib.go @@ -6,8 +6,8 @@ package searchtest import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" ) const ( diff --git a/server/channels/store/searchtest/user_layer.go b/server/channels/store/searchtest/user_layer.go index bb2684b011..7247a9200b 100644 --- a/server/channels/store/searchtest/user_layer.go +++ b/server/channels/store/searchtest/user_layer.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) var searchUserStoreTests = []searchTest{ diff --git a/server/channels/store/sqlstore/adapters.go b/server/channels/store/sqlstore/adapters.go index bc05b93fd9..de7d55c787 100644 --- a/server/channels/store/sqlstore/adapters.go +++ b/server/channels/store/sqlstore/adapters.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type jsonArray []string diff --git a/server/channels/store/sqlstore/audit_store.go b/server/channels/store/sqlstore/audit_store.go index 2af2fcf0d0..9e39499646 100644 --- a/server/channels/store/sqlstore/audit_store.go +++ b/server/channels/store/sqlstore/audit_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlAuditStore struct { diff --git a/server/channels/store/sqlstore/audit_store_test.go b/server/channels/store/sqlstore/audit_store_test.go index 19a9cf32bd..4205165717 100644 --- a/server/channels/store/sqlstore/audit_store_test.go +++ b/server/channels/store/sqlstore/audit_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestAuditStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/bot_store.go b/server/channels/store/sqlstore/bot_store.go index 5939f5a5f6..8066d90d27 100644 --- a/server/channels/store/sqlstore/bot_store.go +++ b/server/channels/store/sqlstore/bot_store.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) // bot is a subset of the model.Bot type, omitting the model.User fields. diff --git a/server/channels/store/sqlstore/bot_store_test.go b/server/channels/store/sqlstore/bot_store_test.go index bdc29504e7..725fc814f6 100644 --- a/server/channels/store/sqlstore/bot_store_test.go +++ b/server/channels/store/sqlstore/bot_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestBotStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/channel_member_history_store.go b/server/channels/store/sqlstore/channel_member_history_store.go index 30a56352d3..23e3b7ca26 100644 --- a/server/channels/store/sqlstore/channel_member_history_store.go +++ b/server/channels/store/sqlstore/channel_member_history_store.go @@ -10,9 +10,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlChannelMemberHistoryStore struct { diff --git a/server/channels/store/sqlstore/channel_member_history_store_test.go b/server/channels/store/sqlstore/channel_member_history_store_test.go index 325d22bfa0..645faf5f91 100644 --- a/server/channels/store/sqlstore/channel_member_history_store_test.go +++ b/server/channels/store/sqlstore/channel_member_history_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestChannelMemberHistoryStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/channel_store.go b/server/channels/store/sqlstore/channel_store.go index 76bd520457..2f8e91b9dc 100644 --- a/server/channels/store/sqlstore/channel_store.go +++ b/server/channels/store/sqlstore/channel_store.go @@ -15,11 +15,11 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/store/sqlstore/channel_store_categories.go b/server/channels/store/sqlstore/channel_store_categories.go index 528bf26469..3f2f726a0f 100644 --- a/server/channels/store/sqlstore/channel_store_categories.go +++ b/server/channels/store/sqlstore/channel_store_categories.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) // dbSelecter is an interface used to enable some internal store methods diff --git a/server/channels/store/sqlstore/channel_store_categories_test.go b/server/channels/store/sqlstore/channel_store_categories_test.go index 180104f1fd..5de3b55953 100644 --- a/server/channels/store/sqlstore/channel_store_categories_test.go +++ b/server/channels/store/sqlstore/channel_store_categories_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestChannelStoreCategories(t *testing.T) { diff --git a/server/channels/store/sqlstore/channel_store_test.go b/server/channels/store/sqlstore/channel_store_test.go index f68e1573ba..d692b636ad 100644 --- a/server/channels/store/sqlstore/channel_store_test.go +++ b/server/channels/store/sqlstore/channel_store_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestChannelStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/cluster_discovery_store.go b/server/channels/store/sqlstore/cluster_discovery_store.go index 1d996bda94..ade94f3da2 100644 --- a/server/channels/store/sqlstore/cluster_discovery_store.go +++ b/server/channels/store/sqlstore/cluster_discovery_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type sqlClusterDiscoveryStore struct { diff --git a/server/channels/store/sqlstore/cluster_discovery_store_test.go b/server/channels/store/sqlstore/cluster_discovery_store_test.go index 8bad17d86d..b17cc39ba6 100644 --- a/server/channels/store/sqlstore/cluster_discovery_store_test.go +++ b/server/channels/store/sqlstore/cluster_discovery_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestClusterDiscoveryStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/command_store.go b/server/channels/store/sqlstore/command_store.go index 6f086b346b..aa77b6fece 100644 --- a/server/channels/store/sqlstore/command_store.go +++ b/server/channels/store/sqlstore/command_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlCommandStore struct { diff --git a/server/channels/store/sqlstore/command_store_test.go b/server/channels/store/sqlstore/command_store_test.go index 095f0b1742..7d73561193 100644 --- a/server/channels/store/sqlstore/command_store_test.go +++ b/server/channels/store/sqlstore/command_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestCommandStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/command_webhook_store.go b/server/channels/store/sqlstore/command_webhook_store.go index c003390eb6..fd58b8ccf5 100644 --- a/server/channels/store/sqlstore/command_webhook_store.go +++ b/server/channels/store/sqlstore/command_webhook_store.go @@ -9,9 +9,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlCommandWebhookStore struct { diff --git a/server/channels/store/sqlstore/command_webhook_store_test.go b/server/channels/store/sqlstore/command_webhook_store_test.go index dc4d4320fc..9e36d26e59 100644 --- a/server/channels/store/sqlstore/command_webhook_store_test.go +++ b/server/channels/store/sqlstore/command_webhook_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestCommandWebhookStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/compliance_store.go b/server/channels/store/sqlstore/compliance_store.go index 31d0631f11..f9a997296c 100644 --- a/server/channels/store/sqlstore/compliance_store.go +++ b/server/channels/store/sqlstore/compliance_store.go @@ -12,8 +12,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlComplianceStore struct { diff --git a/server/channels/store/sqlstore/compliance_store_test.go b/server/channels/store/sqlstore/compliance_store_test.go index b042eb42cb..9e6df0304e 100644 --- a/server/channels/store/sqlstore/compliance_store_test.go +++ b/server/channels/store/sqlstore/compliance_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestComplianceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/draft_store.go b/server/channels/store/sqlstore/draft_store.go index 7d4137a8e5..2e9c86ebfd 100644 --- a/server/channels/store/sqlstore/draft_store.go +++ b/server/channels/store/sqlstore/draft_store.go @@ -10,10 +10,10 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlDraftStore struct { diff --git a/server/channels/store/sqlstore/draft_store_test.go b/server/channels/store/sqlstore/draft_store_test.go index ade2221720..f767026621 100644 --- a/server/channels/store/sqlstore/draft_store_test.go +++ b/server/channels/store/sqlstore/draft_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestDraftStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/emoji_store.go b/server/channels/store/sqlstore/emoji_store.go index 6099fb78fb..7586ee8edc 100644 --- a/server/channels/store/sqlstore/emoji_store.go +++ b/server/channels/store/sqlstore/emoji_store.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlEmojiStore struct { diff --git a/server/channels/store/sqlstore/emoji_store_test.go b/server/channels/store/sqlstore/emoji_store_test.go index 029bb82be0..a0e5ec46dc 100644 --- a/server/channels/store/sqlstore/emoji_store_test.go +++ b/server/channels/store/sqlstore/emoji_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestEmojiStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/file_info_store.go b/server/channels/store/sqlstore/file_info_store.go index b54efbe66e..0e804605c9 100644 --- a/server/channels/store/sqlstore/file_info_store.go +++ b/server/channels/store/sqlstore/file_info_store.go @@ -14,10 +14,10 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type fileInfoWithChannelID struct { diff --git a/server/channels/store/sqlstore/file_info_store_test.go b/server/channels/store/sqlstore/file_info_store_test.go index 70cfd9b12a..53f67be47c 100644 --- a/server/channels/store/sqlstore/file_info_store_test.go +++ b/server/channels/store/sqlstore/file_info_store_test.go @@ -6,8 +6,8 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestFileInfoStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/group_store.go b/server/channels/store/sqlstore/group_store.go index d487b72c45..09f4bb464f 100644 --- a/server/channels/store/sqlstore/group_store.go +++ b/server/channels/store/sqlstore/group_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type selectType int diff --git a/server/channels/store/sqlstore/group_store_test.go b/server/channels/store/sqlstore/group_store_test.go index 7ff6286317..e03ab780af 100644 --- a/server/channels/store/sqlstore/group_store_test.go +++ b/server/channels/store/sqlstore/group_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestGroupStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/integrity.go b/server/channels/store/sqlstore/integrity.go index 7c9758b915..71c89d27f5 100644 --- a/server/channels/store/sqlstore/integrity.go +++ b/server/channels/store/sqlstore/integrity.go @@ -6,8 +6,8 @@ package sqlstore import ( sq "github.com/mattermost/squirrel" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type relationalCheckConfig struct { diff --git a/server/channels/store/sqlstore/integrity_test.go b/server/channels/store/sqlstore/integrity_test.go index b61d325231..896c2911e8 100644 --- a/server/channels/store/sqlstore/integrity_test.go +++ b/server/channels/store/sqlstore/integrity_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func createAudit(ss store.Store, userId, sessionId string) *model.Audit { diff --git a/server/channels/store/sqlstore/job_store.go b/server/channels/store/sqlstore/job_store.go index 6dc1e9be85..0543fc5f6e 100644 --- a/server/channels/store/sqlstore/job_store.go +++ b/server/channels/store/sqlstore/job_store.go @@ -13,8 +13,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/sqlstore/job_store_test.go b/server/channels/store/sqlstore/job_store_test.go index 4c6ae721d4..a7028984df 100644 --- a/server/channels/store/sqlstore/job_store_test.go +++ b/server/channels/store/sqlstore/job_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestJobStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/license_store.go b/server/channels/store/sqlstore/license_store.go index 649009c37e..5b8308311e 100644 --- a/server/channels/store/sqlstore/license_store.go +++ b/server/channels/store/sqlstore/license_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) // SqlLicenseStore encapsulates the database writes and reads for diff --git a/server/channels/store/sqlstore/license_store_test.go b/server/channels/store/sqlstore/license_store_test.go index bdd0f4af4f..9b9f2aaf71 100644 --- a/server/channels/store/sqlstore/license_store_test.go +++ b/server/channels/store/sqlstore/license_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestLicenseStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/link_metadata_store.go b/server/channels/store/sqlstore/link_metadata_store.go index 81014206de..1ffdcd118b 100644 --- a/server/channels/store/sqlstore/link_metadata_store.go +++ b/server/channels/store/sqlstore/link_metadata_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlLinkMetadataStore struct { diff --git a/server/channels/store/sqlstore/link_metadata_store_test.go b/server/channels/store/sqlstore/link_metadata_store_test.go index 4de01f0afc..f5c4dc4fc4 100644 --- a/server/channels/store/sqlstore/link_metadata_store_test.go +++ b/server/channels/store/sqlstore/link_metadata_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestLinkMetadataStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/main_test.go b/server/channels/store/sqlstore/main_test.go index 5e4a28467e..fede40f23b 100644 --- a/server/channels/store/sqlstore/main_test.go +++ b/server/channels/store/sqlstore/main_test.go @@ -6,8 +6,8 @@ package sqlstore_test import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/store/sqlstore/notify_admin_store.go b/server/channels/store/sqlstore/notify_admin_store.go index db415ea7dc..b9b15757c1 100644 --- a/server/channels/store/sqlstore/notify_admin_store.go +++ b/server/channels/store/sqlstore/notify_admin_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlNotifyAdminStore struct { diff --git a/server/channels/store/sqlstore/notify_admin_store_test.go b/server/channels/store/sqlstore/notify_admin_store_test.go index 2434667140..5737f3d030 100644 --- a/server/channels/store/sqlstore/notify_admin_store_test.go +++ b/server/channels/store/sqlstore/notify_admin_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestNotifyAdminStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/oauth_store.go b/server/channels/store/sqlstore/oauth_store.go index ba738b7aa8..7dc35d66b3 100644 --- a/server/channels/store/sqlstore/oauth_store.go +++ b/server/channels/store/sqlstore/oauth_store.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlOAuthStore struct { diff --git a/server/channels/store/sqlstore/oauth_store_test.go b/server/channels/store/sqlstore/oauth_store_test.go index 2bef6bc121..d7b528514a 100644 --- a/server/channels/store/sqlstore/oauth_store_test.go +++ b/server/channels/store/sqlstore/oauth_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestOAuthStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/plugin_store.go b/server/channels/store/sqlstore/plugin_store.go index 8d8d4884c2..01afa87455 100644 --- a/server/channels/store/sqlstore/plugin_store.go +++ b/server/channels/store/sqlstore/plugin_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/sqlstore/plugin_store_test.go b/server/channels/store/sqlstore/plugin_store_test.go index 09effe6d65..cc5d9a3884 100644 --- a/server/channels/store/sqlstore/plugin_store_test.go +++ b/server/channels/store/sqlstore/plugin_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestPluginStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/post_acknowledgements_store.go b/server/channels/store/sqlstore/post_acknowledgements_store.go index 6635082e97..6041109d9e 100644 --- a/server/channels/store/sqlstore/post_acknowledgements_store.go +++ b/server/channels/store/sqlstore/post_acknowledgements_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlPostAcknowledgementStore struct { diff --git a/server/channels/store/sqlstore/post_acknowledgements_store_test.go b/server/channels/store/sqlstore/post_acknowledgements_store_test.go index aa74e69768..55a80af132 100644 --- a/server/channels/store/sqlstore/post_acknowledgements_store_test.go +++ b/server/channels/store/sqlstore/post_acknowledgements_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestPostAcknowledgementsStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/post_priority_store.go b/server/channels/store/sqlstore/post_priority_store.go index 34e56488ed..9ac4ca3d0d 100644 --- a/server/channels/store/sqlstore/post_priority_store.go +++ b/server/channels/store/sqlstore/post_priority_store.go @@ -6,8 +6,8 @@ package sqlstore import ( sq "github.com/mattermost/squirrel" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlPostPriorityStore struct { diff --git a/server/channels/store/sqlstore/post_priority_store_test.go b/server/channels/store/sqlstore/post_priority_store_test.go index 0c77ed2f5a..093394f3e7 100644 --- a/server/channels/store/sqlstore/post_priority_store_test.go +++ b/server/channels/store/sqlstore/post_priority_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestPostPriorityStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/post_store.go b/server/channels/store/sqlstore/post_store.go index 85854fdb90..e60583fe75 100644 --- a/server/channels/store/sqlstore/post_store.go +++ b/server/channels/store/sqlstore/post_store.go @@ -17,12 +17,12 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlPostStore struct { diff --git a/server/channels/store/sqlstore/post_store_test.go b/server/channels/store/sqlstore/post_store_test.go index 2a4c296001..72fdc51043 100644 --- a/server/channels/store/sqlstore/post_store_test.go +++ b/server/channels/store/sqlstore/post_store_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestPostStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/preference_store.go b/server/channels/store/sqlstore/preference_store.go index db426ebc8f..e68f4a3801 100644 --- a/server/channels/store/sqlstore/preference_store.go +++ b/server/channels/store/sqlstore/preference_store.go @@ -7,9 +7,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlPreferenceStore struct { diff --git a/server/channels/store/sqlstore/preference_store_test.go b/server/channels/store/sqlstore/preference_store_test.go index f91f1a6ce3..34e7f5fc1c 100644 --- a/server/channels/store/sqlstore/preference_store_test.go +++ b/server/channels/store/sqlstore/preference_store_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPreferenceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/product_notices_store.go b/server/channels/store/sqlstore/product_notices_store.go index 4ff5bf5ca3..d1f3d2efab 100644 --- a/server/channels/store/sqlstore/product_notices_store.go +++ b/server/channels/store/sqlstore/product_notices_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlProductNoticesStore struct { diff --git a/server/channels/store/sqlstore/product_notices_store_test.go b/server/channels/store/sqlstore/product_notices_store_test.go index 7f0f4373d7..f30f7e15a2 100644 --- a/server/channels/store/sqlstore/product_notices_store_test.go +++ b/server/channels/store/sqlstore/product_notices_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestProductNoticesStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/reaction_store.go b/server/channels/store/sqlstore/reaction_store.go index 3b66228c22..220a1d33f7 100644 --- a/server/channels/store/sqlstore/reaction_store.go +++ b/server/channels/store/sqlstore/reaction_store.go @@ -6,9 +6,9 @@ package sqlstore import ( sq "github.com/mattermost/squirrel" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/pkg/errors" ) diff --git a/server/channels/store/sqlstore/reaction_store_test.go b/server/channels/store/sqlstore/reaction_store_test.go index 3f458b61d1..e9ceb95df4 100644 --- a/server/channels/store/sqlstore/reaction_store_test.go +++ b/server/channels/store/sqlstore/reaction_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestReactionStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/remote_cluster_store.go b/server/channels/store/sqlstore/remote_cluster_store.go index e049e197db..11c7a8c138 100644 --- a/server/channels/store/sqlstore/remote_cluster_store.go +++ b/server/channels/store/sqlstore/remote_cluster_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type sqlRemoteClusterStore struct { diff --git a/server/channels/store/sqlstore/remote_cluster_store_test.go b/server/channels/store/sqlstore/remote_cluster_store_test.go index a5f5cf1b21..097343c42e 100644 --- a/server/channels/store/sqlstore/remote_cluster_store_test.go +++ b/server/channels/store/sqlstore/remote_cluster_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestRemoteClusterStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/retention_policy_store.go b/server/channels/store/sqlstore/retention_policy_store.go index 8ff793eb98..cc8b6280ff 100644 --- a/server/channels/store/sqlstore/retention_policy_store.go +++ b/server/channels/store/sqlstore/retention_policy_store.go @@ -14,9 +14,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlRetentionPolicyStore struct { diff --git a/server/channels/store/sqlstore/retention_policy_store_test.go b/server/channels/store/sqlstore/retention_policy_store_test.go index cabc49bca6..5ea674a5ab 100644 --- a/server/channels/store/sqlstore/retention_policy_store_test.go +++ b/server/channels/store/sqlstore/retention_policy_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestRetentionPolicyStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/role_store.go b/server/channels/store/sqlstore/role_store.go index 50f46c0304..df6095a40c 100644 --- a/server/channels/store/sqlstore/role_store.go +++ b/server/channels/store/sqlstore/role_store.go @@ -12,8 +12,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlRoleStore struct { diff --git a/server/channels/store/sqlstore/role_store_test.go b/server/channels/store/sqlstore/role_store_test.go index 63d0639bbd..c96bcb7dc1 100644 --- a/server/channels/store/sqlstore/role_store_test.go +++ b/server/channels/store/sqlstore/role_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestRoleStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/scheme_store.go b/server/channels/store/sqlstore/scheme_store.go index 99abeb220d..3a4541688f 100644 --- a/server/channels/store/sqlstore/scheme_store.go +++ b/server/channels/store/sqlstore/scheme_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/sqlstore/scheme_store_test.go b/server/channels/store/sqlstore/scheme_store_test.go index 2b9b440b7d..cef9352193 100644 --- a/server/channels/store/sqlstore/scheme_store_test.go +++ b/server/channels/store/sqlstore/scheme_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestSchemeStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/session_store.go b/server/channels/store/sqlstore/session_store.go index 851336dbc6..474742feb8 100644 --- a/server/channels/store/sqlstore/session_store.go +++ b/server/channels/store/sqlstore/session_store.go @@ -12,8 +12,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/sqlstore/session_store_test.go b/server/channels/store/sqlstore/session_store_test.go index c25c443f84..52d94b98f3 100644 --- a/server/channels/store/sqlstore/session_store_test.go +++ b/server/channels/store/sqlstore/session_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestSessionStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/shared_channel_store.go b/server/channels/store/sqlstore/shared_channel_store.go index f8afdfa4b2..85a6583fa4 100644 --- a/server/channels/store/sqlstore/shared_channel_store.go +++ b/server/channels/store/sqlstore/shared_channel_store.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" sq "github.com/mattermost/squirrel" "github.com/pkg/errors" diff --git a/server/channels/store/sqlstore/shared_channel_store_test.go b/server/channels/store/sqlstore/shared_channel_store_test.go index 95532f1654..1133184659 100644 --- a/server/channels/store/sqlstore/shared_channel_store_test.go +++ b/server/channels/store/sqlstore/shared_channel_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestSharedChannelStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/sqlx_wrapper.go b/server/channels/store/sqlstore/sqlx_wrapper.go index 3e21ef3ab3..0dab579512 100644 --- a/server/channels/store/sqlstore/sqlx_wrapper.go +++ b/server/channels/store/sqlstore/sqlx_wrapper.go @@ -14,9 +14,9 @@ import ( "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type StoreTestWrapper struct { diff --git a/server/channels/store/sqlstore/sqlx_wrapper_test.go b/server/channels/store/sqlstore/sqlx_wrapper_test.go index 53490199c8..07c6391767 100644 --- a/server/channels/store/sqlstore/sqlx_wrapper_test.go +++ b/server/channels/store/sqlstore/sqlx_wrapper_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSqlX(t *testing.T) { diff --git a/server/channels/store/sqlstore/status_store.go b/server/channels/store/sqlstore/status_store.go index 820db064eb..5791a6816a 100644 --- a/server/channels/store/sqlstore/status_store.go +++ b/server/channels/store/sqlstore/status_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlStatusStore struct { diff --git a/server/channels/store/sqlstore/status_store_test.go b/server/channels/store/sqlstore/status_store_test.go index 6d2f34c018..a40b93c9a6 100644 --- a/server/channels/store/sqlstore/status_store_test.go +++ b/server/channels/store/sqlstore/status_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestStatusStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/store.go b/server/channels/store/sqlstore/store.go index 8000384e95..9f587f1517 100644 --- a/server/channels/store/sqlstore/store.go +++ b/server/channels/store/sqlstore/store.go @@ -30,11 +30,11 @@ import ( mbindata "github.com/mattermost/morph/sources/embedded" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/db" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/db" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type migrationDirection string @@ -117,7 +117,7 @@ type SqlStoreStores struct { type SqlStore struct { // rrCounter and srCounter should be kept first. - // See https://github.com/mattermost/mattermost-server/v6/server/channels/pull/7281 + // See https://github.com/mattermost/mattermost-server/server/v8/channels/pull/7281 rrCounter int64 srCounter int64 diff --git a/server/channels/store/sqlstore/store_test.go b/server/channels/store/sqlstore/store_test.go index ba30e863f6..c218fa205d 100644 --- a/server/channels/store/sqlstore/store_test.go +++ b/server/channels/store/sqlstore/store_test.go @@ -21,13 +21,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/db" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/db" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type storeType struct { diff --git a/server/channels/store/sqlstore/system_store.go b/server/channels/store/sqlstore/system_store.go index 5fcc45c0ac..c3006f13d6 100644 --- a/server/channels/store/sqlstore/system_store.go +++ b/server/channels/store/sqlstore/system_store.go @@ -13,9 +13,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlSystemStore struct { diff --git a/server/channels/store/sqlstore/system_store_test.go b/server/channels/store/sqlstore/system_store_test.go index fdc9e22304..8ac69416ea 100644 --- a/server/channels/store/sqlstore/system_store_test.go +++ b/server/channels/store/sqlstore/system_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestSystemStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/team_store.go b/server/channels/store/sqlstore/team_store.go index dd1262fbbf..ace7c4a7f5 100644 --- a/server/channels/store/sqlstore/team_store.go +++ b/server/channels/store/sqlstore/team_store.go @@ -12,9 +12,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/sqlstore/team_store_test.go b/server/channels/store/sqlstore/team_store_test.go index 6aad9928f7..639c57b43b 100644 --- a/server/channels/store/sqlstore/team_store_test.go +++ b/server/channels/store/sqlstore/team_store_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestTeamStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/terms_of_service_store.go b/server/channels/store/sqlstore/terms_of_service_store.go index a40602a22d..41ebc7c86b 100644 --- a/server/channels/store/sqlstore/terms_of_service_store.go +++ b/server/channels/store/sqlstore/terms_of_service_store.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlTermsOfServiceStore struct { diff --git a/server/channels/store/sqlstore/terms_of_service_store_test.go b/server/channels/store/sqlstore/terms_of_service_store_test.go index 080c7c57cc..a9b209adf8 100644 --- a/server/channels/store/sqlstore/terms_of_service_store_test.go +++ b/server/channels/store/sqlstore/terms_of_service_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/thread_store.go b/server/channels/store/sqlstore/thread_store.go index 6a3e9ed4f8..b731b0b71c 100644 --- a/server/channels/store/sqlstore/thread_store.go +++ b/server/channels/store/sqlstore/thread_store.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) // JoinedThread allows querying the Threads + Posts table in a single query, before looking up diff --git a/server/channels/store/sqlstore/thread_store_test.go b/server/channels/store/sqlstore/thread_store_test.go index 89ee4ccc9f..ded1cdc88c 100644 --- a/server/channels/store/sqlstore/thread_store_test.go +++ b/server/channels/store/sqlstore/thread_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestThreadStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/tokens_store.go b/server/channels/store/sqlstore/tokens_store.go index dd7614d318..d96d1ab44c 100644 --- a/server/channels/store/sqlstore/tokens_store.go +++ b/server/channels/store/sqlstore/tokens_store.go @@ -10,9 +10,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlTokenStore struct { diff --git a/server/channels/store/sqlstore/tokens_store_test.go b/server/channels/store/sqlstore/tokens_store_test.go index 67ecaf0a9b..b8a35a9415 100644 --- a/server/channels/store/sqlstore/tokens_store_test.go +++ b/server/channels/store/sqlstore/tokens_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestTokensStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/true_up_review_store.go b/server/channels/store/sqlstore/true_up_review_store.go index 2226e09a53..cc11fee86d 100644 --- a/server/channels/store/sqlstore/true_up_review_store.go +++ b/server/channels/store/sqlstore/true_up_review_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) // SqlLicenseStore encapsulates the database writes and reads for diff --git a/server/channels/store/sqlstore/true_up_review_store_test.go b/server/channels/store/sqlstore/true_up_review_store_test.go index 7a886f6b03..2f824b20cf 100644 --- a/server/channels/store/sqlstore/true_up_review_store_test.go +++ b/server/channels/store/sqlstore/true_up_review_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestTrueUpReviewStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/upload_session_store.go b/server/channels/store/sqlstore/upload_session_store.go index 69f67a4c9b..5ee8eda235 100644 --- a/server/channels/store/sqlstore/upload_session_store.go +++ b/server/channels/store/sqlstore/upload_session_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlUploadSessionStore struct { diff --git a/server/channels/store/sqlstore/upload_session_store_test.go b/server/channels/store/sqlstore/upload_session_store_test.go index bcf1b56125..2db3de136c 100644 --- a/server/channels/store/sqlstore/upload_session_store_test.go +++ b/server/channels/store/sqlstore/upload_session_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestUploadSessionStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/user_access_token_store.go b/server/channels/store/sqlstore/user_access_token_store.go index de9cce52e3..04dac62367 100644 --- a/server/channels/store/sqlstore/user_access_token_store.go +++ b/server/channels/store/sqlstore/user_access_token_store.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlUserAccessTokenStore struct { diff --git a/server/channels/store/sqlstore/user_access_token_store_test.go b/server/channels/store/sqlstore/user_access_token_store_test.go index 93cebf1960..61ad42c429 100644 --- a/server/channels/store/sqlstore/user_access_token_store_test.go +++ b/server/channels/store/sqlstore/user_access_token_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestUserAccessTokenStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/user_store.go b/server/channels/store/sqlstore/user_store.go index 293d78c9a4..9f063ad9e1 100644 --- a/server/channels/store/sqlstore/user_store.go +++ b/server/channels/store/sqlstore/user_store.go @@ -16,10 +16,10 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/store/sqlstore/user_store_test.go b/server/channels/store/sqlstore/user_store_test.go index eabbbd93d2..56076ab1e5 100644 --- a/server/channels/store/sqlstore/user_store_test.go +++ b/server/channels/store/sqlstore/user_store_test.go @@ -6,8 +6,8 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestUserStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/user_terms_of_service.go b/server/channels/store/sqlstore/user_terms_of_service.go index 1b8d5cf2b3..7c0a5b584f 100644 --- a/server/channels/store/sqlstore/user_terms_of_service.go +++ b/server/channels/store/sqlstore/user_terms_of_service.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlUserTermsOfServiceStore struct { diff --git a/server/channels/store/sqlstore/user_terms_of_service_store_test.go b/server/channels/store/sqlstore/user_terms_of_service_store_test.go index 3192749a2d..d14a74eead 100644 --- a/server/channels/store/sqlstore/user_terms_of_service_store_test.go +++ b/server/channels/store/sqlstore/user_terms_of_service_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestUserTermsOfServiceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/utils.go b/server/channels/store/sqlstore/utils.go index 5242f0c527..69d21ab824 100644 --- a/server/channels/store/sqlstore/utils.go +++ b/server/channels/store/sqlstore/utils.go @@ -14,8 +14,8 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/go-sql-driver/mysql" ) diff --git a/server/channels/store/sqlstore/utils_test.go b/server/channels/store/sqlstore/utils_test.go index 96468323bb..61e11e0cf5 100644 --- a/server/channels/store/sqlstore/utils_test.go +++ b/server/channels/store/sqlstore/utils_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/channels/store/sqlstore/webhook_store.go b/server/channels/store/sqlstore/webhook_store.go index e40a8a1845..e2d0ed18da 100644 --- a/server/channels/store/sqlstore/webhook_store.go +++ b/server/channels/store/sqlstore/webhook_store.go @@ -9,9 +9,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SqlWebhookStore struct { diff --git a/server/channels/store/sqlstore/webhook_store_test.go b/server/channels/store/sqlstore/webhook_store_test.go index d887786cb6..e03720dd63 100644 --- a/server/channels/store/sqlstore/webhook_store_test.go +++ b/server/channels/store/sqlstore/webhook_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" ) func TestWebhookStore(t *testing.T) { diff --git a/server/channels/store/store.go b/server/channels/store/store.go index 52774d2e71..7da24fd24c 100644 --- a/server/channels/store/store.go +++ b/server/channels/store/store.go @@ -10,8 +10,8 @@ import ( "database/sql" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/model" ) type StoreResult struct { diff --git a/server/channels/store/storetest/audit_store.go b/server/channels/store/storetest/audit_store.go index bbc7a41b94..f7e2fe3a10 100644 --- a/server/channels/store/storetest/audit_store.go +++ b/server/channels/store/storetest/audit_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestAuditStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/bot_store.go b/server/channels/store/storetest/bot_store.go index 4451456a54..cea0d1dd3f 100644 --- a/server/channels/store/storetest/bot_store.go +++ b/server/channels/store/storetest/bot_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func makeBotWithUser(t *testing.T, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) { diff --git a/server/channels/store/storetest/channel_member_history_store.go b/server/channels/store/storetest/channel_member_history_store.go index 37192c9133..e4092dbe58 100644 --- a/server/channels/store/storetest/channel_member_history_store.go +++ b/server/channels/store/storetest/channel_member_history_store.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestChannelMemberHistoryStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/channel_store.go b/server/channels/store/storetest/channel_store.go index 3d30089e17..69b9328ec8 100644 --- a/server/channels/store/storetest/channel_store.go +++ b/server/channels/store/storetest/channel_store.go @@ -18,10 +18,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/timezones" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" ) type SqlStore interface { diff --git a/server/channels/store/storetest/channel_store_categories.go b/server/channels/store/storetest/channel_store_categories.go index 6b88cdff4a..ecd49ef8c2 100644 --- a/server/channels/store/storetest/channel_store_categories.go +++ b/server/channels/store/storetest/channel_store_categories.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestChannelStoreCategories(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/cluster_discovery_store.go b/server/channels/store/storetest/cluster_discovery_store.go index 5bea96960a..559c156dce 100644 --- a/server/channels/store/storetest/cluster_discovery_store.go +++ b/server/channels/store/storetest/cluster_discovery_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestClusterDiscoveryStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/command_store.go b/server/channels/store/storetest/command_store.go index 05e182e8d7..1b73543853 100644 --- a/server/channels/store/storetest/command_store.go +++ b/server/channels/store/storetest/command_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCommandStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/command_webhook_store.go b/server/channels/store/storetest/command_webhook_store.go index c809e238ad..88a1b6240a 100644 --- a/server/channels/store/storetest/command_webhook_store.go +++ b/server/channels/store/storetest/command_webhook_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCommandWebhookStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/compliance_store.go b/server/channels/store/storetest/compliance_store.go index b80a20509c..2840c39d89 100644 --- a/server/channels/store/storetest/compliance_store.go +++ b/server/channels/store/storetest/compliance_store.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func cleanupStoreState(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/draft_store.go b/server/channels/store/storetest/draft_store.go index 45eb33cae9..57a8d5654f 100644 --- a/server/channels/store/storetest/draft_store.go +++ b/server/channels/store/storetest/draft_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestDraftStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/emoji_store.go b/server/channels/store/storetest/emoji_store.go index b5c9b6e770..6d0c6d44b2 100644 --- a/server/channels/store/storetest/emoji_store.go +++ b/server/channels/store/storetest/emoji_store.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/channels/store/storetest/file_info_store.go b/server/channels/store/storetest/file_info_store.go index 21d65f649d..c5ba12acf6 100644 --- a/server/channels/store/storetest/file_info_store.go +++ b/server/channels/store/storetest/file_info_store.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/channels/store/storetest/group_store.go b/server/channels/store/storetest/group_store.go index fedcf5030a..0bbb39b494 100644 --- a/server/channels/store/storetest/group_store.go +++ b/server/channels/store/storetest/group_store.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGroupStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/job_store.go b/server/channels/store/storetest/job_store.go index 5f3fae9051..22f91f098e 100644 --- a/server/channels/store/storetest/job_store.go +++ b/server/channels/store/storetest/job_store.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestJobStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/license_store.go b/server/channels/store/storetest/license_store.go index 43d5a404fc..f2e1d54bf5 100644 --- a/server/channels/store/storetest/license_store.go +++ b/server/channels/store/storetest/license_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestLicenseStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/link_metadata_store.go b/server/channels/store/storetest/link_metadata_store.go index 0250123d8d..d6abe09a96 100644 --- a/server/channels/store/storetest/link_metadata_store.go +++ b/server/channels/store/storetest/link_metadata_store.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) // These tests are ran on the same store instance, so this provides easier unique, valid timestamps diff --git a/server/channels/store/storetest/mocks/AuditStore.go b/server/channels/store/storetest/mocks/AuditStore.go index a5d6e361c5..f254e47f75 100644 --- a/server/channels/store/storetest/mocks/AuditStore.go +++ b/server/channels/store/storetest/mocks/AuditStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/BotStore.go b/server/channels/store/storetest/mocks/BotStore.go index 857405adc3..2ee3f78efa 100644 --- a/server/channels/store/storetest/mocks/BotStore.go +++ b/server/channels/store/storetest/mocks/BotStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go b/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go index 6835c8c94e..6c2fe00f98 100644 --- a/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go +++ b/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/ChannelStore.go b/server/channels/store/storetest/mocks/ChannelStore.go index 97160c46c6..efff8cd0ce 100644 --- a/server/channels/store/storetest/mocks/ChannelStore.go +++ b/server/channels/store/storetest/mocks/ChannelStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/v6/server/channels/store" + store "github.com/mattermost/mattermost-server/server/v8/channels/store" time "time" ) diff --git a/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go b/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go index 4616e646ed..d637ca27e4 100644 --- a/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go +++ b/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/CommandStore.go b/server/channels/store/storetest/mocks/CommandStore.go index 9b5f365ab5..fd323ae70c 100644 --- a/server/channels/store/storetest/mocks/CommandStore.go +++ b/server/channels/store/storetest/mocks/CommandStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/CommandWebhookStore.go b/server/channels/store/storetest/mocks/CommandWebhookStore.go index 09cae9b925..70e7055fc1 100644 --- a/server/channels/store/storetest/mocks/CommandWebhookStore.go +++ b/server/channels/store/storetest/mocks/CommandWebhookStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/ComplianceStore.go b/server/channels/store/storetest/mocks/ComplianceStore.go index f2e91037e7..1dd0e774b2 100644 --- a/server/channels/store/storetest/mocks/ComplianceStore.go +++ b/server/channels/store/storetest/mocks/ComplianceStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/DraftStore.go b/server/channels/store/storetest/mocks/DraftStore.go index d7236b44a0..ff1c915bbc 100644 --- a/server/channels/store/storetest/mocks/DraftStore.go +++ b/server/channels/store/storetest/mocks/DraftStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/EmojiStore.go b/server/channels/store/storetest/mocks/EmojiStore.go index fc0fbf71e1..6058ee3a17 100644 --- a/server/channels/store/storetest/mocks/EmojiStore.go +++ b/server/channels/store/storetest/mocks/EmojiStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/FileInfoStore.go b/server/channels/store/storetest/mocks/FileInfoStore.go index f9529ca258..b514fe2e31 100644 --- a/server/channels/store/storetest/mocks/FileInfoStore.go +++ b/server/channels/store/storetest/mocks/FileInfoStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/GroupStore.go b/server/channels/store/storetest/mocks/GroupStore.go index 65bfbf2703..c29e8a6a0f 100644 --- a/server/channels/store/storetest/mocks/GroupStore.go +++ b/server/channels/store/storetest/mocks/GroupStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/JobStore.go b/server/channels/store/storetest/mocks/JobStore.go index 1b51098ecf..3b927281b3 100644 --- a/server/channels/store/storetest/mocks/JobStore.go +++ b/server/channels/store/storetest/mocks/JobStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/LicenseStore.go b/server/channels/store/storetest/mocks/LicenseStore.go index b0a7947169..e0bb342cd6 100644 --- a/server/channels/store/storetest/mocks/LicenseStore.go +++ b/server/channels/store/storetest/mocks/LicenseStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/LinkMetadataStore.go b/server/channels/store/storetest/mocks/LinkMetadataStore.go index 5bf135f9d2..be97f3003a 100644 --- a/server/channels/store/storetest/mocks/LinkMetadataStore.go +++ b/server/channels/store/storetest/mocks/LinkMetadataStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/NotifyAdminStore.go b/server/channels/store/storetest/mocks/NotifyAdminStore.go index eceb2be8d9..e2f98f9ce2 100644 --- a/server/channels/store/storetest/mocks/NotifyAdminStore.go +++ b/server/channels/store/storetest/mocks/NotifyAdminStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/OAuthStore.go b/server/channels/store/storetest/mocks/OAuthStore.go index e368215b67..d333b42a8f 100644 --- a/server/channels/store/storetest/mocks/OAuthStore.go +++ b/server/channels/store/storetest/mocks/OAuthStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/PluginStore.go b/server/channels/store/storetest/mocks/PluginStore.go index d44435d8db..72229eba60 100644 --- a/server/channels/store/storetest/mocks/PluginStore.go +++ b/server/channels/store/storetest/mocks/PluginStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/PostAcknowledgementStore.go b/server/channels/store/storetest/mocks/PostAcknowledgementStore.go index 267ebf0bcf..5bff12cfab 100644 --- a/server/channels/store/storetest/mocks/PostAcknowledgementStore.go +++ b/server/channels/store/storetest/mocks/PostAcknowledgementStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/PostPriorityStore.go b/server/channels/store/storetest/mocks/PostPriorityStore.go index 5fc302066d..2697dbad92 100644 --- a/server/channels/store/storetest/mocks/PostPriorityStore.go +++ b/server/channels/store/storetest/mocks/PostPriorityStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/PostStore.go b/server/channels/store/storetest/mocks/PostStore.go index 2d16e519d6..434fd864e9 100644 --- a/server/channels/store/storetest/mocks/PostStore.go +++ b/server/channels/store/storetest/mocks/PostStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/v6/server/channels/store" + store "github.com/mattermost/mattermost-server/server/v8/channels/store" ) // PostStore is an autogenerated mock type for the PostStore type diff --git a/server/channels/store/storetest/mocks/PreferenceStore.go b/server/channels/store/storetest/mocks/PreferenceStore.go index 2d8c9a8dae..ed5db59dc4 100644 --- a/server/channels/store/storetest/mocks/PreferenceStore.go +++ b/server/channels/store/storetest/mocks/PreferenceStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/ProductNoticesStore.go b/server/channels/store/storetest/mocks/ProductNoticesStore.go index 15230fa626..4563f48379 100644 --- a/server/channels/store/storetest/mocks/ProductNoticesStore.go +++ b/server/channels/store/storetest/mocks/ProductNoticesStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/ReactionStore.go b/server/channels/store/storetest/mocks/ReactionStore.go index d1d7247921..f295676495 100644 --- a/server/channels/store/storetest/mocks/ReactionStore.go +++ b/server/channels/store/storetest/mocks/ReactionStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/RemoteClusterStore.go b/server/channels/store/storetest/mocks/RemoteClusterStore.go index 8f144e3572..caacd9a062 100644 --- a/server/channels/store/storetest/mocks/RemoteClusterStore.go +++ b/server/channels/store/storetest/mocks/RemoteClusterStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/RetentionPolicyStore.go b/server/channels/store/storetest/mocks/RetentionPolicyStore.go index 3af57249ff..46a68cb49a 100644 --- a/server/channels/store/storetest/mocks/RetentionPolicyStore.go +++ b/server/channels/store/storetest/mocks/RetentionPolicyStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/RoleStore.go b/server/channels/store/storetest/mocks/RoleStore.go index 29a7d1b303..fd4ca2232d 100644 --- a/server/channels/store/storetest/mocks/RoleStore.go +++ b/server/channels/store/storetest/mocks/RoleStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/SchemeStore.go b/server/channels/store/storetest/mocks/SchemeStore.go index 4b20742404..e6a7e35b84 100644 --- a/server/channels/store/storetest/mocks/SchemeStore.go +++ b/server/channels/store/storetest/mocks/SchemeStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/SessionStore.go b/server/channels/store/storetest/mocks/SessionStore.go index 034313ba8d..acb486fe7c 100644 --- a/server/channels/store/storetest/mocks/SessionStore.go +++ b/server/channels/store/storetest/mocks/SessionStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/SharedChannelStore.go b/server/channels/store/storetest/mocks/SharedChannelStore.go index 33d2599b47..c8e39da2c6 100644 --- a/server/channels/store/storetest/mocks/SharedChannelStore.go +++ b/server/channels/store/storetest/mocks/SharedChannelStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/StatusStore.go b/server/channels/store/storetest/mocks/StatusStore.go index 9959fa23cf..5f7deb0441 100644 --- a/server/channels/store/storetest/mocks/StatusStore.go +++ b/server/channels/store/storetest/mocks/StatusStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/Store.go b/server/channels/store/storetest/mocks/Store.go index c41ca9d1a9..bb06fb9005 100644 --- a/server/channels/store/storetest/mocks/Store.go +++ b/server/channels/store/storetest/mocks/Store.go @@ -7,12 +7,12 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" sql "database/sql" - store "github.com/mattermost/mattermost-server/v6/server/channels/store" + store "github.com/mattermost/mattermost-server/server/v8/channels/store" time "time" ) diff --git a/server/channels/store/storetest/mocks/SystemStore.go b/server/channels/store/storetest/mocks/SystemStore.go index d84a3ad0ee..ff41ada483 100644 --- a/server/channels/store/storetest/mocks/SystemStore.go +++ b/server/channels/store/storetest/mocks/SystemStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/TeamStore.go b/server/channels/store/storetest/mocks/TeamStore.go index 5cf83f077e..7c8f038a0e 100644 --- a/server/channels/store/storetest/mocks/TeamStore.go +++ b/server/channels/store/storetest/mocks/TeamStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/TermsOfServiceStore.go b/server/channels/store/storetest/mocks/TermsOfServiceStore.go index 17093293d2..2de7fbe85c 100644 --- a/server/channels/store/storetest/mocks/TermsOfServiceStore.go +++ b/server/channels/store/storetest/mocks/TermsOfServiceStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/ThreadStore.go b/server/channels/store/storetest/mocks/ThreadStore.go index b969e81460..60b9211db2 100644 --- a/server/channels/store/storetest/mocks/ThreadStore.go +++ b/server/channels/store/storetest/mocks/ThreadStore.go @@ -5,8 +5,8 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" - store "github.com/mattermost/mattermost-server/v6/server/channels/store" + store "github.com/mattermost/mattermost-server/server/v8/channels/store" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/TokenStore.go b/server/channels/store/storetest/mocks/TokenStore.go index 5f3f14922f..11d97ef20f 100644 --- a/server/channels/store/storetest/mocks/TokenStore.go +++ b/server/channels/store/storetest/mocks/TokenStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/TrueUpReviewStore.go b/server/channels/store/storetest/mocks/TrueUpReviewStore.go index f71c1a8eb3..153d12c9f0 100644 --- a/server/channels/store/storetest/mocks/TrueUpReviewStore.go +++ b/server/channels/store/storetest/mocks/TrueUpReviewStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/UploadSessionStore.go b/server/channels/store/storetest/mocks/UploadSessionStore.go index 8a4ea35009..43000d811b 100644 --- a/server/channels/store/storetest/mocks/UploadSessionStore.go +++ b/server/channels/store/storetest/mocks/UploadSessionStore.go @@ -7,7 +7,7 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/UserAccessTokenStore.go b/server/channels/store/storetest/mocks/UserAccessTokenStore.go index 8ebac229cc..685582502e 100644 --- a/server/channels/store/storetest/mocks/UserAccessTokenStore.go +++ b/server/channels/store/storetest/mocks/UserAccessTokenStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/UserStore.go b/server/channels/store/storetest/mocks/UserStore.go index 0e7698809e..dd1e851456 100644 --- a/server/channels/store/storetest/mocks/UserStore.go +++ b/server/channels/store/storetest/mocks/UserStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/v6/server/channels/store" + store "github.com/mattermost/mattermost-server/server/v8/channels/store" ) // UserStore is an autogenerated mock type for the UserStore type diff --git a/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go b/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go index 41fc7925e2..6280d63e35 100644 --- a/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go +++ b/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/WebhookStore.go b/server/channels/store/storetest/mocks/WebhookStore.go index e78e63ec0a..3bbee2ff5c 100644 --- a/server/channels/store/storetest/mocks/WebhookStore.go +++ b/server/channels/store/storetest/mocks/WebhookStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/notify_admin_store.go b/server/channels/store/storetest/notify_admin_store.go index f235e71cff..3951fb0955 100644 --- a/server/channels/store/storetest/notify_admin_store.go +++ b/server/channels/store/storetest/notify_admin_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const PluginIdJenkins = "jenkins" diff --git a/server/channels/store/storetest/oauth_store.go b/server/channels/store/storetest/oauth_store.go index 6f6008c218..9893d436fb 100644 --- a/server/channels/store/storetest/oauth_store.go +++ b/server/channels/store/storetest/oauth_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestOAuthStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/plugin_store.go b/server/channels/store/storetest/plugin_store.go index 04b1c8ec62..c3cc614cb6 100644 --- a/server/channels/store/storetest/plugin_store.go +++ b/server/channels/store/storetest/plugin_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPluginStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/post_acknowledgements_store.go b/server/channels/store/storetest/post_acknowledgements_store.go index f34f042294..8e9ef9f2e7 100644 --- a/server/channels/store/storetest/post_acknowledgements_store.go +++ b/server/channels/store/storetest/post_acknowledgements_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPostAcknowledgementsStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/post_priority_store.go b/server/channels/store/storetest/post_priority_store.go index 447fff7cd1..0fd5f87071 100644 --- a/server/channels/store/storetest/post_priority_store.go +++ b/server/channels/store/storetest/post_priority_store.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPostPriorityStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/post_store.go b/server/channels/store/storetest/post_store.go index a718eb76ac..8de594072a 100644 --- a/server/channels/store/storetest/post_store.go +++ b/server/channels/store/storetest/post_store.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPostStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/preference_store.go b/server/channels/store/storetest/preference_store.go index 1f0b4ff14e..7816b0b7ae 100644 --- a/server/channels/store/storetest/preference_store.go +++ b/server/channels/store/storetest/preference_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPreferenceStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/product_notices_store.go b/server/channels/store/storetest/product_notices_store.go index ecb4e8ffda..9dbf43f011 100644 --- a/server/channels/store/storetest/product_notices_store.go +++ b/server/channels/store/storetest/product_notices_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestProductNoticesStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/reaction_store.go b/server/channels/store/storetest/reaction_store.go index 3b7c589c9f..f52ee6ac4a 100644 --- a/server/channels/store/storetest/reaction_store.go +++ b/server/channels/store/storetest/reaction_store.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/retrylayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/retrylayer" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestReactionStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/remote_cluster_store.go b/server/channels/store/storetest/remote_cluster_store.go index 2ff7885c38..b1d53f8611 100644 --- a/server/channels/store/storetest/remote_cluster_store.go +++ b/server/channels/store/storetest/remote_cluster_store.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/channels/store/storetest/retention_policy_store.go b/server/channels/store/storetest/retention_policy_store.go index 2223a41894..2ccb13916f 100644 --- a/server/channels/store/storetest/retention_policy_store.go +++ b/server/channels/store/storetest/retention_policy_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRetentionPolicyStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/role_store.go b/server/channels/store/storetest/role_store.go index ba4e220369..70fb09b422 100644 --- a/server/channels/store/storetest/role_store.go +++ b/server/channels/store/storetest/role_store.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRoleStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/scheme_store.go b/server/channels/store/storetest/scheme_store.go index 66f489b4f0..4d0607740a 100644 --- a/server/channels/store/storetest/scheme_store.go +++ b/server/channels/store/storetest/scheme_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSchemeStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/session_store.go b/server/channels/store/storetest/session_store.go index 3c8fba5504..8275d1e57c 100644 --- a/server/channels/store/storetest/session_store.go +++ b/server/channels/store/storetest/session_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/storetest/settings.go b/server/channels/store/storetest/settings.go index 3a289e3408..a1253f28bb 100644 --- a/server/channels/store/storetest/settings.go +++ b/server/channels/store/storetest/settings.go @@ -17,8 +17,8 @@ import ( _ "github.com/lib/pq" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/store/storetest/shared_channel_store.go b/server/channels/store/storetest/shared_channel_store.go index b5f0c6f6a4..58d82bba48 100644 --- a/server/channels/store/storetest/shared_channel_store.go +++ b/server/channels/store/storetest/shared_channel_store.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSharedChannelStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/status_store.go b/server/channels/store/storetest/status_store.go index 16c60991e2..ac14cc196f 100644 --- a/server/channels/store/storetest/status_store.go +++ b/server/channels/store/storetest/status_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestStatusStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/store.go b/server/channels/store/storetest/store.go index 1e35da7bfb..3883f7344b 100644 --- a/server/channels/store/storetest/store.go +++ b/server/channels/store/storetest/store.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) // Store can be used to provide mock stores for testing. diff --git a/server/channels/store/storetest/storetestlib.go b/server/channels/store/storetest/storetestlib.go index a0a2f9fdb0..f72115732e 100644 --- a/server/channels/store/storetest/storetestlib.go +++ b/server/channels/store/storetest/storetestlib.go @@ -4,7 +4,7 @@ package storetest import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func MakeEmail() string { diff --git a/server/channels/store/storetest/system_store.go b/server/channels/store/storetest/system_store.go index c6c233af94..7b8a06a5b5 100644 --- a/server/channels/store/storetest/system_store.go +++ b/server/channels/store/storetest/system_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSystemStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/team_store.go b/server/channels/store/storetest/team_store.go index b0d9b855d8..b7eef90aa5 100644 --- a/server/channels/store/storetest/team_store.go +++ b/server/channels/store/storetest/team_store.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func cleanupTeamStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/terms_of_service_store.go b/server/channels/store/storetest/terms_of_service_store.go index e58a4388a1..4977e47125 100644 --- a/server/channels/store/storetest/terms_of_service_store.go +++ b/server/channels/store/storetest/terms_of_service_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestTermsOfServiceStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/thread_store.go b/server/channels/store/storetest/thread_store.go index 7ba2baef19..4cd64c8f1e 100644 --- a/server/channels/store/storetest/thread_store.go +++ b/server/channels/store/storetest/thread_store.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestThreadStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/tokens_store.go b/server/channels/store/storetest/tokens_store.go index e89e2e3b24..78b026ba70 100644 --- a/server/channels/store/storetest/tokens_store.go +++ b/server/channels/store/storetest/tokens_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestTokensStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/true_up_review_store.go b/server/channels/store/storetest/true_up_review_store.go index 7ef149fa11..62491fb8b3 100644 --- a/server/channels/store/storetest/true_up_review_store.go +++ b/server/channels/store/storetest/true_up_review_store.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestTrueUpReviewStatusStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/upload_session_store.go b/server/channels/store/storetest/upload_session_store.go index 1629dff9f4..979b7036f1 100644 --- a/server/channels/store/storetest/upload_session_store.go +++ b/server/channels/store/storetest/upload_session_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestUploadSessionStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/user_access_token_store.go b/server/channels/store/storetest/user_access_token_store.go index d66ac38e41..5dc8d3e120 100644 --- a/server/channels/store/storetest/user_access_token_store.go +++ b/server/channels/store/storetest/user_access_token_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestUserAccessTokenStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/user_store.go b/server/channels/store/storetest/user_store.go index 86c8514c89..1a1c64bc49 100644 --- a/server/channels/store/storetest/user_store.go +++ b/server/channels/store/storetest/user_store.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/store/storetest/user_terms_of_service.go b/server/channels/store/storetest/user_terms_of_service.go index e219dd8d0c..0aaaf32b46 100644 --- a/server/channels/store/storetest/user_terms_of_service.go +++ b/server/channels/store/storetest/user_terms_of_service.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestUserTermsOfServiceStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/storetest/utils.go b/server/channels/store/storetest/utils.go index 7b8f06c3fb..60704b0f52 100644 --- a/server/channels/store/storetest/utils.go +++ b/server/channels/store/storetest/utils.go @@ -4,7 +4,7 @@ package storetest import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // This function has a copy of it in app/helper_test diff --git a/server/channels/store/storetest/webhook_store.go b/server/channels/store/storetest/webhook_store.go index b08a88e823..7c25472302 100644 --- a/server/channels/store/storetest/webhook_store.go +++ b/server/channels/store/storetest/webhook_store.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestWebhookStore(t *testing.T, ss store.Store) { diff --git a/server/channels/store/timerlayer/timerlayer.go b/server/channels/store/timerlayer/timerlayer.go index 7c8c64a033..b52293e013 100644 --- a/server/channels/store/timerlayer/timerlayer.go +++ b/server/channels/store/timerlayer/timerlayer.go @@ -10,9 +10,9 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) type TimerLayer struct { diff --git a/server/channels/testlib/cluster.go b/server/channels/testlib/cluster.go index ed41d61418..76cf134d13 100644 --- a/server/channels/testlib/cluster.go +++ b/server/channels/testlib/cluster.go @@ -6,8 +6,8 @@ package testlib import ( "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) type FakeClusterInterface struct { diff --git a/server/channels/testlib/helper.go b/server/channels/testlib/helper.go index 7618d6cfab..fd06e9b776 100644 --- a/server/channels/testlib/helper.go +++ b/server/channels/testlib/helper.go @@ -13,13 +13,13 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) type MainHelper struct { diff --git a/server/channels/testlib/resources.go b/server/channels/testlib/resources.go index 9d015d151a..7142b965e5 100644 --- a/server/channels/testlib/resources.go +++ b/server/channels/testlib/resources.go @@ -12,10 +12,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" ) const ( diff --git a/server/channels/testlib/store.go b/server/channels/testlib/store.go index bcd45a4f61..8fb8d39770 100644 --- a/server/channels/testlib/store.go +++ b/server/channels/testlib/store.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type TestStore struct { diff --git a/server/channels/utils/api.go b/server/channels/utils/api.go index 4da0c301f8..5b9684b5c9 100644 --- a/server/channels/utils/api.go +++ b/server/channels/utils/api.go @@ -14,8 +14,8 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func CheckOrigin(r *http.Request, allowedOrigins string) bool { diff --git a/server/channels/utils/api_test.go b/server/channels/utils/api_test.go index d475ef5067..8624da2fd0 100644 --- a/server/channels/utils/api_test.go +++ b/server/channels/utils/api_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRenderWebError(t *testing.T) { diff --git a/server/channels/utils/archive_test.go b/server/channels/utils/archive_test.go index a3797dfdf1..ae769a0f2b 100644 --- a/server/channels/utils/archive_test.go +++ b/server/channels/utils/archive_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" ) func TestSanitizePath(t *testing.T) { diff --git a/server/channels/utils/i18n.go b/server/channels/utils/i18n.go index 0fa5398561..5e75445ec6 100644 --- a/server/channels/utils/i18n.go +++ b/server/channels/utils/i18n.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) // this functions loads translations from filesystem if they are not diff --git a/server/channels/utils/imgutils/gif_test.go b/server/channels/utils/imgutils/gif_test.go index b1b08d71a8..5a560982a2 100644 --- a/server/channels/utils/imgutils/gif_test.go +++ b/server/channels/utils/imgutils/gif_test.go @@ -12,7 +12,7 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/channels/utils/jsonutils/json_test.go b/server/channels/utils/jsonutils/json_test.go index 0027a725bf..30ed5f7104 100644 --- a/server/channels/utils/jsonutils/json_test.go +++ b/server/channels/utils/jsonutils/json_test.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/jsonutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/jsonutils" ) func TestHumanizeJsonError(t *testing.T) { diff --git a/server/channels/utils/license.go b/server/channels/utils/license.go index e1e940cbf2..b937662f35 100644 --- a/server/channels/utils/license.go +++ b/server/channels/utils/license.go @@ -17,9 +17,9 @@ import ( "path/filepath" "strconv" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var LicenseValidator LicenseValidatorIface diff --git a/server/channels/utils/merge_test.go b/server/channels/utils/merge_test.go index 57d92b5cac..bc3ceb3419 100644 --- a/server/channels/utils/merge_test.go +++ b/server/channels/utils/merge_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" ) // Test merging maps alone. This isolates the complexity of merging maps from merging maps recursively in diff --git a/server/channels/utils/mocks/LicenseValidatorIface.go b/server/channels/utils/mocks/LicenseValidatorIface.go index ae7196b201..9abb3e9302 100644 --- a/server/channels/utils/mocks/LicenseValidatorIface.go +++ b/server/channels/utils/mocks/LicenseValidatorIface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/utils/subpath.go b/server/channels/utils/subpath.go index cfa47d4467..e254a05991 100644 --- a/server/channels/utils/subpath.go +++ b/server/channels/utils/subpath.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // getSubpathScript renders the inline script that defines window.publicPath to change how webpack loads assets. diff --git a/server/channels/utils/subpath_test.go b/server/channels/utils/subpath_test.go index 6af6af1006..28cc23ea0c 100644 --- a/server/channels/utils/subpath_test.go +++ b/server/channels/utils/subpath_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestUpdateAssetsSubpathFromConfig(t *testing.T) { diff --git a/server/channels/utils/testutils/static_config_service.go b/server/channels/utils/testutils/static_config_service.go index 6a4d4d2034..c6ea8b7bba 100644 --- a/server/channels/utils/testutils/static_config_service.go +++ b/server/channels/utils/testutils/static_config_service.go @@ -6,7 +6,7 @@ package testutils import ( "crypto/ecdsa" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type StaticConfigService struct { diff --git a/server/channels/utils/testutils/testutils.go b/server/channels/utils/testutils/testutils.go index cb31ac0f56..9d766e23a1 100644 --- a/server/channels/utils/testutils/testutils.go +++ b/server/channels/utils/testutils/testutils.go @@ -14,9 +14,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" ) func ReadTestFile(name string) ([]byte, error) { diff --git a/server/channels/utils/utils.go b/server/channels/utils/utils.go index cf53e19f55..bba3d52cac 100644 --- a/server/channels/utils/utils.go +++ b/server/channels/utils/utils.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func StringInSlice(a string, slice []string) bool { diff --git a/server/channels/web/context.go b/server/channels/web/context.go index 46384a851e..1fbf57bb33 100644 --- a/server/channels/web/context.go +++ b/server/channels/web/context.go @@ -9,13 +9,13 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Context struct { diff --git a/server/channels/web/context_test.go b/server/channels/web/context_test.go index a2850ba2e9..60a9ef0579 100644 --- a/server/channels/web/context_test.go +++ b/server/channels/web/context_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestRequireHookId(t *testing.T) { diff --git a/server/channels/web/handlers.go b/server/channels/web/handlers.go index 466619b61a..d10c085021 100644 --- a/server/channels/web/handlers.go +++ b/server/channels/web/handlers.go @@ -20,15 +20,15 @@ import ( "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - app_opentracing "github.com/mattermost/mattermost-server/v6/server/channels/app/opentracing" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store/opentracinglayer" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/tracing" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + app_opentracing "github.com/mattermost/mattermost-server/server/v8/channels/app/opentracing" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store/opentracinglayer" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func GetHandlerName(h func(*Context, http.ResponseWriter, *http.Request)) string { diff --git a/server/channels/web/handlers_test.go b/server/channels/web/handlers_test.go index f94c03548a..842e062151 100644 --- a/server/channels/web/handlers_test.go +++ b/server/channels/web/handlers_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func handlerForHTTPErrors(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/web/main_test.go b/server/channels/web/main_test.go index 8ed6c63a8c..06e4b6935a 100644 --- a/server/channels/web/main_test.go +++ b/server/channels/web/main_test.go @@ -6,7 +6,7 @@ package web import ( "testing" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/web/oauth.go b/server/channels/web/oauth.go index 9d98ce8c27..fe6e4ece8e 100644 --- a/server/channels/web/oauth.go +++ b/server/channels/web/oauth.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (w *Web) InitOAuth() { diff --git a/server/channels/web/oauth_test.go b/server/channels/web/oauth_test.go index 874c22d2c2..03838789fd 100644 --- a/server/channels/web/oauth_test.go +++ b/server/channels/web/oauth_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestOAuthComplete_AccessDenied(t *testing.T) { diff --git a/server/channels/web/params.go b/server/channels/web/params.go index 64e8227119..7dd205dc93 100644 --- a/server/channels/web/params.go +++ b/server/channels/web/params.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/web/params_test.go b/server/channels/web/params_test.go index e95e8b6140..010714e252 100644 --- a/server/channels/web/params_test.go +++ b/server/channels/web/params_test.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetPerPageFromQuery(t *testing.T) { diff --git a/server/channels/web/saml.go b/server/channels/web/saml.go index 438cf490e1..55bcfdfee0 100644 --- a/server/channels/web/saml.go +++ b/server/channels/web/saml.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const maxSAMLResponseSize = 2 * 1024 * 1024 // 2MB diff --git a/server/channels/web/static.go b/server/channels/web/static.go index bd091841a9..e8e111dbb5 100644 --- a/server/channels/web/static.go +++ b/server/channels/web/static.go @@ -15,11 +15,11 @@ import ( "github.com/mattermost/gziphandler" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" ) var robotsTxt = []byte("User-agent: *\nDisallow: /\n") diff --git a/server/channels/web/unsupported_browser.go b/server/channels/web/unsupported_browser.go index eea9fc93c3..fc3ea2fe26 100644 --- a/server/channels/web/unsupported_browser.go +++ b/server/channels/web/unsupported_browser.go @@ -8,8 +8,8 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/templates" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" ) // MattermostApp describes downloads for the Mattermost App diff --git a/server/channels/web/web.go b/server/channels/web/web.go index 64ff0221bf..1bae301a83 100644 --- a/server/channels/web/web.go +++ b/server/channels/web/web.go @@ -11,10 +11,10 @@ import ( "github.com/avct/uasurfer" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Web struct { diff --git a/server/channels/web/web_test.go b/server/channels/web/web_test.go index 3fcddc2023..2623dfb0bb 100644 --- a/server/channels/web/web_test.go +++ b/server/channels/web/web_test.go @@ -17,15 +17,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store/localcachelayer" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) var apiClient *model.Client4 @@ -204,7 +204,7 @@ func TestStaticFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -291,7 +291,7 @@ func TestPublicFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/web/webhook.go b/server/channels/web/webhook.go index 84a23b83b5..d75c98e94b 100644 --- a/server/channels/web/webhook.go +++ b/server/channels/web/webhook.go @@ -13,8 +13,8 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/schema" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (w *Web) InitWebhooks() { diff --git a/server/channels/web/webhook_test.go b/server/channels/web/webhook_test.go index e0cd792c1e..17f5dbe718 100644 --- a/server/channels/web/webhook_test.go +++ b/server/channels/web/webhook_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestIncomingWebhook(t *testing.T) { diff --git a/server/channels/wsapi/api.go b/server/channels/wsapi/api.go index 9da2d79ba5..fcfa5b07fd 100644 --- a/server/channels/wsapi/api.go +++ b/server/channels/wsapi/api.go @@ -4,8 +4,8 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" ) type API struct { diff --git a/server/channels/wsapi/status.go b/server/channels/wsapi/status.go index 375f65367e..db52eb50dd 100644 --- a/server/channels/wsapi/status.go +++ b/server/channels/wsapi/status.go @@ -4,8 +4,8 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitStatus() { diff --git a/server/channels/wsapi/system.go b/server/channels/wsapi/system.go index e119505f80..634df691b7 100644 --- a/server/channels/wsapi/system.go +++ b/server/channels/wsapi/system.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitSystem() { diff --git a/server/channels/wsapi/user.go b/server/channels/wsapi/user.go index 6389a99aea..940c2ae64a 100644 --- a/server/channels/wsapi/user.go +++ b/server/channels/wsapi/user.go @@ -4,8 +4,8 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitUser() { diff --git a/server/channels/wsapi/websocket_handler.go b/server/channels/wsapi/websocket_handler.go index 9ceb7354bb..4cd7d68bec 100644 --- a/server/channels/wsapi/websocket_handler.go +++ b/server/channels/wsapi/websocket_handler.go @@ -6,11 +6,11 @@ package wsapi import ( "net/http" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/platform" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) APIWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]any, *model.AppError)) webSocketHandler { diff --git a/server/cmd/mattermost/commands/cmdtestlib.go b/server/cmd/mattermost/commands/cmdtestlib.go index 9b526f18e6..1d57b71367 100644 --- a/server/cmd/mattermost/commands/cmdtestlib.go +++ b/server/cmd/mattermost/commands/cmdtestlib.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/api4" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" ) var coverprofileCounters map[string]int = make(map[string]int) diff --git a/server/cmd/mattermost/commands/db.go b/server/cmd/mattermost/commands/db.go index 4174f77c75..387d203d80 100644 --- a/server/cmd/mattermost/commands/db.go +++ b/server/cmd/mattermost/commands/db.go @@ -10,10 +10,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/config" ) var DbCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/export.go b/server/cmd/mattermost/commands/export.go index 90cfa317b7..70593379b2 100644 --- a/server/cmd/mattermost/commands/export.go +++ b/server/cmd/mattermost/commands/export.go @@ -10,10 +10,10 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mattermost/commands/export_test.go b/server/cmd/mattermost/commands/export_test.go index f6ebfeffb6..b2456d60cd 100644 --- a/server/cmd/mattermost/commands/export_test.go +++ b/server/cmd/mattermost/commands/export_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // There are no tests that actually run the Message Export job, because it can take a long time to complete depending diff --git a/server/cmd/mattermost/commands/import.go b/server/cmd/mattermost/commands/import.go index a140af37aa..ecfcca5781 100644 --- a/server/cmd/mattermost/commands/import.go +++ b/server/cmd/mattermost/commands/import.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/model" ) var ImportCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/init.go b/server/cmd/mattermost/commands/init.go index fa747ba99f..bae1181fa2 100644 --- a/server/cmd/mattermost/commands/init.go +++ b/server/cmd/mattermost/commands/init.go @@ -6,12 +6,12 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func initDBCommandContextCobra(command *cobra.Command, readOnlyConfigStore bool, options ...app.Option) (*app.App, error) { diff --git a/server/cmd/mattermost/commands/jobserver.go b/server/cmd/mattermost/commands/jobserver.go index 0f5663426c..206b660a9f 100644 --- a/server/cmd/mattermost/commands/jobserver.go +++ b/server/cmd/mattermost/commands/jobserver.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/audit" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var JobserverCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/main_test.go b/server/cmd/mattermost/commands/main_test.go index 2a7df0a3c4..ace5a637db 100644 --- a/server/cmd/mattermost/commands/main_test.go +++ b/server/cmd/mattermost/commands/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/api4" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" ) // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. diff --git a/server/cmd/mattermost/commands/server.go b/server/cmd/mattermost/commands/server.go index ecb25552d2..3501047332 100644 --- a/server/cmd/mattermost/commands/server.go +++ b/server/cmd/mattermost/commands/server.go @@ -15,14 +15,14 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/server/channels/api4" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/manualtesting" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/channels/web" - "github.com/mattermost/mattermost-server/v6/server/channels/wsapi" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/manualtesting" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost-server/server/v8/channels/wsapi" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var serverCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/server_test.go b/server/cmd/mattermost/commands/server_test.go index eef8af50e7..276fb622dd 100644 --- a/server/cmd/mattermost/commands/server_test.go +++ b/server/cmd/mattermost/commands/server_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/config" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/config" ) const ( diff --git a/server/cmd/mattermost/commands/test.go b/server/cmd/mattermost/commands/test.go index abacaa1163..a525f2bbdc 100644 --- a/server/cmd/mattermost/commands/test.go +++ b/server/cmd/mattermost/commands/test.go @@ -13,11 +13,11 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/api4" - "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/wsapi" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/wsapi" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) var TestCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/utils.go b/server/cmd/mattermost/commands/utils.go index fb7a56d262..d09def41fc 100644 --- a/server/cmd/mattermost/commands/utils.go +++ b/server/cmd/mattermost/commands/utils.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const CustomDefaultsEnvVar = "MM_CUSTOM_DEFAULTS_PATH" diff --git a/server/cmd/mattermost/commands/version.go b/server/cmd/mattermost/commands/version.go index 2c318a72e2..daea544066 100644 --- a/server/cmd/mattermost/commands/version.go +++ b/server/cmd/mattermost/commands/version.go @@ -6,7 +6,7 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) var VersionCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/main.go b/server/cmd/mattermost/main.go index d0577694bf..c47df425ac 100644 --- a/server/cmd/mattermost/main.go +++ b/server/cmd/mattermost/main.go @@ -6,14 +6,14 @@ package main import ( "os" - "github.com/mattermost/mattermost-server/v6/server/cmd/mattermost/commands" + "github.com/mattermost/mattermost-server/server/v8/cmd/mattermost/commands" // Import and register app layer slash commands - _ "github.com/mattermost/mattermost-server/v6/server/channels/app/slashcommands" + _ "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands" // Plugins - _ "github.com/mattermost/mattermost-server/v6/model/oauthproviders/gitlab" + _ "github.com/mattermost/mattermost-server/server/v8/model/oauthproviders/gitlab" // Enterprise Imports - _ "github.com/mattermost/mattermost-server/v6/server/channels/imports" + _ "github.com/mattermost/mattermost-server/server/v8/channels/imports" ) func main() { diff --git a/server/config/client.go b/server/config/client.go index df004b381f..50bb37cccd 100644 --- a/server/config/client.go +++ b/server/config/client.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // GenerateClientConfig renders the given configuration for a client. diff --git a/server/config/client_test.go b/server/config/client_test.go index 9c92cfe329..4c3d3c9968 100644 --- a/server/config/client_test.go +++ b/server/config/client_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetClientConfig(t *testing.T) { diff --git a/server/config/common_test.go b/server/config/common_test.go index 06e4f90057..e601e63352 100644 --- a/server/config/common_test.go +++ b/server/config/common_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) var emptyConfig, readOnlyConfig, minimalConfig, minimalConfigNoFF, invalidConfig, fixesRequiredConfig, ldapConfig, testConfig, customConfigDefaults *model.Config diff --git a/server/config/database.go b/server/config/database.go index dd508d9c4f..58966e9d9e 100644 --- a/server/config/database.go +++ b/server/config/database.go @@ -25,9 +25,9 @@ import ( "github.com/mattermost/morph" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/morph/drivers" ms "github.com/mattermost/morph/drivers/mysql" diff --git a/server/config/database_test.go b/server/config/database_test.go index 6954461a08..d1fb8e18c4 100644 --- a/server/config/database_test.go +++ b/server/config/database_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func getDsn(driver string, source string) string { diff --git a/server/config/diff.go b/server/config/diff.go index ac418ec8a6..d10025d4bd 100644 --- a/server/config/diff.go +++ b/server/config/diff.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type ConfigDiffs []ConfigDiff diff --git a/server/config/diff_test.go b/server/config/diff_test.go index bf1a79ab37..36e3b2402b 100644 --- a/server/config/diff_test.go +++ b/server/config/diff_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/config/emitter.go b/server/config/emitter.go index 80f8c72065..bd5b36d794 100644 --- a/server/config/emitter.go +++ b/server/config/emitter.go @@ -6,8 +6,8 @@ package config import ( "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // Listener is a callback function invoked when the configuration changes. diff --git a/server/config/emitter_test.go b/server/config/emitter_test.go index 6700088b3b..417a168be2 100644 --- a/server/config/emitter_test.go +++ b/server/config/emitter_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestEmitter(t *testing.T) { diff --git a/server/config/environment.go b/server/config/environment.go index 4ded8d7399..17ad38f34e 100644 --- a/server/config/environment.go +++ b/server/config/environment.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func GetEnvironment() map[string]string { diff --git a/server/config/environment_test.go b/server/config/environment_test.go index e86bcc36e9..b45107ad39 100644 --- a/server/config/environment_test.go +++ b/server/config/environment_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func modifiedDefault(modify func(*model.Config)) *model.Config { diff --git a/server/config/file.go b/server/config/file.go index 79d71bc6f1..082d77c9f9 100644 --- a/server/config/file.go +++ b/server/config/file.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/config/file_test.go b/server/config/file_test.go index 9094a2b200..51df708992 100644 --- a/server/config/file_test.go +++ b/server/config/file_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) { diff --git a/server/config/logconfigsrc.go b/server/config/logconfigsrc.go index 8f75d62b44..dce35f6f24 100644 --- a/server/config/logconfigsrc.go +++ b/server/config/logconfigsrc.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type LogSrcListener func(old, new mlog.LoggerConfiguration) diff --git a/server/config/logger.go b/server/config/logger.go index 36b6374603..ec64b98dc8 100644 --- a/server/config/logger.go +++ b/server/config/logger.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/config/logger_test.go b/server/config/logger_test.go index c28f769d06..acd7fefe1e 100644 --- a/server/config/logger_test.go +++ b/server/config/logger_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestMloggerConfigFromAuditConfig(t *testing.T) { diff --git a/server/config/main_test.go b/server/config/main_test.go index 09b38815d9..9a0979589b 100644 --- a/server/config/main_test.go +++ b/server/config/main_test.go @@ -11,8 +11,8 @@ import ( "github.com/lib/pq" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" ) var mainHelper *testlib.MainHelper diff --git a/server/config/memory.go b/server/config/memory.go index d59b34bec8..7067f3bd55 100644 --- a/server/config/memory.go +++ b/server/config/memory.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // MemoryStore implements the Store interface. It is meant primarily for testing. diff --git a/server/config/migrate_test.go b/server/config/migrate_test.go index 27a1b9ccda..a8f3565811 100644 --- a/server/config/migrate_test.go +++ b/server/config/migrate_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type cleanUpFn func(store *Store) diff --git a/server/config/store.go b/server/config/store.go index b5fb315444..ca9cfca815 100644 --- a/server/config/store.go +++ b/server/config/store.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/jsonutils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/jsonutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) var ( diff --git a/server/config/utils.go b/server/config/utils.go index f247ea4a43..d76fe55d52 100644 --- a/server/config/utils.go +++ b/server/config/utils.go @@ -10,10 +10,10 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // marshalConfig converts the given configuration into JSON bytes for persistence. diff --git a/server/config/utils_test.go b/server/config/utils_test.go index 9c8de20d23..50585eb550 100644 --- a/server/config/utils_test.go +++ b/server/config/utils_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestDesanitize(t *testing.T) { diff --git a/go.mod b/server/go.mod similarity index 99% rename from go.mod rename to server/go.mod index 2eb36199e3..20e82eb78b 100644 --- a/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/mattermost/mattermost-server/v6 +module github.com/mattermost/mattermost-server/server/v8 go 1.19 diff --git a/go.sum b/server/go.sum similarity index 100% rename from go.sum rename to server/go.sum diff --git a/model/access.go b/server/model/access.go similarity index 100% rename from model/access.go rename to server/model/access.go diff --git a/model/access_test.go b/server/model/access_test.go similarity index 100% rename from model/access_test.go rename to server/model/access_test.go diff --git a/model/analytics_row.go b/server/model/analytics_row.go similarity index 100% rename from model/analytics_row.go rename to server/model/analytics_row.go diff --git a/model/audit.go b/server/model/audit.go similarity index 100% rename from model/audit.go rename to server/model/audit.go diff --git a/model/auditconv.go b/server/model/auditconv.go similarity index 100% rename from model/auditconv.go rename to server/model/auditconv.go diff --git a/model/auditconv_test.go b/server/model/auditconv_test.go similarity index 100% rename from model/auditconv_test.go rename to server/model/auditconv_test.go diff --git a/model/audits.go b/server/model/audits.go similarity index 100% rename from model/audits.go rename to server/model/audits.go diff --git a/model/authorize.go b/server/model/authorize.go similarity index 100% rename from model/authorize.go rename to server/model/authorize.go diff --git a/model/authorize_test.go b/server/model/authorize_test.go similarity index 100% rename from model/authorize_test.go rename to server/model/authorize_test.go diff --git a/model/bot.go b/server/model/bot.go similarity index 100% rename from model/bot.go rename to server/model/bot.go diff --git a/model/bot_test.go b/server/model/bot_test.go similarity index 100% rename from model/bot_test.go rename to server/model/bot_test.go diff --git a/model/builtin.go b/server/model/builtin.go similarity index 100% rename from model/builtin.go rename to server/model/builtin.go diff --git a/model/bulk_export.go b/server/model/bulk_export.go similarity index 100% rename from model/bulk_export.go rename to server/model/bulk_export.go diff --git a/model/bundle_info.go b/server/model/bundle_info.go similarity index 92% rename from model/bundle_info.go rename to server/model/bundle_info.go index e602cc5daf..cfac1c8eb3 100644 --- a/model/bundle_info.go +++ b/server/model/bundle_info.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type BundleInfo struct { diff --git a/model/bundle_info_test.go b/server/model/bundle_info_test.go similarity index 100% rename from model/bundle_info_test.go rename to server/model/bundle_info_test.go diff --git a/model/channel.go b/server/model/channel.go similarity index 100% rename from model/channel.go rename to server/model/channel.go diff --git a/model/channel_count.go b/server/model/channel_count.go similarity index 100% rename from model/channel_count.go rename to server/model/channel_count.go diff --git a/model/channel_data.go b/server/model/channel_data.go similarity index 100% rename from model/channel_data.go rename to server/model/channel_data.go diff --git a/model/channel_list.go b/server/model/channel_list.go similarity index 100% rename from model/channel_list.go rename to server/model/channel_list.go diff --git a/model/channel_member.go b/server/model/channel_member.go similarity index 100% rename from model/channel_member.go rename to server/model/channel_member.go diff --git a/model/channel_member_history.go b/server/model/channel_member_history.go similarity index 100% rename from model/channel_member_history.go rename to server/model/channel_member_history.go diff --git a/model/channel_member_history_result.go b/server/model/channel_member_history_result.go similarity index 100% rename from model/channel_member_history_result.go rename to server/model/channel_member_history_result.go diff --git a/model/channel_member_test.go b/server/model/channel_member_test.go similarity index 100% rename from model/channel_member_test.go rename to server/model/channel_member_test.go diff --git a/model/channel_mentions.go b/server/model/channel_mentions.go similarity index 100% rename from model/channel_mentions.go rename to server/model/channel_mentions.go diff --git a/model/channel_search.go b/server/model/channel_search.go similarity index 100% rename from model/channel_search.go rename to server/model/channel_search.go diff --git a/model/channel_sidebar.go b/server/model/channel_sidebar.go similarity index 100% rename from model/channel_sidebar.go rename to server/model/channel_sidebar.go diff --git a/model/channel_sidebar_test.go b/server/model/channel_sidebar_test.go similarity index 100% rename from model/channel_sidebar_test.go rename to server/model/channel_sidebar_test.go diff --git a/model/channel_stats.go b/server/model/channel_stats.go similarity index 100% rename from model/channel_stats.go rename to server/model/channel_stats.go diff --git a/model/channel_test.go b/server/model/channel_test.go similarity index 100% rename from model/channel_test.go rename to server/model/channel_test.go diff --git a/model/channel_view.go b/server/model/channel_view.go similarity index 100% rename from model/channel_view.go rename to server/model/channel_view.go diff --git a/model/client4.go b/server/model/client4.go similarity index 100% rename from model/client4.go rename to server/model/client4.go diff --git a/model/client4_test.go b/server/model/client4_test.go similarity index 97% rename from model/client4_test.go rename to server/model/client4_test.go index 71a374fae6..bb9db34997 100644 --- a/model/client4_test.go +++ b/server/model/client4_test.go @@ -26,7 +26,7 @@ func TestClient4TrimTrailingSlash(t *testing.T) { } } -// https://github.com/mattermost/mattermost-server/v6/server/channels/issues/8205 +// https://github.com/mattermost/mattermost-server/server/v8/channels/issues/8205 func TestClient4CreatePost(t *testing.T) { post := &Post{ Props: map[string]any{ diff --git a/model/cloud.go b/server/model/cloud.go similarity index 98% rename from model/cloud.go rename to server/model/cloud.go index c8dd738b96..a2176f8bd9 100644 --- a/model/cloud.go +++ b/server/model/cloud.go @@ -274,7 +274,7 @@ type SubscriptionChange struct { // TODO remove BoardsLimits. // It is not used for real. // Focalboard has some lingering code using this struct -// https://github.com/mattermost/mattermost-server/v6/server/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 +// https://github.com/mattermost/mattermost-server/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 // we should remove this struct once that code is removed. type BoardsLimits struct { Cards *int `json:"cards"` @@ -297,7 +297,7 @@ type ProductLimits struct { // TODO remove Boards property. // It is not used for real. // Focalboard has some lingering code using this property - // https://github.com/mattermost/mattermost-server/v6/server/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 + // https://github.com/mattermost/mattermost-server/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 // we should remove this property once that code is removed. Boards *BoardsLimits `json:"boards,omitempty"` Files *FilesLimits `json:"files,omitempty"` diff --git a/model/cluster_discovery.go b/server/model/cluster_discovery.go similarity index 100% rename from model/cluster_discovery.go rename to server/model/cluster_discovery.go diff --git a/model/cluster_discovery_test.go b/server/model/cluster_discovery_test.go similarity index 100% rename from model/cluster_discovery_test.go rename to server/model/cluster_discovery_test.go diff --git a/model/cluster_info.go b/server/model/cluster_info.go similarity index 100% rename from model/cluster_info.go rename to server/model/cluster_info.go diff --git a/model/cluster_message.go b/server/model/cluster_message.go similarity index 100% rename from model/cluster_message.go rename to server/model/cluster_message.go diff --git a/model/cluster_stats.go b/server/model/cluster_stats.go similarity index 100% rename from model/cluster_stats.go rename to server/model/cluster_stats.go diff --git a/model/collection.go b/server/model/collection.go similarity index 100% rename from model/collection.go rename to server/model/collection.go diff --git a/model/command.go b/server/model/command.go similarity index 100% rename from model/command.go rename to server/model/command.go diff --git a/model/command_args.go b/server/model/command_args.go similarity index 96% rename from model/command_args.go rename to server/model/command_args.go index a01b5db87a..6b147af0df 100644 --- a/model/command_args.go +++ b/server/model/command_args.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type CommandArgs struct { diff --git a/model/command_args_test.go b/server/model/command_args_test.go similarity index 100% rename from model/command_args_test.go rename to server/model/command_args_test.go diff --git a/model/command_autocomplete.go b/server/model/command_autocomplete.go similarity index 100% rename from model/command_autocomplete.go rename to server/model/command_autocomplete.go diff --git a/model/command_autocomplete_test.go b/server/model/command_autocomplete_test.go similarity index 100% rename from model/command_autocomplete_test.go rename to server/model/command_autocomplete_test.go diff --git a/model/command_request.go b/server/model/command_request.go similarity index 100% rename from model/command_request.go rename to server/model/command_request.go diff --git a/model/command_response.go b/server/model/command_response.go similarity index 96% rename from model/command_response.go rename to server/model/command_response.go index cc5111506c..4fd810f373 100644 --- a/model/command_response.go +++ b/server/model/command_response.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/jsonutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/jsonutils" ) const ( diff --git a/model/command_response_test.go b/server/model/command_response_test.go similarity index 100% rename from model/command_response_test.go rename to server/model/command_response_test.go diff --git a/model/command_test.go b/server/model/command_test.go similarity index 100% rename from model/command_test.go rename to server/model/command_test.go diff --git a/model/command_webhook.go b/server/model/command_webhook.go similarity index 100% rename from model/command_webhook.go rename to server/model/command_webhook.go diff --git a/model/command_webhook_test.go b/server/model/command_webhook_test.go similarity index 100% rename from model/command_webhook_test.go rename to server/model/command_webhook_test.go diff --git a/model/compliance.go b/server/model/compliance.go similarity index 100% rename from model/compliance.go rename to server/model/compliance.go diff --git a/model/compliance_post.go b/server/model/compliance_post.go similarity index 100% rename from model/compliance_post.go rename to server/model/compliance_post.go diff --git a/model/compliance_post_test.go b/server/model/compliance_post_test.go similarity index 100% rename from model/compliance_post_test.go rename to server/model/compliance_post_test.go diff --git a/model/config.go b/server/model/config.go similarity index 99% rename from model/config.go rename to server/model/config.go index 4868229bbf..89a7a6da62 100644 --- a/model/config.go +++ b/server/model/config.go @@ -20,8 +20,8 @@ import ( "github.com/mattermost/ldap" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/model/config_test.go b/server/model/config_test.go similarity index 96% rename from model/config_test.go rename to server/model/config_test.go index cedffbcb08..f7972d3b67 100644 --- a/model/config_test.go +++ b/server/model/config_test.go @@ -316,41 +316,6 @@ func TestConfigDefaultNPSPluginState(t *testing.T) { }) } -func TestConfigDefaultPlaybooksPluginState(t *testing.T) { - t.Run("should enable Playbooks plugin by default on enterprise-ready builds", func(t *testing.T) { - BuildEnterpriseReady = "true" - c1 := Config{} - c1.SetDefaults() - - assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable) - }) - - t.Run("should enable Playbooks plugin by default on non-enterprise-ready builds", func(t *testing.T) { - BuildEnterpriseReady = "" - c1 := Config{} - c1.SetDefaults() - - assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable) - }) - - t.Run("should not re-enable Playbooks plugin after it has been disabled", func(t *testing.T) { - BuildEnterpriseReady = "" - c1 := Config{ - PluginSettings: PluginSettings{ - PluginStates: map[string]*PluginState{ - "playbooks": { - Enable: false, - }, - }, - }, - } - - c1.SetDefaults() - - assert.False(t, c1.PluginSettings.PluginStates["playbooks"].Enable) - }) -} - func TestConfigDefaultChannelExportPluginState(t *testing.T) { t.Run("should enable ChannelExport plugin by default on enterprise-ready builds", func(t *testing.T) { BuildEnterpriseReady = "true" @@ -386,30 +351,6 @@ func TestConfigDefaultChannelExportPluginState(t *testing.T) { }) } -func TestConfigDefaultFocalboardPluginState(t *testing.T) { - t.Run("should enable Focalboard plugin by default", func(t *testing.T) { - c1 := Config{} - c1.SetDefaults() - - assert.True(t, c1.PluginSettings.PluginStates["focalboard"].Enable) - }) - - t.Run("should not re-enable focalboard plugin after it has been disabled", func(t *testing.T) { - c1 := Config{ - PluginSettings: PluginSettings{ - PluginStates: map[string]*PluginState{ - "focalboard": { - Enable: false, - }, - }, - }, - } - - c1.SetDefaults() - assert.False(t, c1.PluginSettings.PluginStates["focalboard"].Enable) - }) -} - func TestTeamSettingsIsValidSiteNameEmpty(t *testing.T) { c1 := Config{} c1.SetDefaults() diff --git a/model/custom_status.go b/server/model/custom_status.go similarity index 100% rename from model/custom_status.go rename to server/model/custom_status.go diff --git a/model/data_retention_policy.go b/server/model/data_retention_policy.go similarity index 100% rename from model/data_retention_policy.go rename to server/model/data_retention_policy.go diff --git a/model/draft.go b/server/model/draft.go similarity index 100% rename from model/draft.go rename to server/model/draft.go diff --git a/model/draft_test.go b/server/model/draft_test.go similarity index 100% rename from model/draft_test.go rename to server/model/draft_test.go diff --git a/model/emoji.go b/server/model/emoji.go similarity index 100% rename from model/emoji.go rename to server/model/emoji.go diff --git a/model/emoji_data.go b/server/model/emoji_data.go similarity index 100% rename from model/emoji_data.go rename to server/model/emoji_data.go diff --git a/model/emoji_search.go b/server/model/emoji_search.go similarity index 100% rename from model/emoji_search.go rename to server/model/emoji_search.go diff --git a/model/emoji_test.go b/server/model/emoji_test.go similarity index 100% rename from model/emoji_test.go rename to server/model/emoji_test.go diff --git a/model/feature_flags.go b/server/model/feature_flags.go similarity index 100% rename from model/feature_flags.go rename to server/model/feature_flags.go diff --git a/model/feature_flags_test.go b/server/model/feature_flags_test.go similarity index 100% rename from model/feature_flags_test.go rename to server/model/feature_flags_test.go diff --git a/model/file.go b/server/model/file.go similarity index 100% rename from model/file.go rename to server/model/file.go diff --git a/model/file_info.go b/server/model/file_info.go similarity index 99% rename from model/file_info.go rename to server/model/file_info.go index 554ad2e588..99d9af8fed 100644 --- a/model/file_info.go +++ b/server/model/file_info.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/imgutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils" ) const ( diff --git a/model/file_info_list.go b/server/model/file_info_list.go similarity index 100% rename from model/file_info_list.go rename to server/model/file_info_list.go diff --git a/model/file_info_search_results.go b/server/model/file_info_search_results.go similarity index 100% rename from model/file_info_search_results.go rename to server/model/file_info_search_results.go diff --git a/model/file_info_test.go b/server/model/file_info_test.go similarity index 100% rename from model/file_info_test.go rename to server/model/file_info_test.go diff --git a/model/github_release.go b/server/model/github_release.go similarity index 100% rename from model/github_release.go rename to server/model/github_release.go diff --git a/model/gitlab.go b/server/model/gitlab.go similarity index 100% rename from model/gitlab.go rename to server/model/gitlab.go diff --git a/model/group.go b/server/model/group.go similarity index 100% rename from model/group.go rename to server/model/group.go diff --git a/model/group_member.go b/server/model/group_member.go similarity index 100% rename from model/group_member.go rename to server/model/group_member.go diff --git a/model/group_syncable.go b/server/model/group_syncable.go similarity index 100% rename from model/group_syncable.go rename to server/model/group_syncable.go diff --git a/model/group_syncable_test.go b/server/model/group_syncable_test.go similarity index 100% rename from model/group_syncable_test.go rename to server/model/group_syncable_test.go diff --git a/model/guest_invite.go b/server/model/guest_invite.go similarity index 100% rename from model/guest_invite.go rename to server/model/guest_invite.go diff --git a/model/hosted_customer.go b/server/model/hosted_customer.go similarity index 100% rename from model/hosted_customer.go rename to server/model/hosted_customer.go diff --git a/model/incoming_webhook.go b/server/model/incoming_webhook.go similarity index 100% rename from model/incoming_webhook.go rename to server/model/incoming_webhook.go diff --git a/model/incoming_webhook_test.go b/server/model/incoming_webhook_test.go similarity index 100% rename from model/incoming_webhook_test.go rename to server/model/incoming_webhook_test.go diff --git a/model/initial_load.go b/server/model/initial_load.go similarity index 100% rename from model/initial_load.go rename to server/model/initial_load.go diff --git a/model/insights.go b/server/model/insights.go similarity index 100% rename from model/insights.go rename to server/model/insights.go diff --git a/model/insights_test.go b/server/model/insights_test.go similarity index 100% rename from model/insights_test.go rename to server/model/insights_test.go diff --git a/model/integration_action.go b/server/model/integration_action.go similarity index 100% rename from model/integration_action.go rename to server/model/integration_action.go diff --git a/model/integration_action_test.go b/server/model/integration_action_test.go similarity index 100% rename from model/integration_action_test.go rename to server/model/integration_action_test.go diff --git a/model/integrity.go b/server/model/integrity.go similarity index 100% rename from model/integrity.go rename to server/model/integrity.go diff --git a/model/job.go b/server/model/job.go similarity index 100% rename from model/job.go rename to server/model/job.go diff --git a/model/job_test.go b/server/model/job_test.go similarity index 100% rename from model/job_test.go rename to server/model/job_test.go diff --git a/model/ldap.go b/server/model/ldap.go similarity index 100% rename from model/ldap.go rename to server/model/ldap.go diff --git a/model/license.go b/server/model/license.go similarity index 100% rename from model/license.go rename to server/model/license.go diff --git a/model/license_key.go b/server/model/license_key.go similarity index 100% rename from model/license_key.go rename to server/model/license_key.go diff --git a/model/license_key_test_env.go b/server/model/license_key_test_env.go similarity index 100% rename from model/license_key_test_env.go rename to server/model/license_key_test_env.go diff --git a/model/license_test.go b/server/model/license_test.go similarity index 100% rename from model/license_test.go rename to server/model/license_test.go diff --git a/model/link_metadata.go b/server/model/link_metadata.go similarity index 100% rename from model/link_metadata.go rename to server/model/link_metadata.go diff --git a/model/link_metadata_test.go b/server/model/link_metadata_test.go similarity index 100% rename from model/link_metadata_test.go rename to server/model/link_metadata_test.go diff --git a/model/manifest.go b/server/model/manifest.go similarity index 100% rename from model/manifest.go rename to server/model/manifest.go diff --git a/model/manifest_test.go b/server/model/manifest_test.go similarity index 100% rename from model/manifest_test.go rename to server/model/manifest_test.go diff --git a/model/marketplace_plugin.go b/server/model/marketplace_plugin.go similarity index 100% rename from model/marketplace_plugin.go rename to server/model/marketplace_plugin.go diff --git a/model/member_invite.go b/server/model/member_invite.go similarity index 100% rename from model/member_invite.go rename to server/model/member_invite.go diff --git a/model/mention_map.go b/server/model/mention_map.go similarity index 100% rename from model/mention_map.go rename to server/model/mention_map.go diff --git a/model/mention_map_test.go b/server/model/mention_map_test.go similarity index 100% rename from model/mention_map_test.go rename to server/model/mention_map_test.go diff --git a/model/message_export.go b/server/model/message_export.go similarity index 100% rename from model/message_export.go rename to server/model/message_export.go diff --git a/model/mfa_secret.go b/server/model/mfa_secret.go similarity index 100% rename from model/mfa_secret.go rename to server/model/mfa_secret.go diff --git a/model/migration.go b/server/model/migration.go similarity index 100% rename from model/migration.go rename to server/model/migration.go diff --git a/model/modeltestlib_test.go b/server/model/modeltestlib_test.go similarity index 100% rename from model/modeltestlib_test.go rename to server/model/modeltestlib_test.go diff --git a/model/notify_admin.go b/server/model/notify_admin.go similarity index 100% rename from model/notify_admin.go rename to server/model/notify_admin.go diff --git a/model/oauth.go b/server/model/oauth.go similarity index 100% rename from model/oauth.go rename to server/model/oauth.go diff --git a/model/oauth_test.go b/server/model/oauth_test.go similarity index 100% rename from model/oauth_test.go rename to server/model/oauth_test.go diff --git a/model/oauthproviders/gitlab/gitlab.go b/server/model/oauthproviders/gitlab/gitlab.go similarity index 95% rename from model/oauthproviders/gitlab/gitlab.go rename to server/model/oauthproviders/gitlab/gitlab.go index 01b2aee728..8e41124b9d 100644 --- a/model/oauthproviders/gitlab/gitlab.go +++ b/server/model/oauthproviders/gitlab/gitlab.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) type GitLabProvider struct { diff --git a/model/onboarding.go b/server/model/onboarding.go similarity index 100% rename from model/onboarding.go rename to server/model/onboarding.go diff --git a/model/outgoing_webhook.go b/server/model/outgoing_webhook.go similarity index 100% rename from model/outgoing_webhook.go rename to server/model/outgoing_webhook.go diff --git a/model/outgoing_webhook_test.go b/server/model/outgoing_webhook_test.go similarity index 100% rename from model/outgoing_webhook_test.go rename to server/model/outgoing_webhook_test.go diff --git a/model/permalink.go b/server/model/permalink.go similarity index 100% rename from model/permalink.go rename to server/model/permalink.go diff --git a/model/permission.go b/server/model/permission.go similarity index 100% rename from model/permission.go rename to server/model/permission.go diff --git a/model/plugin_cluster_event.go b/server/model/plugin_cluster_event.go similarity index 100% rename from model/plugin_cluster_event.go rename to server/model/plugin_cluster_event.go diff --git a/model/plugin_constants.go b/server/model/plugin_constants.go similarity index 100% rename from model/plugin_constants.go rename to server/model/plugin_constants.go diff --git a/model/plugin_event_data.go b/server/model/plugin_event_data.go similarity index 100% rename from model/plugin_event_data.go rename to server/model/plugin_event_data.go diff --git a/model/plugin_key_value.go b/server/model/plugin_key_value.go similarity index 100% rename from model/plugin_key_value.go rename to server/model/plugin_key_value.go diff --git a/model/plugin_key_value_test.go b/server/model/plugin_key_value_test.go similarity index 100% rename from model/plugin_key_value_test.go rename to server/model/plugin_key_value_test.go diff --git a/model/plugin_kvset_options.go b/server/model/plugin_kvset_options.go similarity index 100% rename from model/plugin_kvset_options.go rename to server/model/plugin_kvset_options.go diff --git a/model/plugin_on_install_event.go b/server/model/plugin_on_install_event.go similarity index 100% rename from model/plugin_on_install_event.go rename to server/model/plugin_on_install_event.go diff --git a/model/plugin_status.go b/server/model/plugin_status.go similarity index 100% rename from model/plugin_status.go rename to server/model/plugin_status.go diff --git a/model/plugin_valid.go b/server/model/plugin_valid.go similarity index 100% rename from model/plugin_valid.go rename to server/model/plugin_valid.go diff --git a/model/plugin_valid_test.go b/server/model/plugin_valid_test.go similarity index 100% rename from model/plugin_valid_test.go rename to server/model/plugin_valid_test.go diff --git a/model/plugins_response.go b/server/model/plugins_response.go similarity index 100% rename from model/plugins_response.go rename to server/model/plugins_response.go diff --git a/model/post.go b/server/model/post.go similarity index 99% rename from model/post.go rename to server/model/post.go index 7447c91214..d047216735 100644 --- a/model/post.go +++ b/server/model/post.go @@ -15,7 +15,7 @@ import ( "sync" "unicode/utf8" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/markdown" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown" ) const ( diff --git a/model/post_acknowledgement.go b/server/model/post_acknowledgement.go similarity index 100% rename from model/post_acknowledgement.go rename to server/model/post_acknowledgement.go diff --git a/model/post_embed.go b/server/model/post_embed.go similarity index 100% rename from model/post_embed.go rename to server/model/post_embed.go diff --git a/model/post_info.go b/server/model/post_info.go similarity index 100% rename from model/post_info.go rename to server/model/post_info.go diff --git a/model/post_list.go b/server/model/post_list.go similarity index 100% rename from model/post_list.go rename to server/model/post_list.go diff --git a/model/post_list_test.go b/server/model/post_list_test.go similarity index 100% rename from model/post_list_test.go rename to server/model/post_list_test.go diff --git a/model/post_metadata.go b/server/model/post_metadata.go similarity index 100% rename from model/post_metadata.go rename to server/model/post_metadata.go diff --git a/model/post_search_results.go b/server/model/post_search_results.go similarity index 100% rename from model/post_search_results.go rename to server/model/post_search_results.go diff --git a/model/post_test.go b/server/model/post_test.go similarity index 100% rename from model/post_test.go rename to server/model/post_test.go diff --git a/model/preference.go b/server/model/preference.go similarity index 100% rename from model/preference.go rename to server/model/preference.go diff --git a/model/preference_test.go b/server/model/preference_test.go similarity index 100% rename from model/preference_test.go rename to server/model/preference_test.go diff --git a/model/product_notices.go b/server/model/product_notices.go similarity index 100% rename from model/product_notices.go rename to server/model/product_notices.go diff --git a/model/push_notification.go b/server/model/push_notification.go similarity index 100% rename from model/push_notification.go rename to server/model/push_notification.go diff --git a/model/push_notification_test.go b/server/model/push_notification_test.go similarity index 100% rename from model/push_notification_test.go rename to server/model/push_notification_test.go diff --git a/model/push_response.go b/server/model/push_response.go similarity index 100% rename from model/push_response.go rename to server/model/push_response.go diff --git a/model/push_response_test.go b/server/model/push_response_test.go similarity index 100% rename from model/push_response_test.go rename to server/model/push_response_test.go diff --git a/model/reaction.go b/server/model/reaction.go similarity index 100% rename from model/reaction.go rename to server/model/reaction.go diff --git a/model/reaction_test.go b/server/model/reaction_test.go similarity index 100% rename from model/reaction_test.go rename to server/model/reaction_test.go diff --git a/model/remote_cluster.go b/server/model/remote_cluster.go similarity index 100% rename from model/remote_cluster.go rename to server/model/remote_cluster.go diff --git a/model/remote_cluster_test.go b/server/model/remote_cluster_test.go similarity index 100% rename from model/remote_cluster_test.go rename to server/model/remote_cluster_test.go diff --git a/model/role.go b/server/model/role.go similarity index 100% rename from model/role.go rename to server/model/role.go diff --git a/model/role_test.go b/server/model/role_test.go similarity index 100% rename from model/role_test.go rename to server/model/role_test.go diff --git a/model/saml.go b/server/model/saml.go similarity index 100% rename from model/saml.go rename to server/model/saml.go diff --git a/model/scheduled_task.go b/server/model/scheduled_task.go similarity index 100% rename from model/scheduled_task.go rename to server/model/scheduled_task.go diff --git a/model/scheduled_task_test.go b/server/model/scheduled_task_test.go similarity index 100% rename from model/scheduled_task_test.go rename to server/model/scheduled_task_test.go diff --git a/model/scheme.go b/server/model/scheme.go similarity index 100% rename from model/scheme.go rename to server/model/scheme.go diff --git a/model/search_params.go b/server/model/search_params.go similarity index 100% rename from model/search_params.go rename to server/model/search_params.go diff --git a/model/search_params_test.go b/server/model/search_params_test.go similarity index 100% rename from model/search_params_test.go rename to server/model/search_params_test.go diff --git a/model/security_bulletin.go b/server/model/security_bulletin.go similarity index 100% rename from model/security_bulletin.go rename to server/model/security_bulletin.go diff --git a/model/session.go b/server/model/session.go similarity index 98% rename from model/session.go rename to server/model/session.go index d3f878004c..a41a018bfe 100644 --- a/model/session.go +++ b/server/model/session.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/model/session_serial_gen.go b/server/model/session_serial_gen.go similarity index 100% rename from model/session_serial_gen.go rename to server/model/session_serial_gen.go diff --git a/model/session_test.go b/server/model/session_test.go similarity index 100% rename from model/session_test.go rename to server/model/session_test.go diff --git a/model/shared_channel.go b/server/model/shared_channel.go similarity index 100% rename from model/shared_channel.go rename to server/model/shared_channel.go diff --git a/model/shared_channel_test.go b/server/model/shared_channel_test.go similarity index 100% rename from model/shared_channel_test.go rename to server/model/shared_channel_test.go diff --git a/model/slack_attachment.go b/server/model/slack_attachment.go similarity index 100% rename from model/slack_attachment.go rename to server/model/slack_attachment.go diff --git a/model/slack_attachment_test.go b/server/model/slack_attachment_test.go similarity index 100% rename from model/slack_attachment_test.go rename to server/model/slack_attachment_test.go diff --git a/model/slack_compatibility.go b/server/model/slack_compatibility.go similarity index 100% rename from model/slack_compatibility.go rename to server/model/slack_compatibility.go diff --git a/model/slack_compatibility_test.go b/server/model/slack_compatibility_test.go similarity index 100% rename from model/slack_compatibility_test.go rename to server/model/slack_compatibility_test.go diff --git a/model/status.go b/server/model/status.go similarity index 100% rename from model/status.go rename to server/model/status.go diff --git a/model/status_test.go b/server/model/status_test.go similarity index 100% rename from model/status_test.go rename to server/model/status_test.go diff --git a/model/suggest_command.go b/server/model/suggest_command.go similarity index 100% rename from model/suggest_command.go rename to server/model/suggest_command.go diff --git a/model/switch_request.go b/server/model/switch_request.go similarity index 100% rename from model/switch_request.go rename to server/model/switch_request.go diff --git a/model/system.go b/server/model/system.go similarity index 100% rename from model/system.go rename to server/model/system.go diff --git a/model/team.go b/server/model/team.go similarity index 100% rename from model/team.go rename to server/model/team.go diff --git a/model/team_member.go b/server/model/team_member.go similarity index 100% rename from model/team_member.go rename to server/model/team_member.go diff --git a/model/team_member_serial_gen.go b/server/model/team_member_serial_gen.go similarity index 100% rename from model/team_member_serial_gen.go rename to server/model/team_member_serial_gen.go diff --git a/model/team_member_test.go b/server/model/team_member_test.go similarity index 100% rename from model/team_member_test.go rename to server/model/team_member_test.go diff --git a/model/team_search.go b/server/model/team_search.go similarity index 100% rename from model/team_search.go rename to server/model/team_search.go diff --git a/model/team_stats.go b/server/model/team_stats.go similarity index 100% rename from model/team_stats.go rename to server/model/team_stats.go diff --git a/model/team_test.go b/server/model/team_test.go similarity index 100% rename from model/team_test.go rename to server/model/team_test.go diff --git a/model/terms_of_service.go b/server/model/terms_of_service.go similarity index 100% rename from model/terms_of_service.go rename to server/model/terms_of_service.go diff --git a/model/terms_of_service_test.go b/server/model/terms_of_service_test.go similarity index 100% rename from model/terms_of_service_test.go rename to server/model/terms_of_service_test.go diff --git a/model/testdata/markdown-sample-with-rewritten-image-urls.md b/server/model/testdata/markdown-sample-with-rewritten-image-urls.md similarity index 100% rename from model/testdata/markdown-sample-with-rewritten-image-urls.md rename to server/model/testdata/markdown-sample-with-rewritten-image-urls.md diff --git a/model/testdata/markdown-sample.md b/server/model/testdata/markdown-sample.md similarity index 100% rename from model/testdata/markdown-sample.md rename to server/model/testdata/markdown-sample.md diff --git a/model/thread.go b/server/model/thread.go similarity index 100% rename from model/thread.go rename to server/model/thread.go diff --git a/model/token.go b/server/model/token.go similarity index 100% rename from model/token.go rename to server/model/token.go diff --git a/model/true_up_review_profile.go b/server/model/true_up_review_profile.go similarity index 100% rename from model/true_up_review_profile.go rename to server/model/true_up_review_profile.go diff --git a/model/typing_request.go b/server/model/typing_request.go similarity index 100% rename from model/typing_request.go rename to server/model/typing_request.go diff --git a/model/upload_session.go b/server/model/upload_session.go similarity index 100% rename from model/upload_session.go rename to server/model/upload_session.go diff --git a/model/upload_session_test.go b/server/model/upload_session_test.go similarity index 100% rename from model/upload_session_test.go rename to server/model/upload_session_test.go diff --git a/model/usage.go b/server/model/usage.go similarity index 100% rename from model/usage.go rename to server/model/usage.go diff --git a/model/user.go b/server/model/user.go similarity index 99% rename from model/user.go rename to server/model/user.go index 9466343bc6..5fbbd47d6f 100644 --- a/model/user.go +++ b/server/model/user.go @@ -17,8 +17,8 @@ import ( "golang.org/x/crypto/bcrypt" "golang.org/x/text/language" - "github.com/mattermost/mattermost-server/v6/server/platform/services/timezones" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/model/user_access_token.go b/server/model/user_access_token.go similarity index 100% rename from model/user_access_token.go rename to server/model/user_access_token.go diff --git a/model/user_access_token_search.go b/server/model/user_access_token_search.go similarity index 100% rename from model/user_access_token_search.go rename to server/model/user_access_token_search.go diff --git a/model/user_access_token_test.go b/server/model/user_access_token_test.go similarity index 100% rename from model/user_access_token_test.go rename to server/model/user_access_token_test.go diff --git a/model/user_autocomplete.go b/server/model/user_autocomplete.go similarity index 100% rename from model/user_autocomplete.go rename to server/model/user_autocomplete.go diff --git a/model/user_count.go b/server/model/user_count.go similarity index 100% rename from model/user_count.go rename to server/model/user_count.go diff --git a/model/user_get.go b/server/model/user_get.go similarity index 100% rename from model/user_get.go rename to server/model/user_get.go diff --git a/model/user_search.go b/server/model/user_search.go similarity index 100% rename from model/user_search.go rename to server/model/user_search.go diff --git a/model/user_serial_gen.go b/server/model/user_serial_gen.go similarity index 100% rename from model/user_serial_gen.go rename to server/model/user_serial_gen.go diff --git a/model/user_terms_of_service.go b/server/model/user_terms_of_service.go similarity index 100% rename from model/user_terms_of_service.go rename to server/model/user_terms_of_service.go diff --git a/model/user_terms_of_service_test.go b/server/model/user_terms_of_service_test.go similarity index 100% rename from model/user_terms_of_service_test.go rename to server/model/user_terms_of_service_test.go diff --git a/model/user_test.go b/server/model/user_test.go similarity index 100% rename from model/user_test.go rename to server/model/user_test.go diff --git a/model/users_stats.go b/server/model/users_stats.go similarity index 100% rename from model/users_stats.go rename to server/model/users_stats.go diff --git a/model/utils.go b/server/model/utils.go similarity index 99% rename from model/utils.go rename to server/model/utils.go index 51ae486a6d..a46bddabae 100644 --- a/model/utils.go +++ b/server/model/utils.go @@ -25,7 +25,7 @@ import ( "github.com/pborman/uuid" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) const ( diff --git a/model/utils_test.go b/server/model/utils_test.go similarity index 100% rename from model/utils_test.go rename to server/model/utils_test.go diff --git a/model/version.go b/server/model/version.go similarity index 100% rename from model/version.go rename to server/model/version.go diff --git a/model/version_test.go b/server/model/version_test.go similarity index 100% rename from model/version_test.go rename to server/model/version_test.go diff --git a/model/websocket_client.go b/server/model/websocket_client.go similarity index 99% rename from model/websocket_client.go rename to server/model/websocket_client.go index fa1ce5ffc1..58f6d62c58 100644 --- a/model/websocket_client.go +++ b/server/model/websocket_client.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/gorilla/websocket" "github.com/vmihailenco/msgpack/v5" diff --git a/model/websocket_client_test.go b/server/model/websocket_client_test.go similarity index 100% rename from model/websocket_client_test.go rename to server/model/websocket_client_test.go diff --git a/model/websocket_message.go b/server/model/websocket_message.go similarity index 100% rename from model/websocket_message.go rename to server/model/websocket_message.go diff --git a/model/websocket_message_test.go b/server/model/websocket_message_test.go similarity index 100% rename from model/websocket_message_test.go rename to server/model/websocket_message_test.go diff --git a/model/websocket_request.go b/server/model/websocket_request.go similarity index 94% rename from model/websocket_request.go rename to server/model/websocket_request.go index 5ba72d8367..1abea988cb 100644 --- a/model/websocket_request.go +++ b/server/model/websocket_request.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" "github.com/vmihailenco/msgpack/v5" ) diff --git a/model/worktemplate.go b/server/model/worktemplate.go similarity index 100% rename from model/worktemplate.go rename to server/model/worktemplate.go diff --git a/server/platform/services/awsmeter/awsmeter.go b/server/platform/services/awsmeter/awsmeter.go index e0034cdfb9..7d506ba183 100644 --- a/server/platform/services/awsmeter/awsmeter.go +++ b/server/platform/services/awsmeter/awsmeter.go @@ -17,9 +17,9 @@ import ( "github.com/aws/aws-sdk-go/service/marketplacemetering/marketplacemeteringiface" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type AwsMeter struct { diff --git a/server/platform/services/awsmeter/awsmeter_test.go b/server/platform/services/awsmeter/awsmeter_test.go index 6fdbce2898..2fbbdc8284 100644 --- a/server/platform/services/awsmeter/awsmeter_test.go +++ b/server/platform/services/awsmeter/awsmeter_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type mockMarketplaceMeteringClient struct { diff --git a/server/platform/services/cache/cache.go b/server/platform/services/cache/cache.go index 54323b2e97..60d003e93b 100644 --- a/server/platform/services/cache/cache.go +++ b/server/platform/services/cache/cache.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // ErrKeyNotFound is the error when the given key is not found diff --git a/server/platform/services/cache/lru.go b/server/platform/services/cache/lru.go index 08852f02c4..ba7d6f98f2 100644 --- a/server/platform/services/cache/lru.go +++ b/server/platform/services/cache/lru.go @@ -11,7 +11,7 @@ import ( "github.com/tinylib/msgp/msgp" "github.com/vmihailenco/msgpack/v5" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // LRU is a thread-safe fixed size LRU cache. diff --git a/server/platform/services/cache/lru_striped.go b/server/platform/services/cache/lru_striped.go index 5ce231b0c4..aecd89ffa7 100644 --- a/server/platform/services/cache/lru_striped.go +++ b/server/platform/services/cache/lru_striped.go @@ -10,7 +10,7 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // LRUStriped keeps LRU caches in buckets in order to lower mutex contention. diff --git a/server/platform/services/cache/lru_striped_bench_test.go b/server/platform/services/cache/lru_striped_bench_test.go index 42fbc9f35b..8b88accf0b 100644 --- a/server/platform/services/cache/lru_striped_bench_test.go +++ b/server/platform/services/cache/lru_striped_bench_test.go @@ -11,7 +11,7 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" + "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" ) const ( diff --git a/server/platform/services/cache/lru_striped_test.go b/server/platform/services/cache/lru_striped_test.go index fe541c5b52..030b010e55 100644 --- a/server/platform/services/cache/lru_striped_test.go +++ b/server/platform/services/cache/lru_striped_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func makeLRUPredictableTestData(num int) [][2]string { diff --git a/server/platform/services/cache/lru_test.go b/server/platform/services/cache/lru_test.go index 54b3cf814a..ecf03e1446 100644 --- a/server/platform/services/cache/lru_test.go +++ b/server/platform/services/cache/lru_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestLRU(t *testing.T) { diff --git a/server/platform/services/cache/mocks/Provider.go b/server/platform/services/cache/mocks/Provider.go index 0e96ceb618..3fb26fb355 100644 --- a/server/platform/services/cache/mocks/Provider.go +++ b/server/platform/services/cache/mocks/Provider.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - cache "github.com/mattermost/mattermost-server/v6/server/platform/services/cache" + cache "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" ) // Provider is an autogenerated mock type for the Provider type diff --git a/server/platform/services/cache/provider.go b/server/platform/services/cache/provider.go index a55dabf429..586a1265d8 100644 --- a/server/platform/services/cache/provider.go +++ b/server/platform/services/cache/provider.go @@ -6,7 +6,7 @@ package cache import ( "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // CacheOptions contains options for initializing a cache diff --git a/server/platform/services/cache/provider_test.go b/server/platform/services/cache/provider_test.go index 9f9a4debb1..af5f86cbeb 100644 --- a/server/platform/services/cache/provider_test.go +++ b/server/platform/services/cache/provider_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestNewCache(t *testing.T) { diff --git a/server/platform/services/configservice/configservice.go b/server/platform/services/configservice/configservice.go index 6bf2fb420e..82a4cc106b 100644 --- a/server/platform/services/configservice/configservice.go +++ b/server/platform/services/configservice/configservice.go @@ -4,7 +4,7 @@ package configservice import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // An interface representing something that contains a Config, such as the app.App struct diff --git a/server/platform/services/docextractor/combine.go b/server/platform/services/docextractor/combine.go index f77be14938..209e36cbba 100644 --- a/server/platform/services/docextractor/combine.go +++ b/server/platform/services/docextractor/combine.go @@ -6,7 +6,7 @@ package docextractor import ( "io" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type combineExtractor struct { diff --git a/server/platform/services/docextractor/docextractor_test.go b/server/platform/services/docextractor/docextractor_test.go index 71cdc1da33..aa17f1fbb8 100644 --- a/server/platform/services/docextractor/docextractor_test.go +++ b/server/platform/services/docextractor/docextractor_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" ) func TestExtract(t *testing.T) { diff --git a/server/platform/services/docextractor/pdf_test.go b/server/platform/services/docextractor/pdf_test.go index 65ca72603f..b6eea1a410 100644 --- a/server/platform/services/docextractor/pdf_test.go +++ b/server/platform/services/docextractor/pdf_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" ) func TestPdfEmptyFile(t *testing.T) { diff --git a/server/platform/services/httpservice/httpservice.go b/server/platform/services/httpservice/httpservice.go index 36bfbd0fbc..6572b0f1b9 100644 --- a/server/platform/services/httpservice/httpservice.go +++ b/server/platform/services/httpservice/httpservice.go @@ -10,7 +10,7 @@ import ( "time" "unicode" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" ) // HTTPService wraps the functionality for making http requests to provide some improvements to the default client diff --git a/server/platform/services/imageproxy/atmos_camo_test.go b/server/platform/services/imageproxy/atmos_camo_test.go index 8b5d321b51..aefd882a02 100644 --- a/server/platform/services/imageproxy/atmos_camo_test.go +++ b/server/platform/services/imageproxy/atmos_camo_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) func makeTestAtmosCamoProxy() *ImageProxy { diff --git a/server/platform/services/imageproxy/imageproxy.go b/server/platform/services/imageproxy/imageproxy.go index a2b63229e7..87a7f2a6d4 100644 --- a/server/platform/services/imageproxy/imageproxy.go +++ b/server/platform/services/imageproxy/imageproxy.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/configservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ErrNotEnabled = Error{errors.New("imageproxy.ImageProxy: image proxy not enabled")} diff --git a/server/platform/services/imageproxy/local.go b/server/platform/services/imageproxy/local.go index 03e8271b13..4a45079260 100644 --- a/server/platform/services/imageproxy/local.go +++ b/server/platform/services/imageproxy/local.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var imageContentTypes = []string{ diff --git a/server/platform/services/imageproxy/local_test.go b/server/platform/services/imageproxy/local_test.go index b7681cdcf9..e97bad1bcd 100644 --- a/server/platform/services/imageproxy/local_test.go +++ b/server/platform/services/imageproxy/local_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) func makeTestLocalProxy() *ImageProxy { diff --git a/server/platform/services/marketplace/client.go b/server/platform/services/marketplace/client.go index 37e6568d30..3003952792 100644 --- a/server/platform/services/marketplace/client.go +++ b/server/platform/services/marketplace/client.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) // Client is the programmatic interface to the marketplace server API. diff --git a/server/platform/services/remotecluster/invitation.go b/server/platform/services/remotecluster/invitation.go index 73cbeb4fa2..3667470038 100644 --- a/server/platform/services/remotecluster/invitation.go +++ b/server/platform/services/remotecluster/invitation.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // AcceptInvitation is called when accepting an invitation to connect with a remote cluster. diff --git a/server/platform/services/remotecluster/mocks_test.go b/server/platform/services/remotecluster/mocks_test.go index 5e97f60a5d..83896b343b 100644 --- a/server/platform/services/remotecluster/mocks_test.go +++ b/server/platform/services/remotecluster/mocks_test.go @@ -6,12 +6,12 @@ package remotecluster import ( "context" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type mockServer struct { diff --git a/server/platform/services/remotecluster/ping.go b/server/platform/services/remotecluster/ping.go index f12e759faf..18d3f6f196 100644 --- a/server/platform/services/remotecluster/ping.go +++ b/server/platform/services/remotecluster/ping.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // pingLoop periodically sends a ping to all remote clusters. diff --git a/server/platform/services/remotecluster/ping_test.go b/server/platform/services/remotecluster/ping_test.go index 71e953b803..8e60cc98f0 100644 --- a/server/platform/services/remotecluster/ping_test.go +++ b/server/platform/services/remotecluster/ping_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/platform/services/remotecluster/recv.go b/server/platform/services/remotecluster/recv.go index 8eb9b95b44..39c30aab84 100644 --- a/server/platform/services/remotecluster/recv.go +++ b/server/platform/services/remotecluster/recv.go @@ -6,8 +6,8 @@ package remotecluster import ( "fmt" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // ReceiveIncomingMsg is called by the Rest API layer, or websocket layer (future), when a Remote Cluster diff --git a/server/platform/services/remotecluster/send_test.go b/server/platform/services/remotecluster/send_test.go index 6d00b6e3c5..489bef0a74 100644 --- a/server/platform/services/remotecluster/send_test.go +++ b/server/platform/services/remotecluster/send_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/platform/services/remotecluster/sendfile.go b/server/platform/services/remotecluster/sendfile.go index dcc9c4a0e6..dec27083d7 100644 --- a/server/platform/services/remotecluster/sendfile.go +++ b/server/platform/services/remotecluster/sendfile.go @@ -13,9 +13,9 @@ import ( "path" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SendFileResultFunc func(us *model.UploadSession, rc *model.RemoteCluster, resp *Response, err error) diff --git a/server/platform/services/remotecluster/sendmsg.go b/server/platform/services/remotecluster/sendmsg.go index e4d708ec66..d31f172d28 100644 --- a/server/platform/services/remotecluster/sendmsg.go +++ b/server/platform/services/remotecluster/sendmsg.go @@ -17,8 +17,8 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SendMsgResultFunc func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response, err error) diff --git a/server/platform/services/remotecluster/sendprofileImage.go b/server/platform/services/remotecluster/sendprofileImage.go index 1a8891a9fe..6a852111ea 100644 --- a/server/platform/services/remotecluster/sendprofileImage.go +++ b/server/platform/services/remotecluster/sendprofileImage.go @@ -14,8 +14,8 @@ import ( "path" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SendProfileImageResultFunc func(userId string, rc *model.RemoteCluster, resp *Response, err error) diff --git a/server/platform/services/remotecluster/sendprofileImage_test.go b/server/platform/services/remotecluster/sendprofileImage_test.go index 48e7b3301f..7c09570aac 100644 --- a/server/platform/services/remotecluster/sendprofileImage_test.go +++ b/server/platform/services/remotecluster/sendprofileImage_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/platform/services/remotecluster/service.go b/server/platform/services/remotecluster/service.go index 8db28f7f42..ee6fb68ebe 100644 --- a/server/platform/services/remotecluster/service.go +++ b/server/platform/services/remotecluster/service.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/services/remotecluster/service_test.go b/server/platform/services/remotecluster/service_test.go index 1e9bbd5b63..7b543757cc 100644 --- a/server/platform/services/remotecluster/service_test.go +++ b/server/platform/services/remotecluster/service_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestService_AddTopicListener(t *testing.T) { diff --git a/server/platform/services/searchengine/bleveengine/bleve.go b/server/platform/services/searchengine/bleveengine/bleve.go index d26acd17cc..1b2efc7944 100644 --- a/server/platform/services/searchengine/bleveengine/bleve.go +++ b/server/platform/services/searchengine/bleveengine/bleve.go @@ -17,8 +17,8 @@ import ( "github.com/blevesearch/bleve/v2/analysis/analyzer/standard" "github.com/blevesearch/bleve/v2/mapping" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/services/searchengine/bleveengine/bleve_test.go b/server/platform/services/searchengine/bleveengine/bleve_test.go index e33163f567..128db17e48 100644 --- a/server/platform/services/searchengine/bleveengine/bleve_test.go +++ b/server/platform/services/searchengine/bleveengine/bleve_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchlayer" - "github.com/mattermost/mattermost-server/v6/server/channels/store/searchtest" - "github.com/mattermost/mattermost-server/v6/server/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/testlib" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) type BleveEngineTestSuite struct { diff --git a/server/platform/services/searchengine/bleveengine/common.go b/server/platform/services/searchengine/bleveengine/common.go index 7bd1fee7df..fed7992bc8 100644 --- a/server/platform/services/searchengine/bleveengine/common.go +++ b/server/platform/services/searchengine/bleveengine/common.go @@ -6,8 +6,8 @@ package bleveengine import ( "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) type BLVChannel struct { diff --git a/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go b/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go index 4eefe7b9b0..1dbdfc9a44 100644 --- a/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go +++ b/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go b/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go index 19f01e49e5..afe96b5283 100644 --- a/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go +++ b/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/testutils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" ) func TestBleveIndexer(t *testing.T) { diff --git a/server/platform/services/searchengine/bleveengine/search.go b/server/platform/services/searchengine/bleveengine/search.go index 069f1c6433..5c993c7fde 100644 --- a/server/platform/services/searchengine/bleveengine/search.go +++ b/server/platform/services/searchengine/bleveengine/search.go @@ -10,8 +10,8 @@ import ( "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/search/query" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const DeletePostsBatchSize = 500 diff --git a/server/platform/services/searchengine/bleveengine/testlib.go b/server/platform/services/searchengine/bleveengine/testlib.go index 5c03856bb2..73b98b0d62 100644 --- a/server/platform/services/searchengine/bleveengine/testlib.go +++ b/server/platform/services/searchengine/bleveengine/testlib.go @@ -6,7 +6,7 @@ package bleveengine import ( "fmt" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func createPost(userId string, channelId string) *model.Post { diff --git a/server/platform/services/searchengine/interface.go b/server/platform/services/searchengine/interface.go index ed83a0e5b3..2c2cf3f726 100644 --- a/server/platform/services/searchengine/interface.go +++ b/server/platform/services/searchengine/interface.go @@ -6,7 +6,7 @@ package searchengine import ( "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type SearchEngineInterface interface { diff --git a/server/platform/services/searchengine/mocks/SearchEngineInterface.go b/server/platform/services/searchengine/mocks/SearchEngineInterface.go index db9ddfcb97..bed0ef16f2 100644 --- a/server/platform/services/searchengine/mocks/SearchEngineInterface.go +++ b/server/platform/services/searchengine/mocks/SearchEngineInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" time "time" diff --git a/server/platform/services/searchengine/searchengine.go b/server/platform/services/searchengine/searchengine.go index 6530b93723..a80defd6f3 100644 --- a/server/platform/services/searchengine/searchengine.go +++ b/server/platform/services/searchengine/searchengine.go @@ -4,7 +4,7 @@ package searchengine import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func NewBroker(cfg *model.Config) *Broker { diff --git a/server/platform/services/searchengine/searchengine_test.go b/server/platform/services/searchengine/searchengine_test.go index 00f806f3df..6672b7c575 100644 --- a/server/platform/services/searchengine/searchengine_test.go +++ b/server/platform/services/searchengine/searchengine_test.go @@ -6,8 +6,8 @@ package searchengine import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" "github.com/stretchr/testify/assert" ) diff --git a/server/platform/services/searchengine/utils.go b/server/platform/services/searchengine/utils.go index 71e3c4f3f4..4e19c698e9 100644 --- a/server/platform/services/searchengine/utils.go +++ b/server/platform/services/searchengine/utils.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" ) var EmailRegex = regexp.MustCompile(`^[^\s"]+@[^\s"]+$`) diff --git a/server/platform/services/sharedchannel/attachment.go b/server/platform/services/sharedchannel/attachment.go index cd922f720e..951a821f8a 100644 --- a/server/platform/services/sharedchannel/attachment.go +++ b/server/platform/services/sharedchannel/attachment.go @@ -10,10 +10,10 @@ import ( "fmt" "sync" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // postsToAttachments returns the file attachments for a slice of posts that need to be synchronized. diff --git a/server/platform/services/sharedchannel/channelinvite.go b/server/platform/services/sharedchannel/channelinvite.go index 2116da3a66..041434ba4e 100644 --- a/server/platform/services/sharedchannel/channelinvite.go +++ b/server/platform/services/sharedchannel/channelinvite.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // channelInviteMsg represents an invitation for a remote cluster to start sharing a channel. diff --git a/server/platform/services/sharedchannel/channelinvite_test.go b/server/platform/services/sharedchannel/channelinvite_test.go index aa813d510b..74e55d68e7 100644 --- a/server/platform/services/sharedchannel/channelinvite_test.go +++ b/server/platform/services/sharedchannel/channelinvite_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestOnReceiveChannelInvite(t *testing.T) { diff --git a/server/platform/services/sharedchannel/mock_AppIface_test.go b/server/platform/services/sharedchannel/mock_AppIface_test.go index eddbedf08a..a6f67f82ac 100644 --- a/server/platform/services/sharedchannel/mock_AppIface_test.go +++ b/server/platform/services/sharedchannel/mock_AppIface_test.go @@ -5,12 +5,12 @@ package sharedchannel import ( - filestore "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" + filestore "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" - request "github.com/mattermost/mattermost-server/v6/server/channels/app/request" + request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" ) // MockAppIface is an autogenerated mock type for the AppIface type diff --git a/server/platform/services/sharedchannel/mock_ServerIface_test.go b/server/platform/services/sharedchannel/mock_ServerIface_test.go index 9643eef0a0..214943a098 100644 --- a/server/platform/services/sharedchannel/mock_ServerIface_test.go +++ b/server/platform/services/sharedchannel/mock_ServerIface_test.go @@ -5,14 +5,14 @@ package sharedchannel import ( - mlog "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + mlog "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" - remotecluster "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" + remotecluster "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - store "github.com/mattermost/mattermost-server/v6/server/channels/store" + store "github.com/mattermost/mattermost-server/server/v8/channels/store" ) // MockServerIface is an autogenerated mock type for the ServerIface type diff --git a/server/platform/services/sharedchannel/msg.go b/server/platform/services/sharedchannel/msg.go index 90d76d2c7e..a7f3b46665 100644 --- a/server/platform/services/sharedchannel/msg.go +++ b/server/platform/services/sharedchannel/msg.go @@ -6,7 +6,7 @@ package sharedchannel import ( "encoding/json" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // syncMsg represents a change in content (post add/edit/delete, reaction add/remove, users). diff --git a/server/platform/services/sharedchannel/permalink.go b/server/platform/services/sharedchannel/permalink.go index b33d70cdf2..5e4cfd5fcd 100644 --- a/server/platform/services/sharedchannel/permalink.go +++ b/server/platform/services/sharedchannel/permalink.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/platform/services/sharedchannel/permalink_test.go b/server/platform/services/sharedchannel/permalink_test.go index cc3a9687d1..4728d79daf 100644 --- a/server/platform/services/sharedchannel/permalink_test.go +++ b/server/platform/services/sharedchannel/permalink_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestProcessPermalinkToRemote(t *testing.T) { diff --git a/server/platform/services/sharedchannel/service.go b/server/platform/services/sharedchannel/service.go index b6da9fe5dc..fdf0c7a9eb 100644 --- a/server/platform/services/sharedchannel/service.go +++ b/server/platform/services/sharedchannel/service.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/services/sharedchannel/sync_recv.go b/server/platform/services/sharedchannel/sync_recv.go index 02ff7b14a3..0f5c493084 100644 --- a/server/platform/services/sharedchannel/sync_recv.go +++ b/server/platform/services/sharedchannel/sync_recv.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (scs *Service) onReceiveSyncMessage(msg model.RemoteClusterMsg, rc *model.RemoteCluster, response *remotecluster.Response) error { diff --git a/server/platform/services/sharedchannel/sync_send.go b/server/platform/services/sharedchannel/sync_send.go index 213808f509..883a4c73d9 100644 --- a/server/platform/services/sharedchannel/sync_send.go +++ b/server/platform/services/sharedchannel/sync_send.go @@ -8,11 +8,11 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type syncTask struct { diff --git a/server/platform/services/sharedchannel/sync_send_remote.go b/server/platform/services/sharedchannel/sync_send_remote.go index 09074a59af..d2886ab572 100644 --- a/server/platform/services/sharedchannel/sync_send_remote.go +++ b/server/platform/services/sharedchannel/sync_send_remote.go @@ -11,10 +11,10 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type sendSyncMsgResultFunc func(syncResp SyncResponse, err error) diff --git a/server/platform/services/sharedchannel/util.go b/server/platform/services/sharedchannel/util.go index b8c0b124ad..e21abd5144 100644 --- a/server/platform/services/sharedchannel/util.go +++ b/server/platform/services/sharedchannel/util.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // fixMention replaces any mentions in a post for the user with the user's real username. diff --git a/server/platform/services/slackimport/converters.go b/server/platform/services/slackimport/converters.go index 9c90e98fad..041759f778 100644 --- a/server/platform/services/slackimport/converters.go +++ b/server/platform/services/slackimport/converters.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func slackConvertTimeStamp(ts string) int64 { diff --git a/server/platform/services/slackimport/parsers.go b/server/platform/services/slackimport/parsers.go index d001c5e8ee..fa3b49bd32 100644 --- a/server/platform/services/slackimport/parsers.go +++ b/server/platform/services/slackimport/parsers.go @@ -7,8 +7,8 @@ import ( "encoding/json" "io" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func slackParseChannels(data io.Reader, channelType model.ChannelType) ([]slackChannel, error) { diff --git a/server/platform/services/slackimport/slackimport.go b/server/platform/services/slackimport/slackimport.go index 3cc7a1f365..bddadb7db6 100644 --- a/server/platform/services/slackimport/slackimport.go +++ b/server/platform/services/slackimport/slackimport.go @@ -18,12 +18,12 @@ import ( "time" "unicode/utf8" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type slackChannel struct { diff --git a/server/platform/services/slackimport/slackimport_test.go b/server/platform/services/slackimport/slackimport_test.go index c25dcf96da..fd4ef1e4ea 100644 --- a/server/platform/services/slackimport/slackimport_test.go +++ b/server/platform/services/slackimport/slackimport_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestSlackConvertTimeStamp(t *testing.T) { diff --git a/server/platform/services/telemetry/mocks/ServerIface.go b/server/platform/services/telemetry/mocks/ServerIface.go index df271fa334..dcc8dfc19b 100644 --- a/server/platform/services/telemetry/mocks/ServerIface.go +++ b/server/platform/services/telemetry/mocks/ServerIface.go @@ -7,14 +7,14 @@ package mocks import ( context "context" - httpservice "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" + httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" - plugin "github.com/mattermost/mattermost-server/v6/plugin" + plugin "github.com/mattermost/mattermost-server/server/v8/plugin" - product "github.com/mattermost/mattermost-server/v6/server/channels/product" + product "github.com/mattermost/mattermost-server/server/v8/channels/product" ) // ServerIface is an autogenerated mock type for the ServerIface type diff --git a/server/platform/services/telemetry/telemetry.go b/server/platform/services/telemetry/telemetry.go index a214911f20..7f33181bd3 100644 --- a/server/platform/services/telemetry/telemetry.go +++ b/server/platform/services/telemetry/telemetry.go @@ -14,15 +14,15 @@ import ( rudder "github.com/rudderlabs/analytics-go" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/channels/store" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/marketplace" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/marketplace" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/platform/services/telemetry/telemetry_test.go b/server/platform/services/telemetry/telemetry_test.go index f869c9fe48..dce4935d39 100644 --- a/server/platform/services/telemetry/telemetry_test.go +++ b/server/platform/services/telemetry/telemetry_test.go @@ -21,16 +21,16 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - storeMocks "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/platform/services/searchengine" - "github.com/mattermost/mattermost-server/v6/server/platform/services/telemetry/mocks" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + storeMocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry/mocks" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest" ) type FakeConfigService struct { diff --git a/server/platform/services/tracing/tracing.go b/server/platform/services/tracing/tracing.go index dd0563e231..f65c5d43f5 100644 --- a/server/platform/services/tracing/tracing.go +++ b/server/platform/services/tracing/tracing.go @@ -14,7 +14,7 @@ import ( "github.com/uber/jaeger-client-go/zipkin" "github.com/uber/jaeger-lib/metrics" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // Tracer is a wrapper around Jaeger OpenTracing client, used to properly de-initialize jaeger on exit diff --git a/server/platform/services/upgrader/upgrader_linux.go b/server/platform/services/upgrader/upgrader_linux.go index db4f726722..df51c6321c 100644 --- a/server/platform/services/upgrader/upgrader_linux.go +++ b/server/platform/services/upgrader/upgrader_linux.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/openpgp" //nolint:staticcheck - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) //go:embed pubkey.gpg diff --git a/server/platform/services/upgrader/upgrader_linux_test.go b/server/platform/services/upgrader/upgrader_linux_test.go index 73853b3281..49b5d48365 100644 --- a/server/platform/services/upgrader/upgrader_linux_test.go +++ b/server/platform/services/upgrader/upgrader_linux_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCanIUpgradeToE0(t *testing.T) { diff --git a/server/platform/shared/driver/conn.go b/server/platform/shared/driver/conn.go index 6acf8e8762..2a567c19db 100644 --- a/server/platform/shared/driver/conn.go +++ b/server/platform/shared/driver/conn.go @@ -7,7 +7,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // Conn is a DB driver conn implementation diff --git a/server/platform/shared/driver/driver.go b/server/platform/shared/driver/driver.go index 2f6f6c3b7a..a76903ba22 100644 --- a/server/platform/shared/driver/driver.go +++ b/server/platform/shared/driver/driver.go @@ -12,7 +12,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) var ( diff --git a/server/platform/shared/driver/objects.go b/server/platform/shared/driver/objects.go index ff28cb2ed5..c07c8f7ad6 100644 --- a/server/platform/shared/driver/objects.go +++ b/server/platform/shared/driver/objects.go @@ -7,7 +7,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type wrapperTx struct { diff --git a/server/platform/shared/filestore/filesstore_test.go b/server/platform/shared/filestore/filesstore_test.go index b14bdb8e03..0c2358e1bf 100644 --- a/server/platform/shared/filestore/filesstore_test.go +++ b/server/platform/shared/filestore/filesstore_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/xtgo/uuid" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func randomString() string { diff --git a/server/platform/shared/filestore/localstore.go b/server/platform/shared/filestore/localstore.go index 68ea9ad66e..7c607bdab3 100644 --- a/server/platform/shared/filestore/localstore.go +++ b/server/platform/shared/filestore/localstore.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/shared/filestore/mocks/FileBackend.go b/server/platform/shared/filestore/mocks/FileBackend.go index aecaee75fc..a12156a569 100644 --- a/server/platform/shared/filestore/mocks/FileBackend.go +++ b/server/platform/shared/filestore/mocks/FileBackend.go @@ -7,7 +7,7 @@ package mocks import ( io "io" - filestore "github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore" + filestore "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" mock "github.com/stretchr/testify/mock" diff --git a/server/platform/shared/filestore/s3store.go b/server/platform/shared/filestore/s3store.go index 4986f28ce8..9d2eacfffa 100644 --- a/server/platform/shared/filestore/s3store.go +++ b/server/platform/shared/filestore/s3store.go @@ -19,7 +19,7 @@ import ( "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // S3FileBackend contains all necessary information to communicate with diff --git a/server/platform/shared/i18n/i18n.go b/server/platform/shared/i18n/i18n.go index 00cdc1a704..605f0a13d4 100644 --- a/server/platform/shared/i18n/i18n.go +++ b/server/platform/shared/i18n/i18n.go @@ -15,7 +15,7 @@ import ( "github.com/mattermost/go-i18n/i18n" "github.com/mattermost/go-i18n/i18n/bundle" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const defaultLocale = "en" diff --git a/server/platform/shared/mail/mail.go b/server/platform/shared/mail/mail.go index 2b8e97aea3..02944684e4 100644 --- a/server/platform/shared/mail/mail.go +++ b/server/platform/shared/mail/mail.go @@ -18,8 +18,8 @@ import ( "github.com/pkg/errors" gomail "gopkg.in/mail.v2" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/shared/mfa/mfa_test.go b/server/platform/shared/mfa/mfa_test.go index bb820cfda4..e90c370569 100644 --- a/server/platform/shared/mfa/mfa_test.go +++ b/server/platform/shared/mfa/mfa_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestGenerateSecret(t *testing.T) { diff --git a/server/platform/shared/mlog/global_test.go b/server/platform/shared/mlog/global_test.go index 2383478aa6..8c661d7e77 100644 --- a/server/platform/shared/mlog/global_test.go +++ b/server/platform/shared/mlog/global_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestLoggingBeforeInitialized(t *testing.T) { diff --git a/server/platform/shared/templates/templates.go b/server/platform/shared/templates/templates.go index 4bb8840f48..392c3f3dc4 100644 --- a/server/platform/shared/templates/templates.go +++ b/server/platform/shared/templates/templates.go @@ -13,7 +13,7 @@ import ( "github.com/fsnotify/fsnotify" - "github.com/mattermost/mattermost-server/v6/server/channels/utils/fileutils" + "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" ) // Container represents a set of templates that can be render diff --git a/server/playbooks/client/client.go b/server/playbooks/client/client.go index b9c0ed970d..e095c13323 100644 --- a/server/playbooks/client/client.go +++ b/server/playbooks/client/client.go @@ -16,7 +16,7 @@ import ( "strconv" "github.com/google/go-querystring/query" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "golang.org/x/oauth2" ) diff --git a/server/playbooks/client/doc_test.go b/server/playbooks/client/doc_test.go index 059fcc1dc2..ab876bbebd 100644 --- a/server/playbooks/client/doc_test.go +++ b/server/playbooks/client/doc_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) func Example() { diff --git a/server/playbooks/client/playbook_runs_test.go b/server/playbooks/client/playbook_runs_test.go index 125b2fdef4..8f3489c866 100644 --- a/server/playbooks/client/playbook_runs_test.go +++ b/server/playbooks/client/playbook_runs_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) func ExamplePlaybookRunService_Get() { diff --git a/server/playbooks/client/playbooks_test.go b/server/playbooks/client/playbooks_test.go index 4b39f44dae..863b2ff652 100644 --- a/server/playbooks/client/playbooks_test.go +++ b/server/playbooks/client/playbooks_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) func ExamplePlaybooksService_Get() { diff --git a/server/playbooks/product/api_adapter.go b/server/playbooks/product/api_adapter.go index 7f073f3958..7a91df438e 100644 --- a/server/playbooks/product/api_adapter.go +++ b/server/playbooks/product/api_adapter.go @@ -14,12 +14,12 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/mattermost/mattermost-server/v6/model" - mm_model "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) // normalizeAppError returns a truly nil error if appErr is nil diff --git a/server/playbooks/product/imports/playbooks_imports.go b/server/playbooks/product/imports/playbooks_imports.go index a8c3935ec1..4e8a5aeaa5 100644 --- a/server/playbooks/product/imports/playbooks_imports.go +++ b/server/playbooks/product/imports/playbooks_imports.go @@ -6,5 +6,5 @@ package imports import ( // Needed to ensure the init() method in the Playbooks product is run. // This file is copied to the mmserver imports package via makefile. - _ "github.com/mattermost/mattermost-server/v6/server/playbooks/product" + _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" ) diff --git a/server/playbooks/product/logrus.go b/server/playbooks/product/logrus.go index a6b23d94e3..0090d979c2 100644 --- a/server/playbooks/product/logrus.go +++ b/server/playbooks/product/logrus.go @@ -8,7 +8,7 @@ import ( "io" "github.com/mattermost/logr/v2" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/playbooks_product.go b/server/playbooks/product/playbooks_product.go index 9769c2d470..96ee88333a 100644 --- a/server/playbooks/product/playbooks_product.go +++ b/server/playbooks/product/playbooks_product.go @@ -10,23 +10,23 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - mmapp "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/product" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi/cluster" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/api" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/command" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/enterprise" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/metrics" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/scheduler" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/telemetry" + mmapp "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/product" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/api" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/command" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/enterprise" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/scheduler" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/telemetry" + "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/pluginapi/cluster/job.go b/server/playbooks/product/pluginapi/cluster/job.go index bb71d34779..96c8385a79 100644 --- a/server/playbooks/product/pluginapi/cluster/job.go +++ b/server/playbooks/product/pluginapi/cluster/job.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/pluginapi/cluster/job_once.go b/server/playbooks/product/pluginapi/cluster/job_once.go index 855a412006..2599962546 100644 --- a/server/playbooks/product/pluginapi/cluster/job_once.go +++ b/server/playbooks/product/pluginapi/cluster/job_once.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" ) diff --git a/server/playbooks/product/pluginapi/cluster/mutex.go b/server/playbooks/product/pluginapi/cluster/mutex.go index a32e299ebe..1f95ff3d4e 100644 --- a/server/playbooks/product/pluginapi/cluster/mutex.go +++ b/server/playbooks/product/pluginapi/cluster/mutex.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/pluginapi/license.go b/server/playbooks/product/pluginapi/license.go index d12a0fecfb..cac67f4da3 100644 --- a/server/playbooks/product/pluginapi/license.go +++ b/server/playbooks/product/pluginapi/license.go @@ -4,7 +4,7 @@ package pluginapi import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/playbooks/server/api/actions.go b/server/playbooks/server/api/actions.go index b35aa90cc4..6047ecff62 100644 --- a/server/playbooks/server/api/actions.go +++ b/server/playbooks/server/api/actions.go @@ -9,8 +9,8 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/gorilla/mux" diff --git a/server/playbooks/server/api/api.go b/server/playbooks/server/api/api.go index 7c348c21dc..dc36fd606d 100644 --- a/server/playbooks/server/api/api.go +++ b/server/playbooks/server/api/api.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" ) // MaxRequestSize is the size limit for any incoming request diff --git a/server/playbooks/server/api/bot.go b/server/playbooks/server/api/bot.go index 331fcd960a..8bc80a9ec2 100644 --- a/server/playbooks/server/api/bot.go +++ b/server/playbooks/server/api/bot.go @@ -13,11 +13,11 @@ import ( "github.com/sirupsen/logrus" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) type BotHandler struct { diff --git a/server/playbooks/server/api/categories.go b/server/playbooks/server/api/categories.go index 8bfef8cfc8..cb2a205c62 100644 --- a/server/playbooks/server/api/categories.go +++ b/server/playbooks/server/api/categories.go @@ -9,9 +9,9 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/api/graphql.go b/server/playbooks/server/api/graphql.go index 6507532948..d12211bdd0 100644 --- a/server/playbooks/server/api/graphql.go +++ b/server/playbooks/server/api/graphql.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/mux" "github.com/graph-gophers/dataloader/v7" graphql "github.com/graph-gophers/graphql-go" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/graphql_loader_favorite.go b/server/playbooks/server/api/graphql_loader_favorite.go index 15aaf88c56..325513f521 100644 --- a/server/playbooks/server/api/graphql_loader_favorite.go +++ b/server/playbooks/server/api/graphql_loader_favorite.go @@ -7,7 +7,7 @@ import ( "context" "github.com/graph-gophers/dataloader/v7" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) type favoriteInfo struct { diff --git a/server/playbooks/server/api/graphql_loader_playbook.go b/server/playbooks/server/api/graphql_loader_playbook.go index 934ec04cd2..95032810c9 100644 --- a/server/playbooks/server/api/graphql_loader_playbook.go +++ b/server/playbooks/server/api/graphql_loader_playbook.go @@ -7,7 +7,7 @@ import ( "context" "github.com/graph-gophers/dataloader/v7" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) type playbookInfo struct { diff --git a/server/playbooks/server/api/graphql_playbook.go b/server/playbooks/server/api/graphql_playbook.go index 40c0251ebc..128dbb5162 100644 --- a/server/playbooks/server/api/graphql_playbook.go +++ b/server/playbooks/server/api/graphql_playbook.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/graphql_root_playbook.go b/server/playbooks/server/api/graphql_root_playbook.go index 987ead79fa..7933bde0f3 100644 --- a/server/playbooks/server/api/graphql_root_playbook.go +++ b/server/playbooks/server/api/graphql_root_playbook.go @@ -7,8 +7,8 @@ import ( "context" "encoding/json" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" "gopkg.in/guregu/null.v4" ) diff --git a/server/playbooks/server/api/graphql_root_run.go b/server/playbooks/server/api/graphql_root_run.go index 9699cd2b82..a8c9274511 100644 --- a/server/playbooks/server/api/graphql_root_run.go +++ b/server/playbooks/server/api/graphql_root_run.go @@ -6,9 +6,9 @@ package api import ( "context" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/api/graphql_run.go b/server/playbooks/server/api/graphql_run.go index 0bc6ddc70d..9f8e235635 100644 --- a/server/playbooks/server/api/graphql_run.go +++ b/server/playbooks/server/api/graphql_run.go @@ -7,7 +7,7 @@ import ( "context" "strconv" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/api/logger.go b/server/playbooks/server/api/logger.go index 759368f449..bdccd4958a 100644 --- a/server/playbooks/server/api/logger.go +++ b/server/playbooks/server/api/logger.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/playbook_runs.go b/server/playbooks/server/api/playbook_runs.go index b78086f2e0..bd688c76ac 100644 --- a/server/playbooks/server/api/playbook_runs.go +++ b/server/playbooks/server/api/playbook_runs.go @@ -14,14 +14,14 @@ import ( "time" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) // PlaybookRunHandler is the API handler. diff --git a/server/playbooks/server/api/playbooks.go b/server/playbooks/server/api/playbooks.go index 2806a0f96d..af9f60a459 100644 --- a/server/playbooks/server/api/playbooks.go +++ b/server/playbooks/server/api/playbooks.go @@ -13,11 +13,11 @@ import ( "time" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/timeutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/timeutils" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/settings.go b/server/playbooks/server/api/settings.go index 242f8f4245..a9a33f389b 100644 --- a/server/playbooks/server/api/settings.go +++ b/server/playbooks/server/api/settings.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) // SettingsHandler is the API handler. diff --git a/server/playbooks/server/api/signal.go b/server/playbooks/server/api/signal.go index 94c9cf8a8f..f78a090e2e 100644 --- a/server/playbooks/server/api/signal.go +++ b/server/playbooks/server/api/signal.go @@ -9,9 +9,9 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/stats.go b/server/playbooks/server/api/stats.go index 05c666db3d..8c0c6acc07 100644 --- a/server/playbooks/server/api/stats.go +++ b/server/playbooks/server/api/stats.go @@ -8,13 +8,13 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "gopkg.in/guregu/null.v4" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/api/telemetry.go b/server/playbooks/server/api/telemetry.go index da7921c216..c7e28db181 100644 --- a/server/playbooks/server/api/telemetry.go +++ b/server/playbooks/server/api/telemetry.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) // TelemetryHandler is the API handler. diff --git a/server/playbooks/server/api/urls.go b/server/playbooks/server/api/urls.go index fdc0af5031..ae4ccce881 100644 --- a/server/playbooks/server/api/urls.go +++ b/server/playbooks/server/api/urls.go @@ -8,8 +8,8 @@ import ( "net/url" "path" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api_actions_test.go b/server/playbooks/server/api_actions_test.go index 26ba51d31b..b7a4cae7c5 100644 --- a/server/playbooks/server/api_actions_test.go +++ b/server/playbooks/server/api_actions_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/mitchellh/mapstructure" "github.com/stretchr/testify/assert" ) diff --git a/server/playbooks/server/api_bot_test.go b/server/playbooks/server/api_bot_test.go index 4ab0bd0196..f14eb984ac 100644 --- a/server/playbooks/server/api_bot_test.go +++ b/server/playbooks/server/api_bot_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/assert" ) diff --git a/server/playbooks/server/api_graphql_playbooks_test.go b/server/playbooks/server/api_graphql_playbooks_test.go index bcb78c08a3..b44332aae6 100644 --- a/server/playbooks/server/api_graphql_playbooks_test.go +++ b/server/playbooks/server/api_graphql_playbooks_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/graph-gophers/graphql-go" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/api" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/api" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/playbooks/server/api_graphql_runs_test.go b/server/playbooks/server/api_graphql_runs_test.go index 7a97b3be53..5b84ed47a4 100644 --- a/server/playbooks/server/api_graphql_runs_test.go +++ b/server/playbooks/server/api_graphql_runs_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/graph-gophers/graphql-go" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/api_playbooks_test.go b/server/playbooks/server/api_playbooks_test.go index d1c9e8ebed..1f20c10843 100644 --- a/server/playbooks/server/api_playbooks_test.go +++ b/server/playbooks/server/api_playbooks_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/playbooks/server/api_runs_test.go b/server/playbooks/server/api_runs_test.go index 2cac09e2b3..1c2a277a14 100644 --- a/server/playbooks/server/api_runs_test.go +++ b/server/playbooks/server/api_runs_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/api_settings_test.go b/server/playbooks/server/api_settings_test.go index 4ef06b42c4..6c2db58a51 100644 --- a/server/playbooks/server/api_settings_test.go +++ b/server/playbooks/server/api_settings_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/api_stats_test.go b/server/playbooks/server/api_stats_test.go index a005ca7212..ca575b9245 100644 --- a/server/playbooks/server/api_stats_test.go +++ b/server/playbooks/server/api_stats_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" diff --git a/server/playbooks/server/app/action.go b/server/playbooks/server/app/action.go index d3b3881a25..ed62a71c41 100644 --- a/server/playbooks/server/app/action.go +++ b/server/playbooks/server/app/action.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/v6/model" +import "github.com/mattermost/mattermost-server/server/v8/model" type GenericChannelActionWithoutPayload struct { ID string `json:"id"` diff --git a/server/playbooks/server/app/actions_service.go b/server/playbooks/server/app/actions_service.go index d00e298d9b..56fb1b16f1 100644 --- a/server/playbooks/server/app/actions_service.go +++ b/server/playbooks/server/app/actions_service.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/server/playbooks/server/app/category_service.go b/server/playbooks/server/app/category_service.go index bc9cb2e363..f213a760e2 100644 --- a/server/playbooks/server/app/category_service.go +++ b/server/playbooks/server/app/category_service.go @@ -6,8 +6,8 @@ package app import ( "database/sql" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/app/mocks/mock_job_once_scheduler.go b/server/playbooks/server/app/mocks/mock_job_once_scheduler.go index fdfdc2184b..9ae41d0ba1 100644 --- a/server/playbooks/server/app/mocks/mock_job_once_scheduler.go +++ b/server/playbooks/server/app/mocks/mock_job_once_scheduler.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/app (interfaces: JobOnceScheduler) +// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/app (interfaces: JobOnceScheduler) // Package mock_app is a generated GoMock package. package mock_app @@ -12,7 +12,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - cluster "github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi/cluster" + cluster "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster" ) // MockJobOnceScheduler is a mock of JobOnceScheduler interface. diff --git a/server/playbooks/server/app/permissions_service.go b/server/playbooks/server/app/permissions_service.go index cff8806fba..9a663cb91f 100644 --- a/server/playbooks/server/app/permissions_service.go +++ b/server/playbooks/server/app/permissions_service.go @@ -7,9 +7,9 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/app/playbook.go b/server/playbooks/server/app/playbook.go index b0bb91f3e5..086be5a5a7 100644 --- a/server/playbooks/server/app/playbook.go +++ b/server/playbooks/server/app/playbook.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "gopkg.in/guregu/null.v4" "github.com/pkg/errors" diff --git a/server/playbooks/server/app/playbook_run.go b/server/playbooks/server/app/playbook_run.go index 24efefd839..276a54cc1f 100644 --- a/server/playbooks/server/app/playbook_run.go +++ b/server/playbooks/server/app/playbook_run.go @@ -10,10 +10,10 @@ import ( "gopkg.in/guregu/null.v4" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi/cluster" + "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster" ) const ( diff --git a/server/playbooks/server/app/playbook_run_service.go b/server/playbooks/server/app/playbook_run_service.go index f4ac2506ff..6a736df24c 100644 --- a/server/playbooks/server/app/playbook_run_service.go +++ b/server/playbooks/server/app/playbook_run_service.go @@ -16,14 +16,14 @@ import ( "github.com/sirupsen/logrus" stripmd "github.com/writeas/go-strip-markdown" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/i18n" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/httptools" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/metrics" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/timeutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/httptools" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/timeutils" ) const checklistItemDescriptionCharLimit = 4000 diff --git a/server/playbooks/server/app/playbook_run_test.go b/server/playbooks/server/app/playbook_run_test.go index 277f00b2c1..160dec7cc0 100644 --- a/server/playbooks/server/app/playbook_run_test.go +++ b/server/playbooks/server/app/playbook_run_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/app/playbook_service.go b/server/playbooks/server/app/playbook_service.go index a870204987..a4cce88812 100644 --- a/server/playbooks/server/app/playbook_service.go +++ b/server/playbooks/server/app/playbook_service.go @@ -4,13 +4,13 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/metrics" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) const ( diff --git a/server/playbooks/server/app/plugin_api_tools.go b/server/playbooks/server/app/plugin_api_tools.go index 59e3589fcd..1910d9fe59 100644 --- a/server/playbooks/server/app/plugin_api_tools.go +++ b/server/playbooks/server/app/plugin_api_tools.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/app/reminder.go b/server/playbooks/server/app/reminder.go index b6120e2367..9436c055ae 100644 --- a/server/playbooks/server/app/reminder.go +++ b/server/playbooks/server/app/reminder.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/app/task_actions.go b/server/playbooks/server/app/task_actions.go index bc2d1e4bf2..8eba78404a 100644 --- a/server/playbooks/server/app/task_actions.go +++ b/server/playbooks/server/app/task_actions.go @@ -7,7 +7,7 @@ import ( "encoding/json" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/app/task_actions_test.go b/server/playbooks/server/app/task_actions_test.go index 29c7a4bef4..e19479daf9 100644 --- a/server/playbooks/server/app/task_actions_test.go +++ b/server/playbooks/server/app/task_actions_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/bot/bot.go b/server/playbooks/server/bot/bot.go index 52be192cf1..b35912a253 100644 --- a/server/playbooks/server/bot/bot.go +++ b/server/playbooks/server/bot/bot.go @@ -4,9 +4,9 @@ package bot import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) // Bot stores the information for the plugin configuration, and implements the Poster interfaces. diff --git a/server/playbooks/server/bot/mocks/mock_poster.go b/server/playbooks/server/bot/mocks/mock_poster.go index f8e4aeb10b..a6c78d9a04 100644 --- a/server/playbooks/server/bot/mocks/mock_poster.go +++ b/server/playbooks/server/bot/mocks/mock_poster.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot (interfaces: Poster) +// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot (interfaces: Poster) // Package mock_bot is a generated GoMock package. package mock_bot @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" ) // MockPoster is a mock of Poster interface. diff --git a/server/playbooks/server/bot/poster.go b/server/playbooks/server/bot/poster.go index 17c1e545b6..a720dec395 100644 --- a/server/playbooks/server/bot/poster.go +++ b/server/playbooks/server/bot/poster.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/command/command.go b/server/playbooks/server/command/command.go index 782824de87..6188588b8a 100644 --- a/server/playbooks/server/command/command.go +++ b/server/playbooks/server/command/command.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/bot" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/config" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/timeutils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/timeutils" + "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/config/service.go b/server/playbooks/server/config/service.go index bb5ec8bc97..320b450427 100644 --- a/server/playbooks/server/config/service.go +++ b/server/playbooks/server/config/service.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) // const npsPluginID = "com.mattermost.nps" diff --git a/server/playbooks/server/enterprise/license.go b/server/playbooks/server/enterprise/license.go index 54c9af0a9e..4a83c4419c 100644 --- a/server/playbooks/server/enterprise/license.go +++ b/server/playbooks/server/enterprise/license.go @@ -4,8 +4,8 @@ package enterprise import ( - "github.com/mattermost/mattermost-server/v6/server/playbooks/product/pluginapi" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) type LicenseChecker struct { diff --git a/server/playbooks/server/httptools/client.go b/server/playbooks/server/httptools/client.go index e55ee47a5b..0ffde23be6 100644 --- a/server/playbooks/server/httptools/client.go +++ b/server/playbooks/server/httptools/client.go @@ -10,8 +10,8 @@ import ( "time" "unicode" - "github.com/mattermost/mattermost-server/v6/server/platform/services/httpservice" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) func MakeClient(api playbooks.ServicesAPI) *http.Client { diff --git a/server/playbooks/server/main_test.go b/server/playbooks/server/main_test.go index 3392c2cb1e..d08e028bb3 100644 --- a/server/playbooks/server/main_test.go +++ b/server/playbooks/server/main_test.go @@ -8,37 +8,26 @@ import ( "encoding/json" "fmt" "os" - "os/exec" - "path/filepath" - "strings" "testing" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/api4" - sapp "github.com/mattermost/mattermost-server/v6/server/channels/app" - "github.com/mattermost/mattermost-server/v6/server/channels/app/request" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/config" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" - "github.com/mattermost/mattermost-server/v6/server/playbooks/client" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/channels/api4" + sapp "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - _ "github.com/mattermost/mattermost-server/v6/server/playbooks/product" + _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" ) func TestMain(m *testing.M) { - serverpathBytes, err := exec.Command("go", "list", "-f", "'{{.Dir}}'", "-m", "github.com/mattermost/mattermost-server/v6").Output() - if err != nil { - panic(err) - } - serverpath := string(serverpathBytes) - serverpath = strings.Trim(strings.TrimSpace(serverpath), "'") - os.Setenv("MM_SERVER_PATH", filepath.Join(serverpath, "server")) - // This actually runs the tests status := m.Run() diff --git a/server/playbooks/server/playbooks/service_api.go b/server/playbooks/server/playbooks/service_api.go index c17cae4aa3..e148581fdc 100644 --- a/server/playbooks/server/playbooks/service_api.go +++ b/server/playbooks/server/playbooks/service_api.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" - mm_model "github.com/mattermost/mattermost-server/v6/model" + mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/playbooks/server/sqlstore/actions.go b/server/playbooks/server/sqlstore/actions.go index 09b7743463..93d6589f3e 100644 --- a/server/playbooks/server/sqlstore/actions.go +++ b/server/playbooks/server/sqlstore/actions.go @@ -11,8 +11,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/go-sql-driver/mysql" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/actions_test.go b/server/playbooks/server/sqlstore/actions_test.go index 65b9f0b34c..92db488041 100644 --- a/server/playbooks/server/sqlstore/actions_test.go +++ b/server/playbooks/server/sqlstore/actions_test.go @@ -10,9 +10,9 @@ import ( "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) func setupChannelActionStore(t *testing.T, db *sqlx.DB) app.ChannelActionStore { diff --git a/server/playbooks/server/sqlstore/category.go b/server/playbooks/server/sqlstore/category.go index 955cc4fecf..4e8eab5742 100644 --- a/server/playbooks/server/sqlstore/category.go +++ b/server/playbooks/server/sqlstore/category.go @@ -7,8 +7,8 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/category_test.go b/server/playbooks/server/sqlstore/category_test.go index 6fed27c0d3..0e271ea9d5 100644 --- a/server/playbooks/server/sqlstore/category_test.go +++ b/server/playbooks/server/sqlstore/category_test.go @@ -10,9 +10,9 @@ import ( "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) func setupCategoryStore(t *testing.T, db *sqlx.DB) app.CategoryStore { diff --git a/server/playbooks/server/sqlstore/migrate.go b/server/playbooks/server/sqlstore/migrate.go index 8de5710f80..b4b08e0cf0 100644 --- a/server/playbooks/server/sqlstore/migrate.go +++ b/server/playbooks/server/sqlstore/migrate.go @@ -11,7 +11,7 @@ import ( "github.com/blang/semver" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/morph" "github.com/mattermost/morph/drivers" "github.com/mattermost/morph/sources" diff --git a/server/playbooks/server/sqlstore/migrations.go b/server/playbooks/server/sqlstore/migrations.go index 1c2f4f8f6e..d965c46743 100644 --- a/server/playbooks/server/sqlstore/migrations.go +++ b/server/playbooks/server/sqlstore/migrations.go @@ -13,8 +13,8 @@ import ( "github.com/blang/semver" "github.com/go-sql-driver/mysql" "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/sqlstore/migrations_test.go b/server/playbooks/server/sqlstore/migrations_test.go index 04fdca9be6..913e6e8632 100644 --- a/server/playbooks/server/sqlstore/migrations_test.go +++ b/server/playbooks/server/sqlstore/migrations_test.go @@ -11,7 +11,7 @@ import ( "github.com/mattermost/morph" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type MigrationMapping struct { diff --git a/server/playbooks/server/sqlstore/migrations_utils.go b/server/playbooks/server/sqlstore/migrations_utils.go index 9f5c43f15c..61ae236ffa 100644 --- a/server/playbooks/server/sqlstore/migrations_utils.go +++ b/server/playbooks/server/sqlstore/migrations_utils.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/jmoiron/sqlx" diff --git a/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go b/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go index 895d7f5134..10b706dde5 100644 --- a/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go +++ b/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: StoreAPI) +// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: StoreAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore diff --git a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go index c9980a13ca..50ffc09958 100644 --- a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go +++ b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: ConfigurationAPI) +// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: ConfigurationAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" ) // MockConfigurationAPI is a mock of ConfigurationAPI interface. diff --git a/server/playbooks/server/sqlstore/mocks/mock_kvapi.go b/server/playbooks/server/sqlstore/mocks/mock_kvapi.go index f121fe1a4e..398e6f7901 100644 --- a/server/playbooks/server/sqlstore/mocks/mock_kvapi.go +++ b/server/playbooks/server/sqlstore/mocks/mock_kvapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: KVAPI) +// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: KVAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore diff --git a/server/playbooks/server/sqlstore/mocks/mock_storeapi.go b/server/playbooks/server/sqlstore/mocks/mock_storeapi.go index 6ba8846d39..ffd99fd491 100644 --- a/server/playbooks/server/sqlstore/mocks/mock_storeapi.go +++ b/server/playbooks/server/sqlstore/mocks/mock_storeapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore (interfaces: StoreAPI) +// Source: github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore (interfaces: StoreAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore diff --git a/server/playbooks/server/sqlstore/playbook.go b/server/playbooks/server/sqlstore/playbook.go index 9c8bf48e36..dcb06a98fe 100644 --- a/server/playbooks/server/sqlstore/playbook.go +++ b/server/playbooks/server/sqlstore/playbook.go @@ -11,8 +11,8 @@ import ( "strings" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/playbook_run.go b/server/playbooks/server/sqlstore/playbook_run.go index e1f48e80df..061699d018 100644 --- a/server/playbooks/server/sqlstore/playbook_run.go +++ b/server/playbooks/server/sqlstore/playbook_run.go @@ -16,8 +16,8 @@ import ( "github.com/jmoiron/sqlx" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/playbook_run_test.go b/server/playbooks/server/sqlstore/playbook_run_test.go index 2dee055a78..d95b78fd0b 100644 --- a/server/playbooks/server/sqlstore/playbook_run_test.go +++ b/server/playbooks/server/sqlstore/playbook_run_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) func TestCreateAndGetPlaybookRun(t *testing.T) { diff --git a/server/playbooks/server/sqlstore/playbook_test.go b/server/playbooks/server/sqlstore/playbook_test.go index d556ab5b7a..e61d7d62fa 100644 --- a/server/playbooks/server/sqlstore/playbook_test.go +++ b/server/playbooks/server/sqlstore/playbook_test.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) func membersFromIds(ids []string) []app.PlaybookMember { diff --git a/server/playbooks/server/sqlstore/pluginapi_client.go b/server/playbooks/server/sqlstore/pluginapi_client.go index e2f069d7a5..699fd10513 100644 --- a/server/playbooks/server/sqlstore/pluginapi_client.go +++ b/server/playbooks/server/sqlstore/pluginapi_client.go @@ -6,9 +6,9 @@ package sqlstore import ( "database/sql" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/playbooks" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // StoreAPI is the interface exposing the underlying database, provided by pluginapi diff --git a/server/playbooks/server/sqlstore/stats.go b/server/playbooks/server/sqlstore/stats.go index 54000c582f..4c101e25d8 100644 --- a/server/playbooks/server/sqlstore/stats.go +++ b/server/playbooks/server/sqlstore/stats.go @@ -15,7 +15,7 @@ import ( "gopkg.in/guregu/null.v4" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type StatsStore struct { diff --git a/server/playbooks/server/sqlstore/stats_test.go b/server/playbooks/server/sqlstore/stats_test.go index d516b3eb0d..5973f279bc 100644 --- a/server/playbooks/server/sqlstore/stats_test.go +++ b/server/playbooks/server/sqlstore/stats_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/v6/server/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) func setupStatsStore(t *testing.T, db *sqlx.DB) *StatsStore { diff --git a/server/playbooks/server/sqlstore/store.go b/server/playbooks/server/sqlstore/store.go index b2c1194813..fae12dd6c7 100644 --- a/server/playbooks/server/sqlstore/store.go +++ b/server/playbooks/server/sqlstore/store.go @@ -6,12 +6,12 @@ package sqlstore import ( "database/sql" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/sirupsen/logrus" sq "github.com/Masterminds/squirrel" "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/store_test.go b/server/playbooks/server/sqlstore/store_test.go index 7956df70b9..cb33394f7f 100644 --- a/server/playbooks/server/sqlstore/store_test.go +++ b/server/playbooks/server/sqlstore/store_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" - mock_app "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app/mocks" + mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks" sq "github.com/Masterminds/squirrel" "github.com/blang/semver" @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestMigrations(t *testing.T) { diff --git a/server/playbooks/server/sqlstore/support_for_test.go b/server/playbooks/server/sqlstore/support_for_test.go index eb5b12a4d1..3035fe8dd5 100644 --- a/server/playbooks/server/sqlstore/support_for_test.go +++ b/server/playbooks/server/sqlstore/support_for_test.go @@ -10,16 +10,16 @@ import ( "github.com/blang/semver" - mock_app "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app/mocks" + mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks" sq "github.com/Masterminds/squirrel" "github.com/golang/mock/gomock" "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/store/storetest" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) func getDriverName() string { diff --git a/server/playbooks/server/sqlstore/system.go b/server/playbooks/server/sqlstore/system.go index 584f7639ce..7be08ffb26 100644 --- a/server/playbooks/server/sqlstore/system.go +++ b/server/playbooks/server/sqlstore/system.go @@ -7,7 +7,7 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/timeline_event_test.go b/server/playbooks/server/sqlstore/timeline_event_test.go index 78572c2229..2a22ce2cc6 100644 --- a/server/playbooks/server/sqlstore/timeline_event_test.go +++ b/server/playbooks/server/sqlstore/timeline_event_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) func TestPlaybookRunStore_CreateTimelineEvent(t *testing.T) { diff --git a/server/playbooks/server/sqlstore/user_info.go b/server/playbooks/server/sqlstore/user_info.go index 949c3440c8..211fcc90d2 100644 --- a/server/playbooks/server/sqlstore/user_info.go +++ b/server/playbooks/server/sqlstore/user_info.go @@ -7,10 +7,10 @@ import ( "database/sql" "encoding/json" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/user_info_test.go b/server/playbooks/server/sqlstore/user_info_test.go index 0230268d19..3781d2f7a8 100644 --- a/server/playbooks/server/sqlstore/user_info_test.go +++ b/server/playbooks/server/sqlstore/user_info_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - mock_app "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app/mocks" + mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks" "github.com/pkg/errors" @@ -16,8 +16,8 @@ import ( "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) func Test_userInfoStore_Get(t *testing.T) { diff --git a/server/playbooks/server/telemetry/noop.go b/server/playbooks/server/telemetry/noop.go index 37694ddfc1..c0a8521ec3 100644 --- a/server/playbooks/server/telemetry/noop.go +++ b/server/playbooks/server/telemetry/noop.go @@ -4,7 +4,7 @@ package telemetry import ( - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) // NoopTelemetry satisfies the Telemetry interface with no-op implementations. diff --git a/server/playbooks/server/telemetry/rudder.go b/server/playbooks/server/telemetry/rudder.go index 081d5d518c..294a23b2a7 100644 --- a/server/playbooks/server/telemetry/rudder.go +++ b/server/playbooks/server/telemetry/rudder.go @@ -6,7 +6,7 @@ package telemetry import ( "sync" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" rudder "github.com/rudderlabs/analytics-go" diff --git a/server/playbooks/server/telemetry/rudder_test.go b/server/playbooks/server/telemetry/rudder_test.go index 3d0befeada..2f67254a60 100644 --- a/server/playbooks/server/telemetry/rudder_test.go +++ b/server/playbooks/server/telemetry/rudder_test.go @@ -13,7 +13,7 @@ import ( "gopkg.in/guregu/null.v4" - "github.com/mattermost/mattermost-server/v6/server/playbooks/server/app" + "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" rudder "github.com/rudderlabs/analytics-go" "github.com/stretchr/testify/require" diff --git a/server/playbooks/server/timeutils/timeutils.go b/server/playbooks/server/timeutils/timeutils.go index fb98a50eb6..efed974dd7 100644 --- a/server/playbooks/server/timeutils/timeutils.go +++ b/server/playbooks/server/timeutils/timeutils.go @@ -8,7 +8,7 @@ import ( "math" "time" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) func GetTimeForMillis(unixMillis int64) time.Time { diff --git a/plugin/api.go b/server/plugin/api.go similarity index 99% rename from plugin/api.go rename to server/plugin/api.go index f777539d04..63be22ce43 100644 --- a/plugin/api.go +++ b/server/plugin/api.go @@ -9,7 +9,7 @@ import ( plugin "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // The API can be used to retrieve data or perform actions on behalf of the plugin. Most methods diff --git a/plugin/api_timer_layer_generated.go b/server/plugin/api_timer_layer_generated.go similarity index 99% rename from plugin/api_timer_layer_generated.go rename to server/plugin/api_timer_layer_generated.go index c54c6ac7bb..0f1ab22ff7 100644 --- a/plugin/api_timer_layer_generated.go +++ b/server/plugin/api_timer_layer_generated.go @@ -11,8 +11,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) type apiTimerLayer struct { diff --git a/plugin/checker/check_api.go b/server/plugin/checker/check_api.go similarity index 87% rename from plugin/checker/check_api.go rename to server/plugin/checker/check_api.go index 707da34e9c..88c7a53775 100644 --- a/plugin/checker/check_api.go +++ b/server/plugin/checker/check_api.go @@ -8,8 +8,8 @@ import ( "go/ast" "go/token" - "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/asthelpers" - "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/version" + "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/asthelpers" + "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/version" ) func checkAPIVersionComments(pkgPath string) (result, error) { diff --git a/plugin/checker/check_api_test.go b/server/plugin/checker/check_api_test.go similarity index 76% rename from plugin/checker/check_api_test.go rename to server/plugin/checker/check_api_test.go index c270399abc..5c22f4f231 100644 --- a/plugin/checker/check_api_test.go +++ b/server/plugin/checker/check_api_test.go @@ -17,24 +17,24 @@ func TestCheckAPIVersionComments(t *testing.T) { }{ { name: "valid comments", - pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/valid", + pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/valid", err: "", }, { name: "invalid comments", - pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/invalid", + pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/invalid", expected: result{ Errors: []string{"internal/test/invalid/invalid.go:15:2: missing a minimum server version comment on method InvalidMethod"}, }, }, { name: "missing API interface", - pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/missing", + pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/missing", err: "could not find API interface", }, { name: "non-existent package path", - pkgPath: "github.com/mattermost/mattermost-server/v6/plugin/checker/internal/test/does_not_exist", + pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/does_not_exist", err: "could not find API interface", }, } diff --git a/plugin/checker/internal/asthelpers/helpers.go b/server/plugin/checker/internal/asthelpers/helpers.go similarity index 100% rename from plugin/checker/internal/asthelpers/helpers.go rename to server/plugin/checker/internal/asthelpers/helpers.go diff --git a/plugin/checker/internal/test/invalid/invalid.go b/server/plugin/checker/internal/test/invalid/invalid.go similarity index 100% rename from plugin/checker/internal/test/invalid/invalid.go rename to server/plugin/checker/internal/test/invalid/invalid.go diff --git a/plugin/checker/internal/test/missing/missing.go b/server/plugin/checker/internal/test/missing/missing.go similarity index 100% rename from plugin/checker/internal/test/missing/missing.go rename to server/plugin/checker/internal/test/missing/missing.go diff --git a/plugin/checker/internal/test/valid/valid.go b/server/plugin/checker/internal/test/valid/valid.go similarity index 100% rename from plugin/checker/internal/test/valid/valid.go rename to server/plugin/checker/internal/test/valid/valid.go diff --git a/plugin/checker/internal/version/comments.go b/server/plugin/checker/internal/version/comments.go similarity index 100% rename from plugin/checker/internal/version/comments.go rename to server/plugin/checker/internal/version/comments.go diff --git a/plugin/checker/internal/version/comments_test.go b/server/plugin/checker/internal/version/comments_test.go similarity index 100% rename from plugin/checker/internal/version/comments_test.go rename to server/plugin/checker/internal/version/comments_test.go diff --git a/plugin/checker/internal/version/version.go b/server/plugin/checker/internal/version/version.go similarity index 100% rename from plugin/checker/internal/version/version.go rename to server/plugin/checker/internal/version/version.go diff --git a/plugin/checker/internal/version/version_test.go b/server/plugin/checker/internal/version/version_test.go similarity index 100% rename from plugin/checker/internal/version/version_test.go rename to server/plugin/checker/internal/version/version_test.go diff --git a/plugin/checker/main.go b/server/plugin/checker/main.go similarity index 98% rename from plugin/checker/main.go rename to server/plugin/checker/main.go index 87c1f6b414..b7a2e76aa7 100644 --- a/plugin/checker/main.go +++ b/server/plugin/checker/main.go @@ -10,7 +10,7 @@ import ( "strings" ) -const pluginPackagePath = "github.com/mattermost/mattermost-server/v6/plugin" +const pluginPackagePath = "github.com/mattermost/mattermost-server/server/v8/plugin" type result struct { Warnings []string diff --git a/plugin/checker/render.go b/server/plugin/checker/render.go similarity index 100% rename from plugin/checker/render.go rename to server/plugin/checker/render.go diff --git a/plugin/client.go b/server/plugin/client.go similarity index 100% rename from plugin/client.go rename to server/plugin/client.go diff --git a/plugin/client_rpc.go b/server/plugin/client_rpc.go similarity index 99% rename from plugin/client_rpc.go rename to server/plugin/client_rpc.go index 699e8d967a..ec30c31ec6 100644 --- a/plugin/client_rpc.go +++ b/server/plugin/client_rpc.go @@ -24,8 +24,8 @@ import ( "github.com/hashicorp/go-plugin" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var hookNameToId map[string]int = make(map[string]int) diff --git a/plugin/client_rpc_generated.go b/server/plugin/client_rpc_generated.go similarity index 99% rename from plugin/client_rpc_generated.go rename to server/plugin/client_rpc_generated.go index e0d3a5e814..3453a35578 100644 --- a/plugin/client_rpc_generated.go +++ b/server/plugin/client_rpc_generated.go @@ -10,8 +10,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func init() { diff --git a/plugin/context.go b/server/plugin/context.go similarity index 100% rename from plugin/context.go rename to server/plugin/context.go diff --git a/plugin/db_rpc.go b/server/plugin/db_rpc.go similarity index 100% rename from plugin/db_rpc.go rename to server/plugin/db_rpc.go diff --git a/plugin/doc.go b/server/plugin/doc.go similarity index 100% rename from plugin/doc.go rename to server/plugin/doc.go diff --git a/plugin/driver.go b/server/plugin/driver.go similarity index 100% rename from plugin/driver.go rename to server/plugin/driver.go diff --git a/plugin/environment.go b/server/plugin/environment.go similarity index 98% rename from plugin/environment.go rename to server/plugin/environment.go index b32ef66519..20f612b5ab 100644 --- a/plugin/environment.go +++ b/server/plugin/environment.go @@ -15,10 +15,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ErrNotFound = errors.New("Item not found") diff --git a/plugin/environment_test.go b/server/plugin/environment_test.go similarity index 95% rename from plugin/environment_test.go rename to server/plugin/environment_test.go index 489d52ff8e..6a4afa138f 100644 --- a/plugin/environment_test.go +++ b/server/plugin/environment_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestAvailablePlugins(t *testing.T) { diff --git a/plugin/example_hello_world_test.go b/server/plugin/example_hello_world_test.go similarity index 92% rename from plugin/example_hello_world_test.go rename to server/plugin/example_hello_world_test.go index 59ed5a01cd..dff5c78d69 100644 --- a/plugin/example_hello_world_test.go +++ b/server/plugin/example_hello_world_test.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // HelloWorldPlugin implements the interface expected by the Mattermost server to communicate diff --git a/plugin/example_help_test.go b/server/plugin/example_help_test.go similarity index 96% rename from plugin/example_help_test.go rename to server/plugin/example_help_test.go index a1e55f7b2f..9b6f08f4d8 100644 --- a/plugin/example_help_test.go +++ b/server/plugin/example_help_test.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) // configuration represents the configuration for this plugin as exposed via the Mattermost diff --git a/plugin/hclog_adapter.go b/server/plugin/hclog_adapter.go similarity index 97% rename from plugin/hclog_adapter.go rename to server/plugin/hclog_adapter.go index 3c63c66a58..b2be0eae29 100644 --- a/plugin/hclog_adapter.go +++ b/server/plugin/hclog_adapter.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-hclog" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type hclogAdapter struct { diff --git a/plugin/health_check.go b/server/plugin/health_check.go similarity index 97% rename from plugin/health_check.go rename to server/plugin/health_check.go index 38251d1c90..68ffd8b0f0 100644 --- a/plugin/health_check.go +++ b/server/plugin/health_check.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/plugin/health_check_test.go b/server/plugin/health_check_test.go similarity index 90% rename from plugin/health_check_test.go rename to server/plugin/health_check_test.go index 7a7cc872bc..36cb728545 100644 --- a/plugin/health_check_test.go +++ b/server/plugin/health_check_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestPluginHealthCheck(t *testing.T) { @@ -35,7 +35,7 @@ func testPluginHealthCheckSuccess(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { @@ -73,8 +73,8 @@ func testPluginHealthCheckPanic(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/plugin/hijack.go b/server/plugin/hijack.go similarity index 100% rename from plugin/hijack.go rename to server/plugin/hijack.go diff --git a/plugin/hooks.go b/server/plugin/hooks.go similarity index 99% rename from plugin/hooks.go rename to server/plugin/hooks.go index a384dfbb2e..afe727d6a7 100644 --- a/plugin/hooks.go +++ b/server/plugin/hooks.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // These assignments are part of the wire protocol used to trigger hook events in plugins. diff --git a/plugin/hooks_timer_layer_generated.go b/server/plugin/hooks_timer_layer_generated.go similarity index 98% rename from plugin/hooks_timer_layer_generated.go rename to server/plugin/hooks_timer_layer_generated.go index 87e79ca7e6..393e6e6a91 100644 --- a/plugin/hooks_timer_layer_generated.go +++ b/server/plugin/hooks_timer_layer_generated.go @@ -11,8 +11,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) type hooksTimerLayer struct { diff --git a/plugin/http.go b/server/plugin/http.go similarity index 97% rename from plugin/http.go rename to server/plugin/http.go index ab9eab3f65..5480e4696a 100644 --- a/plugin/http.go +++ b/server/plugin/http.go @@ -12,7 +12,7 @@ import ( "net/http" "net/rpc" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type hijackedResponse struct { diff --git a/plugin/interface_generator/main.go b/server/plugin/interface_generator/main.go similarity index 98% rename from plugin/interface_generator/main.go rename to server/plugin/interface_generator/main.go index 95996f11be..2a02c26d41 100644 --- a/plugin/interface_generator/main.go +++ b/server/plugin/interface_generator/main.go @@ -453,8 +453,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) type apiTimerLayer struct { @@ -495,8 +495,8 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" ) type hooksTimerLayer struct { @@ -676,7 +676,7 @@ func generatePluginTimerLayer(info *PluginInterfaceInfo) { } func getPluginPackageDir() string { - dirs, err := goList("github.com/mattermost/mattermost-server/v6/plugin") + dirs, err := goList("github.com/mattermost/mattermost-server/server/v8/plugin") if err != nil { panic(err) } else if len(dirs) != 1 { diff --git a/plugin/io_rpc.go b/server/plugin/io_rpc.go similarity index 100% rename from plugin/io_rpc.go rename to server/plugin/io_rpc.go diff --git a/plugin/plugintest/api.go b/server/plugin/plugintest/api.go similarity index 99% rename from plugin/plugintest/api.go rename to server/plugin/plugintest/api.go index b92bc3288d..9fa1420457 100644 --- a/plugin/plugintest/api.go +++ b/server/plugin/plugintest/api.go @@ -10,7 +10,7 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" ) // API is an autogenerated mock type for the API type diff --git a/plugin/plugintest/doc.go b/server/plugin/plugintest/doc.go similarity index 83% rename from plugin/plugintest/doc.go rename to server/plugin/plugintest/doc.go index b20f1a92c3..ebf514d766 100644 --- a/plugin/plugintest/doc.go +++ b/server/plugin/plugintest/doc.go @@ -7,5 +7,5 @@ // https://godoc.org/github.com/stretchr/testify/mock // // If you need to import the mock package, you can import it with -// "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock". +// "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock". package plugintest diff --git a/plugin/plugintest/driver.go b/server/plugin/plugintest/driver.go similarity index 99% rename from plugin/plugintest/driver.go rename to server/plugin/plugintest/driver.go index 398b334450..bd10226f76 100644 --- a/plugin/plugintest/driver.go +++ b/server/plugin/plugintest/driver.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - plugin "github.com/mattermost/mattermost-server/v6/plugin" + plugin "github.com/mattermost/mattermost-server/server/v8/plugin" ) // Driver is an autogenerated mock type for the Driver type diff --git a/plugin/plugintest/example_hello_user_test.go b/server/plugin/plugintest/example_hello_user_test.go similarity index 86% rename from plugin/plugintest/example_hello_user_test.go rename to server/plugin/plugintest/example_hello_user_test.go index 2095b914d3..0c475382d2 100644 --- a/plugin/plugintest/example_hello_user_test.go +++ b/server/plugin/plugintest/example_hello_user_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/plugin/plugintest" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest" ) type HelloUserPlugin struct { diff --git a/plugin/plugintest/hooks.go b/server/plugin/plugintest/hooks.go similarity index 99% rename from plugin/plugintest/hooks.go rename to server/plugin/plugintest/hooks.go index d5550e5ba0..29900351ea 100644 --- a/plugin/plugintest/hooks.go +++ b/server/plugin/plugintest/hooks.go @@ -10,9 +10,9 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/v6/model" + model "github.com/mattermost/mattermost-server/server/v8/model" - plugin "github.com/mattermost/mattermost-server/v6/plugin" + plugin "github.com/mattermost/mattermost-server/server/v8/plugin" ) // Hooks is an autogenerated mock type for the Hooks type diff --git a/plugin/plugintest/mock/mock.go b/server/plugin/plugintest/mock/mock.go similarity index 100% rename from plugin/plugintest/mock/mock.go rename to server/plugin/plugintest/mock/mock.go diff --git a/plugin/product.go b/server/plugin/product.go similarity index 100% rename from plugin/product.go rename to server/plugin/product.go diff --git a/plugin/product_hooks_generated.go b/server/plugin/product_hooks_generated.go similarity index 99% rename from plugin/product_hooks_generated.go rename to server/plugin/product_hooks_generated.go index d3d51a930f..b81cc632a4 100644 --- a/plugin/product_hooks_generated.go +++ b/server/plugin/product_hooks_generated.go @@ -11,7 +11,7 @@ import ( "io" "reflect" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) type OnConfigurationChangeIFace interface { diff --git a/plugin/scheduler/scheduler.go b/server/plugin/scheduler/scheduler.go similarity index 76% rename from plugin/scheduler/scheduler.go rename to server/plugin/scheduler/scheduler.go index 218d80beef..0640477a1c 100644 --- a/plugin/scheduler/scheduler.go +++ b/server/plugin/scheduler/scheduler.go @@ -6,8 +6,8 @@ package scheduler import ( "time" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/plugin/scheduler/worker.go b/server/plugin/scheduler/worker.go similarity index 93% rename from plugin/scheduler/worker.go rename to server/plugin/scheduler/worker.go index 7b042130f4..a03e5795d0 100644 --- a/plugin/scheduler/worker.go +++ b/server/plugin/scheduler/worker.go @@ -4,9 +4,9 @@ package scheduler import ( - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/jobs" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type AppIface interface { diff --git a/plugin/stringifier.go b/server/plugin/stringifier.go similarity index 100% rename from plugin/stringifier.go rename to server/plugin/stringifier.go diff --git a/plugin/stringifier_test.go b/server/plugin/stringifier_test.go similarity index 100% rename from plugin/stringifier_test.go rename to server/plugin/stringifier_test.go diff --git a/plugin/supervisor.go b/server/plugin/supervisor.go similarity index 95% rename from plugin/supervisor.go rename to server/plugin/supervisor.go index 5c5bd84cc3..415ee3820c 100644 --- a/plugin/supervisor.go +++ b/server/plugin/supervisor.go @@ -18,9 +18,9 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/einterfaces" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type supervisor struct { diff --git a/plugin/supervisor_test.go b/server/plugin/supervisor_test.go similarity index 92% rename from plugin/supervisor_test.go rename to server/plugin/supervisor_test.go index 32d6cc6a0a..af9a55d759 100644 --- a/plugin/supervisor_test.go +++ b/server/plugin/supervisor_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/server/channels/utils" - "github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestSupervisor(t *testing.T) { diff --git a/server/scripts/config_generator/main.go b/server/scripts/config_generator/main.go index b7641cbbf0..6767d13912 100644 --- a/server/scripts/config_generator/main.go +++ b/server/scripts/config_generator/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" ) // generateDefaultConfig writes default config to outputFile. diff --git a/server/scripts/config_generator/main_test.go b/server/scripts/config_generator/main_test.go index 8dba358c44..da10cd3491 100644 --- a/server/scripts/config_generator/main_test.go +++ b/server/scripts/config_generator/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/v6/model" + "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/scripts/setup_go_work.sh b/server/scripts/setup_go_work.sh index 5415351813..821a48588e 100755 --- a/server/scripts/setup_go_work.sh +++ b/server/scripts/setup_go_work.sh @@ -8,13 +8,8 @@ then if [ "$BUILD_ENTERPRISE_READY" == "true" ] then - txt="${txt}use ../enterprise\n" + txt="${txt}use ../../enterprise\n" fi - if [ "$BUILD_PLAYBOOKS" == "true" ] - then - txt="${txt}use ../mattermost-plugin-playbooks\n" - fi - - printf "$txt" > "../go.work" + printf "$txt" > "go.work" fi