diff --git a/CODEOWNERS b/CODEOWNERS index 07ee57d26c..b0bd218122 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,9 +1,7 @@ -/plugin/ @mattermost/toolkit - /.github/workflows/channels-ci.yml @mattermost/web-platform /webapp/package.json @mattermost/web-platform /webapp/channels/package.json @mattermost/web-platform /webapp/Makefile @mattermost/web-platform /webapp/package-lock.json @mattermost/web-platform /webapp/platform/*/package.json @mattermost/web-platform -/webapp/scripts @mattermost/web-platform \ No newline at end of file +/webapp/scripts @mattermost/web-platform diff --git a/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js b/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js index 32c3591dd3..e924b17f82 100644 --- a/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js @@ -22,8 +22,6 @@ describe('New Channel modal with Boards enabled', () => { cy.apiLogin(sysadmin); cy.visit(`/${testTeam.name}/channels/town-square`); }); - - cy.shouldHaveFeatureFlag('BoardsProduct', true); }); it('MM-T5141 New Channel is created with an associated Board', () => { diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js index 0bf2363650..1aad5036be 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js @@ -145,4 +145,42 @@ describe('Edit Message', () => { cy.get(postText).should('have.text', `${secondMessage} Another new message Edited`); }); }); + + it('MM-T5416 should discard any changes made after cancelling the edit and opening the edit textbox again should display the original message', () => { + const message = 'World!'; + cy.postMessage(message); + + // * Verify message is sent and not pending + cy.getLastPostId().then((postId) => { + const postText = `#postMessageText_${postId}`; + cy.get(postText).should('have.text', message); + + // # Open edit textbox + cy.uiGetPostTextBox().type('{uparrow}'); + + // * Edit Post Input should appear, and edit the post + cy.get('#edit_textbox').should('be.visible'); + + // * Press the escape key to cancel + cy.get('#edit_textbox').should('have.text', message).type(' Another new message{esc}'); + cy.get('#edit_textbox').should('not.exist'); + + // * Check that the message wasn't edited + cy.get(postText).should('have.text', message); + }); + + cy.getLastPostId().then((postId) => { + const postText = `#postMessageText_${postId}`; + cy.get(postText).should('have.text', message); + + // # Open edit textbox again + cy.uiGetPostTextBox().type('{uparrow}'); + + // * Edit Post Input should appear, and edit the post + cy.get('#edit_textbox').should('be.visible'); + + // * Opening the edit textbox again after previously cancelling the edit should contain the original message. + cy.get('#edit_textbox').should('have.text', message); + }); + }); }); diff --git a/e2e-tests/playwright/global_setup.ts b/e2e-tests/playwright/global_setup.ts index d54d6ded88..53386e351f 100644 --- a/e2e-tests/playwright/global_setup.ts +++ b/e2e-tests/playwright/global_setup.ts @@ -5,7 +5,6 @@ import {expect} from '@playwright/test'; import {UserProfile} from '@mattermost/types/users'; import {Client, createRandomTeam, getAdminClient, getDefaultAdminUser, makeClient} from './support/server'; -import {boardsPluginId, callsPluginId} from './support/constant'; import {defaultTeam} from './support/util'; import testConfig from './test.config'; @@ -97,26 +96,15 @@ async function printClientInfo(client: Client) { - BuildHashEnterprise = ${config.BuildHashEnterprise} - BuildEnterpriseReady = ${config.BuildEnterpriseReady} - FeatureFlagAppsEnabled = ${config.FeatureFlagAppsEnabled} - - FeatureFlagBoardsProduct = ${config.FeatureFlagBoardsProduct} - FeatureFlagCallsEnabled = ${config.FeatureFlagCallsEnabled} - TelemetryId = ${config.TelemetryId}`); } -function getProductsAsPlugin() { - const productsAsPlugin = [callsPluginId]; - - if (!testConfig.boardsProductEnabled) { - productsAsPlugin.push(boardsPluginId); - } - - return productsAsPlugin; -} - async function ensurePluginsLoaded(client: Client) { const pluginStatus = await client.getPluginStatuses(); const plugins = await client.getPlugins(); - getProductsAsPlugin().forEach(async (pluginId) => { + testConfig.ensurePluginsInstalled.forEach(async (pluginId) => { const isInstalled = pluginStatus.some((plugin) => plugin.plugin_id === pluginId); if (!isInstalled) { // eslint-disable-next-line no-console diff --git a/e2e-tests/playwright/package-lock.json b/e2e-tests/playwright/package-lock.json index ef9a9a8578..6d5a200c81 100644 --- a/e2e-tests/playwright/package-lock.json +++ b/e2e-tests/playwright/package-lock.json @@ -8,7 +8,7 @@ "dependencies": { "@percy/cli": "1.18.0", "@percy/playwright": "1.0.4", - "@playwright/test": "1.30.0", + "@playwright/test": "1.32.3", "async-wait-until": "2.0.12", "chalk": "4.1.2", "deepmerge": "4.3.0", @@ -428,18 +428,21 @@ } }, "node_modules/@playwright/test": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz", - "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==", + "version": "1.32.3", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz", + "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==", "dependencies": { "@types/node": "*", - "playwright-core": "1.30.0" + "playwright-core": "1.32.3" }, "bin": { "playwright": "cli.js" }, "engines": { "node": ">=14" + }, + "optionalDependencies": { + "fsevents": "2.3.2" } }, "node_modules/@types/json-schema": { @@ -1396,6 +1399,19 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", @@ -1927,9 +1943,9 @@ } }, "node_modules/playwright-core": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz", - "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==", + "version": "1.32.3", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz", + "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==", "bin": { "playwright": "cli.js" }, @@ -2677,12 +2693,13 @@ "integrity": "sha512-4cSkWqpu7uK9zzeVwtMWrgGbP34GUlvZsWdEEt98ep6ZECQA+iGB75pOpIVwcsHKXtkDRE6fgugtxNXs5uHpMg==" }, "@playwright/test": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz", - "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==", + "version": "1.32.3", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz", + "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==", "requires": { "@types/node": "*", - "playwright-core": "1.30.0" + "fsevents": "2.3.2", + "playwright-core": "1.32.3" } }, "@types/json-schema": { @@ -3366,6 +3383,12 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "optional": true + }, "get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", @@ -3747,9 +3770,9 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" }, "playwright-core": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz", - "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==" + "version": "1.32.3", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz", + "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==" }, "prelude-ls": { "version": "1.2.1", diff --git a/e2e-tests/playwright/package.json b/e2e-tests/playwright/package.json index 8ee95ffa63..d2c21cbc69 100644 --- a/e2e-tests/playwright/package.json +++ b/e2e-tests/playwright/package.json @@ -13,7 +13,7 @@ "dependencies": { "@percy/cli": "1.18.0", "@percy/playwright": "1.0.4", - "@playwright/test": "1.30.0", + "@playwright/test": "1.32.3", "async-wait-until": "2.0.12", "chalk": "4.1.2", "deepmerge": "4.3.0", diff --git a/e2e-tests/playwright/playwright.config.ts b/e2e-tests/playwright/playwright.config.ts index a014c9cb3b..56fcbd2c30 100644 --- a/e2e-tests/playwright/playwright.config.ts +++ b/e2e-tests/playwright/playwright.config.ts @@ -6,7 +6,7 @@ import {defineConfig, devices} from '@playwright/test'; import {duration} from '@e2e-support/util'; import testConfig from '@e2e-test.config'; -const defaultOutputFolder = 'playwright-report'; +const defaultOutputFolder = './playwright-report'; export default defineConfig({ globalSetup: require.resolve('./global_setup'), diff --git a/e2e-tests/playwright/support/constant.ts b/e2e-tests/playwright/support/constant.ts index e5fd709f4e..35aa9bb5f4 100644 --- a/e2e-tests/playwright/support/constant.ts +++ b/e2e-tests/playwright/support/constant.ts @@ -1,6 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. +export const appsPluginId = 'com.mattermost.apps'; export const boardsPluginId = 'focalboard'; export const boardsProductId = 'boards'; export const callsPluginId = 'com.mattermost.calls'; diff --git a/e2e-tests/playwright/support/flag.ts b/e2e-tests/playwright/support/flag.ts index dfa82775bc..8e9a451c73 100644 --- a/e2e-tests/playwright/support/flag.ts +++ b/e2e-tests/playwright/support/flag.ts @@ -5,22 +5,10 @@ import os from 'node:os'; import {expect, test} from '@playwright/test'; -import {boardsPluginId, callsPluginId} from './constant'; +import {callsPluginId} from './constant'; import {getAdminClient} from './server/init'; import {isSmallScreen} from './util'; -export async function shouldHaveBoardsEnabled(enabled = true) { - const {adminClient} = await getAdminClient(); - const config = await adminClient.getConfig(); - - const boardsEnabled = - (typeof config.FeatureFlags.BoardsProduct === 'boolean' && config.FeatureFlags.BoardsProduct) || - config.PluginSettings.PluginStates[boardsPluginId].Enable; - - const matched = boardsEnabled === enabled; - expect(matched, matched ? '' : `Boards expect "${enabled}" but actual "${boardsEnabled}"`).toBeTruthy(); -} - export async function shouldHaveCallsEnabled(enabled = true) { const {adminClient} = await getAdminClient(); const config = await adminClient.getConfig(); diff --git a/e2e-tests/playwright/support/server/client.ts b/e2e-tests/playwright/support/server/client.ts index 32eb55f448..703275e0d7 100644 --- a/e2e-tests/playwright/support/server/client.ts +++ b/e2e-tests/playwright/support/server/client.ts @@ -167,8 +167,9 @@ async function makeClient(userRequest?: UserRequest, useCache = true): Promise; ExperimentalSettings: Partial; - FeatureFlags: Partial; PasswordSettings: Partial; PluginSettings: Partial; ServiceSettings: Partial; @@ -40,9 +38,6 @@ const onPremServerConfig = (): Partial => { ExperimentalSettings: { EnableAppBar: true, }, - FeatureFlags: { - BoardsProduct: testConfig.boardsProductEnabled, - }, PasswordSettings: { MinimumLength: 5, Lowercase: false, @@ -57,11 +52,6 @@ const onPremServerConfig = (): Partial => { defaultenabled: true, }, }, - PluginStates: { - focalboard: { - Enable: !testConfig.boardsProductEnabled, - }, - }, }, ServiceSettings: { SiteURL: testConfig.baseURL, @@ -180,7 +170,6 @@ const defaultServerConfig: AdminConfig = { EnableCustomGroups: true, SelfHostedPurchase: true, AllowSyncedDrafts: true, - SelfHostedExpansion: false, }, TeamSettings: { SiteName: 'Mattermost', @@ -686,7 +675,6 @@ const defaultServerConfig: AdminConfig = { GraphQL: false, InsightsEnabled: true, CommandPalette: false, - BoardsProduct: false, SendWelcomePost: true, WorkTemplate: false, PostPriority: true, diff --git a/e2e-tests/playwright/support/test_fixture.ts b/e2e-tests/playwright/support/test_fixture.ts index 8b7949634b..d35435dd7c 100644 --- a/e2e-tests/playwright/support/test_fixture.ts +++ b/e2e-tests/playwright/support/test_fixture.ts @@ -1,13 +1,7 @@ import {test as base, Browser} from '@playwright/test'; import {TestBrowser} from './browser_context'; -import { - shouldHaveBoardsEnabled, - shouldHaveCallsEnabled, - shouldHaveFeatureFlag, - shouldSkipInSmallScreen, - shouldRunInLinux, -} from './flag'; +import {shouldHaveCallsEnabled, shouldHaveFeatureFlag, shouldSkipInSmallScreen, shouldRunInLinux} from './flag'; import {initSetup, getAdminClient} from './server'; import {hideDynamicChannelsContent, waitForAnimationEnd, waitUntil} from './test_action'; import {pages} from './ui/pages'; @@ -36,7 +30,6 @@ class PlaywrightExtended { readonly testBrowser: TestBrowser; // ./flag - readonly shouldHaveBoardsEnabled; readonly shouldHaveCallsEnabled; readonly shouldHaveFeatureFlag; readonly shouldSkipInSmallScreen; @@ -62,7 +55,6 @@ class PlaywrightExtended { this.testBrowser = new TestBrowser(browser); // ./flag - this.shouldHaveBoardsEnabled = shouldHaveBoardsEnabled; this.shouldHaveCallsEnabled = shouldHaveCallsEnabled; this.shouldHaveFeatureFlag = shouldHaveFeatureFlag; this.shouldSkipInSmallScreen = shouldSkipInSmallScreen; diff --git a/e2e-tests/playwright/support/ui/components/channels/post_create.ts b/e2e-tests/playwright/support/ui/components/channels/post_create.ts index 2a8be0ec6d..912fcad80e 100644 --- a/e2e-tests/playwright/support/ui/components/channels/post_create.ts +++ b/e2e-tests/playwright/support/ui/components/channels/post_create.ts @@ -9,6 +9,7 @@ export default class ChannelsPostCreate { readonly input; readonly attachmentButton; readonly emojiButton; + readonly sendButton: Locator; constructor(container: Locator) { this.container = container; @@ -16,12 +17,17 @@ export default class ChannelsPostCreate { this.input = container.getByTestId('post_textbox'); this.attachmentButton = container.getByLabel('attachment'); this.emojiButton = container.getByLabel('select an emoji'); + this.sendButton = container.getByTestId('SendMessageButton'); } async postMessage(message: string) { await this.input.fill(message); } + async sendMessage() { + await this.sendButton.click(); + } + async toBeVisible() { await expect(this.container).toBeVisible(); await expect(this.input).toBeVisible(); diff --git a/e2e-tests/playwright/support/ui/pages/channels.ts b/e2e-tests/playwright/support/ui/pages/channels.ts index 948cb673c5..b9c76ffc4c 100644 --- a/e2e-tests/playwright/support/ui/pages/channels.ts +++ b/e2e-tests/playwright/support/ui/pages/channels.ts @@ -49,6 +49,10 @@ export default class ChannelsPage { await this.postCreate.postMessage(message); } + async sendMessage() { + await this.postCreate.sendMessage(); + } + async getFirstPost() { await this.page.getByTestId('postView').first().waitFor(); const post = await this.page.getByTestId('postView').first(); diff --git a/e2e-tests/playwright/test.config.ts b/e2e-tests/playwright/test.config.ts index 2d29d2a100..5a370a541e 100644 --- a/e2e-tests/playwright/test.config.ts +++ b/e2e-tests/playwright/test.config.ts @@ -3,6 +3,9 @@ import {Page, ViewportSize} from '@playwright/test'; import * as dotenv from 'dotenv'; + +import {appsPluginId, callsPluginId} from '@e2e-support/constant'; + dotenv.config(); export type TestArgs = { @@ -17,7 +20,7 @@ export type TestConfig = { adminUsername: string; adminPassword: string; adminEmail: string; - boardsProductEnabled: boolean; + ensurePluginsInstalled: string[]; resetBeforeTest: boolean; haClusterEnabled: boolean; haClusterNodeCount: number; @@ -41,7 +44,10 @@ const config: TestConfig = { adminUsername: process.env.PW_ADMIN_USERNAME || 'sysadmin', adminPassword: process.env.PW_ADMIN_PASSWORD || 'Sys@dmin-sample1', adminEmail: process.env.PW_ADMIN_EMAIL || 'sysadmin@sample.mattermost.com', - boardsProductEnabled: parseBool(process.env.PW_BOARDS_PRODUCT_ENABLED, true), + ensurePluginsInstalled: + typeof process.env?.PW_ENSURE_PLUGINS_INSTALLED === 'string' + ? process.env.PW_ENSURE_PLUGINS_INSTALLED.split(',') + : [appsPluginId, callsPluginId], haClusterEnabled: parseBool(process.env.PW_HA_CLUSTER_ENABLED, false), haClusterNodeCount: parseNumber(process.env.PW_HA_CLUSTER_NODE_COUNT, 2), haClusterName: process.env.PW_HA_CLUSTER_NAME || 'mm_dev_cluster', diff --git a/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts b/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts index d4e4c30681..0967d8577c 100644 --- a/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts +++ b/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts @@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag'; shouldSkipInSmallScreen(); test('MM-T4274 Create an Empty Board', async ({pw, pages}) => { - await pw.shouldHaveBoardsEnabled(); - // Create and sign in a new user const {user} = await pw.initSetup(); diff --git a/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts b/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts index ca130486db..1866840349 100644 --- a/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts +++ b/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts @@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag'; shouldSkipInSmallScreen(); test('Board template', async ({pw, pages, browserName, viewport}, testInfo) => { - await pw.shouldHaveBoardsEnabled(); - // Create and sign in a new user const {user} = await pw.initSetup(); diff --git a/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts b/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts index 00645a851b..f5a03b4ba9 100644 --- a/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts +++ b/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts @@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag'; shouldSkipInSmallScreen(); test('View untitled board', async ({pw, pages, browserName, viewport}, testInfo) => { - await pw.shouldHaveBoardsEnabled(); - // Create and sign in a new user const {user} = await pw.initSetup(); diff --git a/server/Makefile b/server/Makefile index 87130c4e3e..83b4fd5531 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,7 @@ 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') +SUITE_PACKAGES=$(shell $(GO) list ./...) TEMPLATES_DIR=templates @@ -142,7 +140,7 @@ TEMPLATES_DIR=templates PLUGIN_PACKAGES ?= mattermost-plugin-antivirus-v0.1.2 PLUGIN_PACKAGES += mattermost-plugin-autolink-v1.2.2 PLUGIN_PACKAGES += mattermost-plugin-aws-SNS-v1.2.0 -PLUGIN_PACKAGES += mattermost-plugin-calls-v0.14.0 +PLUGIN_PACKAGES += mattermost-plugin-calls-v0.15.1 PLUGIN_PACKAGES += mattermost-plugin-channel-export-v1.0.0 PLUGIN_PACKAGES += mattermost-plugin-confluence-v1.3.0 PLUGIN_PACKAGES += mattermost-plugin-custom-attributes-v1.3.1 @@ -170,9 +168,9 @@ endif EE_PACKAGES=$(shell $(GO) list $(BUILD_ENTERPRISE_DIR)/...) ifeq ($(BUILD_ENTERPRISE_READY),true) - ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) $(EE_PACKAGES) + ALL_PACKAGES=$(SUITE_PACKAGES) $(EE_PACKAGES) else - ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) + ALL_PACKAGES=$(SUITE_PACKAGES) endif all: run ## Alias for 'run'. @@ -189,7 +187,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 +268,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 +347,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 +378,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 @@ -412,7 +410,7 @@ go-junit-report: test-compile: ## Compile tests. @echo COMPILE TESTS - for package in $(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) $(EE_PACKAGES); do \ + for package in $(SUITE_PACKAGES) $(EE_PACKAGES); do \ $(GO) test $(GOFLAGS) -c $$package; \ done @@ -450,9 +448,7 @@ else endif test-server-race: test-server-pre - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(TE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(BOARDS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" - MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(PLAYBOOKS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" + ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(SUITE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic" ifneq ($(IS_CI),true) ifneq ($(MM_NO_DOCKER),true) ifneq ($(TEMP_DOCKER_SERVICES),) @@ -463,9 +459,7 @@ ifneq ($(IS_CI),true) endif test-server: test-server-pre - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(TE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count" - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(BOARDS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count" - MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(PLAYBOOKS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count" + ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(SUITE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "count" ifneq ($(IS_CI),true) ifneq ($(MM_NO_DOCKER),true) ifneq ($(TEMP_DOCKER_SERVICES),) @@ -477,19 +471,15 @@ endif test-server-ee: check-prereqs-enterprise start-docker go-junit-report do-cover-file ## Runs EE tests. @echo Running only EE tests - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "20m" "count" + ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "20m" "count" test-server-quick: check-prereqs-enterprise ## Runs only quick tests. ifeq ($(BUILD_ENTERPRISE_READY),true) @echo Running all tests - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(TE_PACKAGES) $(EE_PACKAGES) - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false $(GO) test $(GOFLAGS) -short $(BOARDS_PACKAGES) - MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(PLAYBOOKS_PACKAGES) + $(GO) test $(GOFLAGS) -short $(SUITE_PACKAGES) $(EE_PACKAGES) else @echo Running only TE tests - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(TE_PACKAGES) - MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false $(GO) test $(GOFLAGS) -short $(BOARDS_PACKAGES) - MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(PLAYBOOKS_PACKAGES) + $(GO) test $(GOFLAGS) -short $(SUITE_PACKAGES) endif internal-test-web-client: ## Runs web client tests. @@ -552,20 +542,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 +723,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 312e3cd37e..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) { @@ -72,7 +72,6 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) { query := r.URL.Query() parentID := query.Get("parent_id") blockType := query.Get("type") - all := query.Get("all") blockID := query.Get("block_id") boardID := mux.Vars(r)["boardID"] @@ -122,18 +121,11 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) { auditRec.AddMeta("boardID", boardID) auditRec.AddMeta("parentID", parentID) auditRec.AddMeta("blockType", blockType) - auditRec.AddMeta("all", all) auditRec.AddMeta("blockID", blockID) var blocks []*model.Block var block *model.Block switch { - case all != "": - blocks, err = a.app.GetBlocksForBoard(boardID) - if err != nil { - a.errorResponse(w, r, err) - return - } case blockID != "": block, err = a.app.GetBlockByID(blockID) if err != nil { @@ -148,7 +140,12 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) { blocks = append(blocks, block) default: - blocks, err = a.app.GetBlocks(boardID, parentID, blockType) + opts := model.QueryBlocksOptions{ + BoardID: boardID, + ParentID: parentID, + BlockType: model.BlockType(blockType), + } + blocks, err = a.app.GetBlocks(opts) if err != nil { a.errorResponse(w, r, err) return 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 0e736212c9..41de8d5736 100644 --- a/server/boards/app/blocks.go +++ b/server/boards/app/blocks.go @@ -9,29 +9,20 @@ 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") -func (a *App) GetBlocks(boardID, parentID string, blockType string) ([]*model.Block, error) { - if boardID == "" { +func (a *App) GetBlocks(opts model.QueryBlocksOptions) ([]*model.Block, error) { + if opts.BoardID == "" { return []*model.Block{}, nil } - - if blockType != "" && parentID != "" { - return a.store.GetBlocksWithParentAndType(boardID, parentID, blockType) - } - - if blockType != "" { - return a.store.GetBlocksWithType(boardID, blockType) - } - - return a.store.GetBlocksWithParent(boardID, parentID) + return a.store.GetBlocks(opts) } func (a *App) DuplicateBlock(boardID string, blockID string, userID string, asTemplate bool) ([]*model.Block, error) { @@ -514,10 +505,6 @@ func (a *App) GetBlockCountsByType() (map[string]int64, error) { return a.store.GetBlockCountsByType() } -func (a *App) GetBlocksForBoard(boardID string) ([]*model.Block, error) { - return a.store.GetBlocksForBoard(boardID) -} - func (a *App) notifyBlockChanged(action notify.Action, block *model.Block, oldBlock *model.Block, modifiedByID string) { // don't notify if notifications service disabled, or block change is generated via system user. if a.notifications == nil || modifiedByID == model.SystemUserID { diff --git a/server/boards/app/blocks_test.go b/server/boards/app/blocks_test.go index 9e4f53c2f9..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 { @@ -207,10 +207,17 @@ func TestIsWithinViewsLimit(t *testing.T) { Views: mm_model.NewInt(2), }, } + + opts := model.QueryBlocksOptions{ + BoardID: "board_id", + ParentID: "parent_id", + BlockType: model.BlockType("view"), + } + th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil) th.Store.EXPECT().GetUsedCardsCount().Return(1, nil) th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil) - th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil) + th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil) withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"}) assert.NoError(t, err) @@ -225,10 +232,17 @@ func TestIsWithinViewsLimit(t *testing.T) { Views: mm_model.NewInt(1), }, } + + opts := model.QueryBlocksOptions{ + BoardID: "board_id", + ParentID: "parent_id", + BlockType: model.BlockType("view"), + } + th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil) th.Store.EXPECT().GetUsedCardsCount().Return(1, nil) th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil) - th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil) + th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil) withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"}) assert.NoError(t, err) @@ -243,10 +257,17 @@ func TestIsWithinViewsLimit(t *testing.T) { Views: mm_model.NewInt(2), }, } + + opts := model.QueryBlocksOptions{ + BoardID: "board_id", + ParentID: "parent_id", + BlockType: model.BlockType("view"), + } + th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil) th.Store.EXPECT().GetUsedCardsCount().Return(1, nil) th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil) - th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}, {}, {}}, nil) + th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}, {}, {}}, nil) withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"}) assert.NoError(t, err) @@ -261,10 +282,17 @@ func TestIsWithinViewsLimit(t *testing.T) { Views: mm_model.NewInt(2), }, } + + opts := model.QueryBlocksOptions{ + BoardID: "board_id", + ParentID: "parent_id", + BlockType: model.BlockType("view"), + } + th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil) th.Store.EXPECT().GetUsedCardsCount().Return(1, nil) th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil) - th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{}, nil) + th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{}, nil) withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"}) assert.NoError(t, err) @@ -333,10 +361,17 @@ func TestInsertBlocks(t *testing.T) { Views: mm_model.NewInt(2), }, } + + opts := model.QueryBlocksOptions{ + BoardID: "test-board-id", + ParentID: "parent_id", + BlockType: model.BlockType("view"), + } + th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil) th.Store.EXPECT().GetUsedCardsCount().Return(1, nil) th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil) - th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}}, nil) + th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil) _, err := th.App.InsertBlocks([]*model.Block{block}, "user-id-1") require.NoError(t, err) @@ -365,10 +400,17 @@ func TestInsertBlocks(t *testing.T) { Views: mm_model.NewInt(2), }, } + + opts := model.QueryBlocksOptions{ + BoardID: "test-board-id", + ParentID: "parent_id", + BlockType: model.BlockType("view"), + } + th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil) th.Store.EXPECT().GetUsedCardsCount().Return(1, nil) th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil) - th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}, {}}, nil) + th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}, {}}, nil) _, err := th.App.InsertBlocks([]*model.Block{block}, "user-id-1") require.Error(t, err) @@ -406,10 +448,17 @@ func TestInsertBlocks(t *testing.T) { Views: mm_model.NewInt(2), }, } + + opts := model.QueryBlocksOptions{ + BoardID: "test-board-id", + ParentID: "parent_id", + BlockType: model.BlockType("view"), + } + th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil).Times(2) th.Store.EXPECT().GetUsedCardsCount().Return(1, nil).Times(2) th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil).Times(2) - th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}}, nil).Times(2) + th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil).Times(2) _, err := th.App.InsertBlocks([]*model.Block{view1, view2}, "user-id-1") require.Error(t, err) 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 4f717be041..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 ( @@ -86,7 +86,7 @@ func (a *App) writeArchiveBoard(zw *zip.Writer, board model.Board, opt model.Exp var files []string // write the board's blocks // TODO: paginate this - blocks, err := a.GetBlocksForBoard(board.ID) + blocks, err := a.GetBlocks(model.QueryBlocksOptions{BoardID: board.ID}) if err != nil { return err } 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 1b038d5768..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 { @@ -58,6 +58,10 @@ func (a *Auth) IsValidReadToken(boardID string, readToken string) (bool, error) return false, err } + if !a.config.EnablePublicSharedBoards { + return false, errors.New("public shared boards disabled") + } + if sharing != nil && (sharing.ID == boardID && sharing.Enabled && sharing.Token == readToken) { return true, nil } 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 8541265c38..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" ) @@ -133,7 +133,7 @@ func TestCreateBoardsAndBlocks(t *testing.T) { require.Equal(t, "public board", board1.Title) require.Equal(t, model.BoardTypeOpen, board1.Type) require.NotEqual(t, "board-id-1", board1.ID) - blocks1, err := th.Server.App().GetBlocksForBoard(board1.ID) + blocks1, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: board1.ID}) require.NoError(t, err) require.Len(t, blocks1, 1) require.Equal(t, "block 1", blocks1[0].Title) @@ -147,7 +147,7 @@ func TestCreateBoardsAndBlocks(t *testing.T) { require.Equal(t, "private board", board2.Title) require.Equal(t, model.BoardTypePrivate, board2.Type) require.NotEqual(t, "board-id-2", board2.ID) - blocks2, err := th.Server.App().GetBlocksForBoard(board2.ID) + blocks2, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: board2.ID}) require.NoError(t, err) require.Len(t, blocks2, 1) require.Equal(t, "block 2", blocks2[0].Title) 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 ad11791367..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" ) @@ -388,6 +388,11 @@ func (th *TestHelper) TearDown() { panic(err) } + err = th.Server.Store().Shutdown() + if err != nil { + panic(err) + } + os.RemoveAll(th.Server.Config().FilesPath) if err := os.Remove(th.Server.Config().DBConfigString); err == nil { 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 40de905346..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) { @@ -62,7 +62,7 @@ func TestExportBoard(t *testing.T) { require.NoError(t, err) require.Len(t, boardsImported, 1) boardImported := boardsImported[0] - blocksImported, err := th.Server.App().GetBlocksForBoard(boardImported.ID) + blocksImported, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: boardImported.ID}) require.NoError(t, err) require.Len(t, blocksImported, 1) require.Equal(t, block.Title, blocksImported[0].Title) 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 573f55c2db..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 { @@ -585,6 +585,35 @@ func TestPermissionsGetBoard(t *testing.T) { }) } +func TestPermissionsGetBoardPublic(t *testing.T) { + ttCases := []TestCase{ + {"/boards/{PRIVATE_BOARD_ID}?read_token=invalid", methodGet, "", userAnon, http.StatusUnauthorized, 0}, + {"/boards/{PRIVATE_BOARD_ID}?read_token=valid", methodGet, "", userAnon, http.StatusUnauthorized, 1}, + {"/boards/{PRIVATE_BOARD_ID}?read_token=invalid", methodGet, "", userNoTeamMember, http.StatusForbidden, 0}, + {"/boards/{PRIVATE_BOARD_ID}?read_token=valid", methodGet, "", userTeamMember, http.StatusForbidden, 1}, + } + t.Run("plugin", func(t *testing.T) { + th := SetupTestHelperPluginMode(t) + defer th.TearDown() + cfg := th.Server.Config() + cfg.EnablePublicSharedBoards = false + th.Server.UpdateAppConfig() + clients := setupClients(th) + testData := setupData(t, th) + runTestCases(t, ttCases, testData, clients) + }) + t.Run("local", func(t *testing.T) { + th := SetupTestHelperLocalMode(t) + defer th.TearDown() + cfg := th.Server.Config() + cfg.EnablePublicSharedBoards = false + th.Server.UpdateAppConfig() + clients := setupLocalClients(th) + testData := setupData(t, th) + runTestCases(t, ttCases, testData, clients) + }) +} + func TestPermissionsPatchBoard(t *testing.T) { ttCases := []TestCase{ {"/boards/{PRIVATE_BOARD_ID}", methodPatch, "{\"title\": \"test\"}", userAnon, http.StatusUnauthorized, 0}, 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 587c648eff..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 @@ -176,7 +176,7 @@ type QueryBlocksOptions struct { ParentID string // if not empty then filter for blocks belonging to specified parent BlockType BlockType // if not empty and not `TypeUnknown` then filter for records of specified block type Page int // page number to select when paginating - PerPage int // number of blocks per page (default=-1, meaning unlimited) + PerPage int // number of blocks per page (default=0, meaning unlimited) } // QuerySubtreeOptions are query options that can be passed to GetSubTree methods. 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..0a8f106042 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 ( @@ -20,11 +20,13 @@ const ( botDescription = "Created by Boards plugin." ) -var FocalboardBot = &mm_model.Bot{ - Username: botUsername, - DisplayName: botDisplayname, - Description: botDescription, - OwnerId: SystemUserID, +func GetDefaultFocalboardBot() *mm_model.Bot { + return &mm_model.Bot{ + Username: botUsername, + DisplayName: botDisplayname, + Description: botDescription, + OwnerId: SystemUserID, + } } type ServicesAPI interface { 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..656e37f999 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 { @@ -66,7 +66,7 @@ func createSubscriptionsNotifyBackend(params notifyBackendParams) (*notifysubscr } func createDelivery(servicesAPI model.ServicesAPI, serverRoot string) (*plugindelivery.PluginDelivery, error) { - bot := model.FocalboardBot + bot := model.GetDefaultFocalboardBot() botID, err := servicesAPI.EnsureBot(bot) if err != nil { 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 9a364d25c9..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 ( @@ -355,7 +355,7 @@ func (s *Server) Shutdown() error { defer s.logger.Info("Server.Shutdown") - return s.store.Shutdown() + return nil } func (s *Server) Config() *config.Configuration { 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..b024d5224a 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 @@ -70,9 +70,10 @@ func New(dbType string, db *sql.DB, store store.Store, logger mlog.LoggerIFace, return layer, nil } -// Shutdown close the connection with the store. +// For MattermostAuthLayer we don't close the database connection +// because it's directly managed by the platform func (s *MattermostAuthLayer) Shutdown() error { - return s.Store.Shutdown() + return nil } func (s *MattermostAuthLayer) GetRegisteredUserCount() (int, error) { @@ -1218,7 +1219,7 @@ func (s *MattermostAuthLayer) GetChannel(teamID, channelID string) (*mm_model.Ch func (s *MattermostAuthLayer) getBoardsBotID() (string, error) { if boardsBotID == "" { var err error - boardsBotID, err = s.servicesAPI.EnsureBot(model.FocalboardBot) + boardsBotID, err = s.servicesAPI.EnsureBot(model.GetDefaultFocalboardBot()) if err != nil { s.logger.Error("failed to ensure boards bot", mlog.Err(err)) return "", err diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go index caa6bc88c3..88a936db9f 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" ) @@ -24,11 +24,11 @@ func TestGetBoardsBotID(t *testing.T) { mmAuthLayer, _ := New("test", nil, nil, mlog.CreateConsoleTestLogger(true, mlog.LvlError), servicesAPI, "") - servicesAPI.EXPECT().EnsureBot(model.FocalboardBot).Return("", errTest) + servicesAPI.EXPECT().EnsureBot(model.GetDefaultFocalboardBot()).Return("", errTest) _, err := mmAuthLayer.getBoardsBotID() require.NotEmpty(t, err) - servicesAPI.EXPECT().EnsureBot(model.FocalboardBot).Return("TestBotID", nil).Times(1) + servicesAPI.EXPECT().EnsureBot(model.GetDefaultFocalboardBot()).Return("TestBotID", nil).Times(1) botID, err := mmAuthLayer.getBoardsBotID() require.Empty(t, err) require.NotEmpty(t, botID) diff --git a/server/boards/services/store/mockstore/mockstore.go b/server/boards/services/store/mockstore/mockstore.go index 1c5f6e0c21..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 @@ -536,71 +536,11 @@ func (mr *MockStoreMockRecorder) GetBlocksComplianceHistory(arg0 interface{}) *g return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksComplianceHistory", reflect.TypeOf((*MockStore)(nil).GetBlocksComplianceHistory), arg0) } -// GetBlocksForBoard mocks base method. -func (m *MockStore) GetBlocksForBoard(arg0 string) ([]*model0.Block, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetBlocksForBoard", arg0) - ret0, _ := ret[0].([]*model0.Block) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBlocksForBoard indicates an expected call of GetBlocksForBoard. -func (mr *MockStoreMockRecorder) GetBlocksForBoard(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksForBoard", reflect.TypeOf((*MockStore)(nil).GetBlocksForBoard), arg0) -} - -// GetBlocksWithParent mocks base method. -func (m *MockStore) GetBlocksWithParent(arg0, arg1 string) ([]*model0.Block, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetBlocksWithParent", arg0, arg1) - ret0, _ := ret[0].([]*model0.Block) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBlocksWithParent indicates an expected call of GetBlocksWithParent. -func (mr *MockStoreMockRecorder) GetBlocksWithParent(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksWithParent", reflect.TypeOf((*MockStore)(nil).GetBlocksWithParent), arg0, arg1) -} - -// GetBlocksWithParentAndType mocks base method. -func (m *MockStore) GetBlocksWithParentAndType(arg0, arg1, arg2 string) ([]*model0.Block, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetBlocksWithParentAndType", arg0, arg1, arg2) - ret0, _ := ret[0].([]*model0.Block) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBlocksWithParentAndType indicates an expected call of GetBlocksWithParentAndType. -func (mr *MockStoreMockRecorder) GetBlocksWithParentAndType(arg0, arg1, arg2 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksWithParentAndType", reflect.TypeOf((*MockStore)(nil).GetBlocksWithParentAndType), arg0, arg1, arg2) -} - -// GetBlocksWithType mocks base method. -func (m *MockStore) GetBlocksWithType(arg0, arg1 string) ([]*model0.Block, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetBlocksWithType", arg0, arg1) - ret0, _ := ret[0].([]*model0.Block) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetBlocksWithType indicates an expected call of GetBlocksWithType. -func (mr *MockStoreMockRecorder) GetBlocksWithType(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksWithType", reflect.TypeOf((*MockStore)(nil).GetBlocksWithType), arg0, arg1) -} - // 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 } @@ -612,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 } @@ -628,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 } @@ -659,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 } @@ -674,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 } @@ -689,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 @@ -705,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 @@ -721,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 } @@ -736,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 } @@ -766,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 } @@ -781,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 } @@ -796,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 } @@ -811,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 } @@ -826,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 } @@ -840,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 } @@ -855,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 } @@ -870,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 } @@ -885,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 } @@ -900,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 } @@ -930,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 } @@ -945,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 } @@ -960,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 } @@ -990,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 } @@ -1005,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 } @@ -1020,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 } @@ -1065,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 } @@ -1080,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 } @@ -1110,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 } @@ -1125,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 } @@ -1155,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 } @@ -1170,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 } @@ -1185,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 } @@ -1200,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 } @@ -1215,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 } @@ -1230,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 } @@ -1245,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 } @@ -1275,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 } @@ -1290,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 } @@ -1305,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) @@ -1319,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) @@ -1333,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 } @@ -1348,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 } @@ -1364,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) @@ -1378,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) @@ -1392,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 } @@ -1407,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 } @@ -1422,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 } @@ -1451,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) @@ -1465,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) @@ -1524,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) @@ -1538,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 } @@ -1553,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 } @@ -1568,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 } @@ -1583,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 } @@ -1598,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 } @@ -1712,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) @@ -1726,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) @@ -1754,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 } @@ -1797,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 } @@ -1812,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) @@ -1826,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) @@ -1840,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 67318e6b25..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 ( @@ -105,23 +105,6 @@ func (s *SQLStore) getBlocks(db sq.BaseRunner, opts model.QueryBlocksOptions) ([ return s.blocksFromRows(rows) } -func (s *SQLStore) getBlocksWithParentAndType(db sq.BaseRunner, boardID, parentID string, blockType string) ([]*model.Block, error) { - opts := model.QueryBlocksOptions{ - BoardID: boardID, - ParentID: parentID, - BlockType: model.BlockType(blockType), - } - return s.getBlocks(db, opts) -} - -func (s *SQLStore) getBlocksWithParent(db sq.BaseRunner, boardID, parentID string) ([]*model.Block, error) { - opts := model.QueryBlocksOptions{ - BoardID: boardID, - ParentID: parentID, - } - return s.getBlocks(db, opts) -} - func (s *SQLStore) getBlocksByIDs(db sq.BaseRunner, ids []string) ([]*model.Block, error) { query := s.getQueryBuilder(db). Select(s.blockFields("")...). @@ -148,14 +131,6 @@ func (s *SQLStore) getBlocksByIDs(db sq.BaseRunner, ids []string) ([]*model.Bloc return blocks, nil } -func (s *SQLStore) getBlocksWithType(db sq.BaseRunner, boardID, blockType string) ([]*model.Block, error) { - opts := model.QueryBlocksOptions{ - BoardID: boardID, - BlockType: model.BlockType(blockType), - } - return s.getBlocks(db, opts) -} - // getSubTree2 returns blocks within 2 levels of the given blockID. func (s *SQLStore) getSubTree2(db sq.BaseRunner, boardID string, blockID string, opts model.QuerySubtreeOptions) ([]*model.Block, error) { query := s.getQueryBuilder(db). @@ -188,13 +163,6 @@ func (s *SQLStore) getSubTree2(db sq.BaseRunner, boardID string, blockID string, return s.blocksFromRows(rows) } -func (s *SQLStore) getBlocksForBoard(db sq.BaseRunner, boardID string) ([]*model.Block, error) { - opts := model.QueryBlocksOptions{ - BoardID: boardID, - } - return s.getBlocks(db, opts) -} - func (s *SQLStore) blocksFromRows(rows *sql.Rows) ([]*model.Block, error) { results := []*model.Block{} 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 23d8f5696c..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 { @@ -166,7 +166,7 @@ func (s *SQLStore) duplicateBoard(db sq.BaseRunner, boardID string, userID strin } bab.Boards = []*model.Board{board} - blocks, err := s.getBlocksForBoard(db, boardID) + blocks, err := s.getBlocks(db, model.QueryBlocksOptions{BoardID: boardID}) if err != nil { return nil, nil, err } 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 dca9d162bf..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 { @@ -326,26 +326,6 @@ func (s *SQLStore) GetBlocksComplianceHistory(opts model.QueryBlocksComplianceHi } -func (s *SQLStore) GetBlocksForBoard(boardID string) ([]*model.Block, error) { - return s.getBlocksForBoard(s.db, boardID) - -} - -func (s *SQLStore) GetBlocksWithParent(boardID string, parentID string) ([]*model.Block, error) { - return s.getBlocksWithParent(s.db, boardID, parentID) - -} - -func (s *SQLStore) GetBlocksWithParentAndType(boardID string, parentID string, blockType string) ([]*model.Block, error) { - return s.getBlocksWithParentAndType(s.db, boardID, parentID, blockType) - -} - -func (s *SQLStore) GetBlocksWithType(boardID string, blockType string) ([]*model.Block, error) { - return s.getBlocksWithType(s.db, boardID, blockType) - -} - func (s *SQLStore) GetBoard(id string) (*model.Board, error) { return s.getBoard(s.db, id) 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..34be3d446d 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. @@ -199,6 +199,10 @@ func (s *SQLStore) DBVersion() string { return version } +// dropAllTables deletes the contents of all the database tables +// except the schema_migrations table with the intention of cleaning +// the state for the next text to execute without having to run the +// migrations. func (s *SQLStore) dropAllTables(db sq.BaseRunner) error { if s.DBType() == model.PostgresDBType { _, err := db.Exec(`DO 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 5d4da0460b..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" @@ -18,12 +18,8 @@ const CardLimitTimestampSystemKey = "card_limit_timestamp" // Store represents the abstraction of the data storage. type Store interface { GetBlocks(opts model.QueryBlocksOptions) ([]*model.Block, error) - GetBlocksWithParentAndType(boardID, parentID string, blockType string) ([]*model.Block, error) - GetBlocksWithParent(boardID, parentID string) ([]*model.Block, error) GetBlocksByIDs(ids []string) ([]*model.Block, error) - GetBlocksWithType(boardID, blockType string) ([]*model.Block, error) GetSubTree2(boardID, blockID string, opts model.QuerySubtreeOptions) ([]*model.Block, error) - GetBlocksForBoard(boardID string) ([]*model.Block, error) // @withTransaction InsertBlock(block *model.Block, userID string) error // @withTransaction diff --git a/server/boards/services/store/storetests/blocks.go b/server/boards/services/store/storetests/blocks.go index 85dbae606b..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" @@ -69,7 +69,7 @@ func testInsertBlock(t *testing.T, store store.Store) { userID := testUserID boardID := testBoardID - blocks, errBlocks := store.GetBlocksForBoard(boardID) + blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, errBlocks) initialCount := len(blocks) @@ -85,7 +85,7 @@ func testInsertBlock(t *testing.T, store store.Store) { err := store.InsertBlock(block, "user-id-1") require.NoError(t, err) - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount+1) @@ -105,7 +105,7 @@ func testInsertBlock(t *testing.T, store store.Store) { err := store.InsertBlock(block, "user-id-1") require.Error(t, err) - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount+1) }) @@ -121,7 +121,7 @@ func testInsertBlock(t *testing.T, store store.Store) { err := store.InsertBlock(block, "user-id-1") require.Error(t, err) - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount+1) }) @@ -204,7 +204,7 @@ func testInsertBlock(t *testing.T, store store.Store) { func testInsertBlocks(t *testing.T, store store.Store) { userID := testUserID - blocks, errBlocks := store.GetBlocksForBoard("id-test") + blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: "id-test"}) require.NoError(t, errBlocks) initialCount := len(blocks) @@ -227,7 +227,7 @@ func testInsertBlocks(t *testing.T, store store.Store) { err := store.InsertBlocks(newBlocks, "user-id-1") require.Error(t, err) - blocks, err := store.GetBlocksForBoard("id-test") + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: "id-test"}) require.NoError(t, err) // no blocks should have been inserted require.Len(t, blocks, initialCount) @@ -249,7 +249,7 @@ func testPatchBlock(t *testing.T, store store.Store) { err := store.InsertBlock(block, "user-id-1") require.NoError(t, err) - blocks, errBlocks := store.GetBlocksForBoard(boardID) + blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, errBlocks) initialCount := len(blocks) @@ -259,7 +259,7 @@ func testPatchBlock(t *testing.T, store store.Store) { require.ErrorAs(t, err, &nf) require.True(t, model.IsErrNotFound(err)) - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount) }) @@ -272,7 +272,7 @@ func testPatchBlock(t *testing.T, store store.Store) { err := store.PatchBlock("id-test", blockPatch, "user-id-1") require.Error(t, err) - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount) }) @@ -452,7 +452,7 @@ var ( func testGetSubTree2(t *testing.T, store store.Store) { boardID := testBoardID - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) initialCount := len(blocks) @@ -460,7 +460,7 @@ func testGetSubTree2(t *testing.T, store store.Store) { time.Sleep(1 * time.Millisecond) defer DeleteBlocks(t, store, subtreeSampleBlocks, "test") - blocks, err = store.GetBlocksForBoard(boardID) + blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount+6) @@ -492,7 +492,7 @@ func testDeleteBlock(t *testing.T, store store.Store) { userID := testUserID boardID := testBoardID - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) initialCount := len(blocks) @@ -516,7 +516,7 @@ func testDeleteBlock(t *testing.T, store store.Store) { InsertBlocks(t, store, blocksToInsert, "user-id-1") defer DeleteBlocks(t, store, blocksToInsert, "test") - blocks, err = store.GetBlocksForBoard(boardID) + blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount+3) @@ -550,7 +550,7 @@ func testUndeleteBlock(t *testing.T, store store.Store) { boardID := testBoardID userID := testUserID - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) initialCount := len(blocks) @@ -574,7 +574,7 @@ func testUndeleteBlock(t *testing.T, store store.Store) { InsertBlocks(t, store, blocksToInsert, "user-id-1") defer DeleteBlocks(t, store, blocksToInsert, "test") - blocks, err = store.GetBlocksForBoard(boardID) + blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, initialCount+3) @@ -643,7 +643,7 @@ func testUndeleteBlock(t *testing.T, store store.Store) { func testGetBlocks(t *testing.T, store store.Store) { boardID := testBoardID - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) blocksToInsert := []*model.Block{ @@ -686,65 +686,74 @@ func testGetBlocks(t *testing.T, store store.Store) { InsertBlocks(t, store, blocksToInsert, "user-id-1") defer DeleteBlocks(t, store, blocksToInsert, "test") - t.Run("not existing parent", func(t *testing.T) { + t.Run("not existing parent with type", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksWithParentAndType(boardID, "not-exists", "test") + opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "not-exists", BlockType: model.BlockType("test")} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Empty(t, blocks) }) - t.Run("not existing type", func(t *testing.T) { + t.Run("not existing type with parent", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksWithParentAndType(boardID, "block1", "not-existing") + opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "block1", BlockType: model.BlockType("not-existing")} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Empty(t, blocks) }) t.Run("valid parent and type", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksWithParentAndType(boardID, "block1", "test") + opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "block1", BlockType: model.BlockType("test")} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Len(t, blocks, 2) }) t.Run("not existing parent", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksWithParent(boardID, "not-exists") + opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "not-exists"} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Empty(t, blocks) }) t.Run("valid parent", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksWithParent(boardID, "block1") + opts := model.QueryBlocksOptions{BoardID: boardID, ParentID: "block1"} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Len(t, blocks, 3) }) t.Run("not existing type", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksWithType(boardID, "not-exists") + opts := model.QueryBlocksOptions{BoardID: boardID, BlockType: model.BlockType("not-exists")} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Empty(t, blocks) }) t.Run("valid type", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksWithType(boardID, "test") + opts := model.QueryBlocksOptions{BoardID: boardID, BlockType: model.BlockType("test")} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Len(t, blocks, 4) }) t.Run("not existing board", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksForBoard("not-exists") + opts := model.QueryBlocksOptions{BoardID: "not-exists"} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Empty(t, blocks) }) t.Run("all blocks of the a board", func(t *testing.T) { time.Sleep(1 * time.Millisecond) - blocks, err = store.GetBlocksForBoard(boardID) + opts := model.QueryBlocksOptions{BoardID: boardID} + blocks, err = store.GetBlocks(opts) require.NoError(t, err) require.Len(t, blocks, 5) }) @@ -863,7 +872,7 @@ func testDuplicateBlock(t *testing.T, store store.Store) { func testGetBlockMetadata(t *testing.T, store store.Store) { boardID := testBoardID - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) blocksToInsert := []*model.Block{ @@ -1082,12 +1091,20 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) { require.Nil(t, block) // ensure the card children were deleted - blocks, err := store.GetBlocksWithParentAndType(cardDelete.BoardID, cardDelete.ID, model.TypeText) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{ + BoardID: cardDelete.BoardID, + ParentID: cardDelete.ID, + BlockType: model.TypeText}, + ) require.NoError(t, err) assert.Empty(t, blocks) // ensure the other card children remain. - blocks, err = store.GetBlocksWithParentAndType(cardKeep.BoardID, cardKeep.ID, model.TypeText) + blocks, err = store.GetBlocks(model.QueryBlocksOptions{ + BoardID: cardKeep.BoardID, + ParentID: cardKeep.ID, + BlockType: model.TypeText}, + ) require.NoError(t, err) assert.Len(t, blocks, len(blocksKeep)) @@ -1101,7 +1118,11 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) { require.NotNil(t, block) // ensure the card children were restored - blocks, err = store.GetBlocksWithParentAndType(cardDelete.BoardID, cardDelete.ID, model.TypeText) + blocks, err = store.GetBlocks(model.QueryBlocksOptions{ + BoardID: cardDelete.BoardID, + ParentID: cardDelete.ID, + BlockType: model.TypeText}, + ) require.NoError(t, err) assert.Len(t, blocks, len(blocksDelete)) }) @@ -1117,12 +1138,12 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) { require.Nil(t, board) // ensure all cards and blocks for the board were deleted - blocks, err := store.GetBlocksForBoard(boardDelete.ID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardDelete.ID}) require.NoError(t, err) assert.Empty(t, blocks) // ensure the other board's cards and blocks remain. - blocks, err = store.GetBlocksForBoard(boardKeep.ID) + blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardKeep.ID}) require.NoError(t, err) assert.Len(t, blocks, len(blocksKeep)+len(cardsKeep)) @@ -1136,7 +1157,7 @@ func testUndeleteBlockChildren(t *testing.T, store store.Store) { require.NotNil(t, board) // ensure the board's cards and blocks were restored. - blocks, err = store.GetBlocksForBoard(boardDelete.ID) + blocks, err = store.GetBlocks(model.QueryBlocksOptions{BoardID: boardDelete.ID}) require.NoError(t, err) assert.Len(t, blocks, len(blocksDelete)+len(cardsDelete)) }) 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 83901845ed..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" ) @@ -98,7 +98,7 @@ func LoadData(t *testing.T, store store.Store) { func testRunDataRetention(t *testing.T, store store.Store, batchSize int) { LoadData(t, store) - blocks, err := store.GetBlocksForBoard(boardID) + blocks, err := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, err) require.Len(t, blocks, 4) initialCount := len(blocks) @@ -115,7 +115,7 @@ func testRunDataRetention(t *testing.T, store store.Store, batchSize int) { require.True(t, deletions > int64(initialCount)) // expect all blocks to be deleted. - blocks, errBlocks := store.GetBlocksForBoard(boardID) + blocks, errBlocks := store.GetBlocks(model.QueryBlocksOptions{BoardID: boardID}) require.NoError(t, errBlocks) require.Equal(t, 0, len(blocks)) 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/build/Dockerfile b/server/build/Dockerfile index 2faf4af160..54bd19368a 100644 --- a/server/build/Dockerfile +++ b/server/build/Dockerfile @@ -8,7 +8,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] ENV PATH="/mattermost/bin:${PATH}" ARG PUID=2000 ARG PGID=2000 -ARG MM_PACKAGE="https://releases.mattermost.com/7.9.1/mattermost-7.9.1-linux-amd64.tar.gz?src=docker" +ARG MM_PACKAGE="https://releases.mattermost.com/7.9.2/mattermost-7.9.2-linux-amd64.tar.gz?src=docker" # # Install needed packages and indirect dependencies RUN apt-get update \ 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..424445de5d 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 { @@ -93,7 +93,9 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent panic("failed to initialize memory store: " + err.Error()) } - memoryConfig := &model.Config{} + memoryConfig := &model.Config{ + SqlSettings: *mainHelper.GetSQLSettings(), + } memoryConfig.SetDefaults() *memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins") *memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp") @@ -287,6 +289,7 @@ func SetupConfig(tb testing.TB, updateConfig func(cfg *model.Config)) *TestHelpe dbStore := mainHelper.GetStore() dbStore.DropAllTables() dbStore.MarkSystemRanUnitTests() + mainHelper.PreloadBoardsMigrationsIfNeeded() searchEngine := mainHelper.GetSearchEngine() th := setupTestHelper(dbStore, searchEngine, false, true, updateConfig, nil) th.InitLogin() @@ -294,7 +297,8 @@ func SetupConfig(tb testing.TB, updateConfig func(cfg *model.Config)) *TestHelpe } func SetupConfigWithStoreMock(tb testing.TB, updateConfig func(cfg *model.Config)) *TestHelper { - th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, updateConfig, nil) + setupOptions := []app.Option{app.SkipProductsInitialization()} + th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, updateConfig, setupOptions) statusMock := mocks.StatusStore{} statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil) statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil) @@ -308,7 +312,8 @@ func SetupConfigWithStoreMock(tb testing.TB, updateConfig func(cfg *model.Config } func SetupWithStoreMock(tb testing.TB) *TestHelper { - th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, nil, nil) + setupOptions := []app.Option{app.SkipProductsInitialization()} + th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, false, false, nil, setupOptions) statusMock := mocks.StatusStore{} statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil) statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil) @@ -322,7 +327,8 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper { } func SetupEnterpriseWithStoreMock(tb testing.TB, options ...app.Option) *TestHelper { - th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, true, false, nil, options) + setupOptions := append(options, app.SkipProductsInitialization()) + th := setupTestHelper(testlib.GetMockStoreForSetupFunctions(), nil, true, false, nil, setupOptions) statusMock := mocks.StatusStore{} statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil) statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil) @@ -479,6 +485,14 @@ func (th *TestHelper) InitBasic() *TestHelper { return th } +func (th *TestHelper) DeleteBots() *TestHelper { + preexistingBots, _ := th.App.GetBots(&model.BotGetOptions{Page: 0, PerPage: 100}) + for _, bot := range preexistingBots { + th.App.PermanentDeleteBot(bot.UserId) + } + return th +} + func (th *TestHelper) waitForConnectivity() { for i := 0; i < 1000; i++ { conn, err := net.Dial("tcp", fmt.Sprintf("localhost:%v", th.App.Srv().ListenAddr.Port)) 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..9c0cbb068d 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) { @@ -297,11 +297,10 @@ func TestPatchBot(t *testing.T) { require.NoError(t, err) CheckOKStatus(t, resp) - bots, resp, err := th.Client.GetBots(0, 2, "") + bot, resp, err := th.Client.GetBot(createdBot.UserId, "") require.NoError(t, err) CheckOKStatus(t, resp) - require.Len(t, bots, 1) - require.Equal(t, []*model.Bot{patchedBot}, bots) + require.Equal(t, patchedBot, bot) }) t.Run("patch my bot without permission", func(t *testing.T) { @@ -630,7 +629,7 @@ func TestGetBot(t *testing.T) { } func TestGetBots(t *testing.T) { - th := Setup(t).InitBasic() + th := Setup(t).InitBasic().DeleteBots() defer th.TearDown() th.App.UpdateConfig(func(cfg *model.Config) { 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..3afb21d731 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) { @@ -4140,6 +4140,12 @@ func TestGetChannelModerations(t *testing.T) { scheme.DefaultChannelGuestRole = "" mockStore := mocks.Store{} + + // Playbooks DB job requires a plugin mock + pluginStore := mocks.PluginStore{} + pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil) + mockStore.On("Plugin").Return(&pluginStore) + mockSchemeStore := mocks.SchemeStore{} mockSchemeStore.On("Get", mock.Anything).Return(scheme, nil) mockStore.On("Scheme").Return(&mockSchemeStore) @@ -4282,6 +4288,12 @@ func TestPatchChannelModerations(t *testing.T) { scheme.DefaultChannelGuestRole = "" mockStore := mocks.Store{} + + // Playbooks DB job requires a plugin mock + pluginStore := mocks.PluginStore{} + pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil) + mockStore.On("Plugin").Return(&pluginStore) + mockSchemeStore := mocks.SchemeStore{} mockSchemeStore.On("Get", mock.Anything).Return(scheme, nil) mockSchemeStore.On("Save", mock.Anything).Return(scheme, nil) @@ -4340,7 +4352,6 @@ func TestPatchChannelModerations(t *testing.T) { require.Equal(t, moderation.Roles.Members.Enabled, true) } }) - } func TestGetChannelMemberCountsByGroup(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 baa3735637..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() { @@ -353,7 +353,6 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) { commandArgs.UserId = c.AppContext.Session().UserId commandArgs.T = c.AppContext.T commandArgs.SiteURL = c.GetSiteURLHeader() - commandArgs.Session = *c.AppContext.Session() response, err := c.App.ExecuteCommand(c.AppContext, &commandArgs) if err != nil { @@ -424,7 +423,6 @@ func listCommandAutocompleteSuggestions(c *Context, w http.ResponseWriter, r *ht RootId: query.Get("root_id"), UserId: c.AppContext.Session().UserId, T: c.AppContext.T, - Session: *c.AppContext.Session(), SiteURL: c.GetSiteURLHeader(), Command: userInput, } 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 9911c241e1..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() { @@ -351,18 +351,21 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) { return } - // Do not send true-up review data if the user has already requested one for the quarter. - // And only send a true-up review via as a one-time telemetry request if telemetry is disabled. + // True-up is only enabled when telemetry is disabled. + // When telemetry is enabled, we already have all the data necessary for true-up reviews to be completed. telemetryEnabled := c.App.Config().LogSettings.EnableDiagnostics if telemetryEnabled != nil && !*telemetryEnabled { - // Send telemetry data - c.App.Srv().GetTelemetryService().SendTelemetry(model.TrueUpReviewTelemetryName, profileMap) - - // Update the review status to reflect the completion. - status.Completed = true - c.App.Srv().Store().TrueUpReview().Update(status) + err = c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap) + if err != nil { + c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.failed_to_submit", nil, err.Error(), http.StatusInternalServerError) + return + } } + // Update the review status to reflect the completion. + status.Completed = true + c.App.Srv().Store().TrueUpReview().Update(status) + // Encode to string rather than byte[] otherwise json.Marshal will encode it further. encodedData := b64.StdEncoding.EncodeToString(profileMapJson) responseContent := struct { @@ -370,6 +373,7 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) { }{Content: encodedData} response, _ := json.Marshal(responseContent) + w.WriteHeader(http.StatusOK) w.Write(response) } 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 08a9e57305..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" @@ -478,18 +478,33 @@ func TestRequestRenewalLink(t *testing.T) { } func TestRequestTrueUpReview(t *testing.T) { - th := Setup(t) - defer th.TearDown() - - th.App.Srv().SetLicense(model.NewTestLicense()) - t.Run("returns status 200 when telemetry data sent", func(t *testing.T) { - resp, err := th.SystemAdminClient.DoAPIPost("/license/review", "") + th := Setup(t).InitBasic() + defer th.TearDown() + th.App.Srv().SetLicense(model.NewTestLicense()) + + th.Client.Login(th.SystemAdminUser.Email, th.SystemAdminUser.Password) + + cloud := mocks.CloudInterface{} + cloud.Mock.On("SubmitTrueUpReview", mock.Anything, mock.Anything).Return(nil) + + cloudImpl := th.App.Srv().Cloud + defer func() { + th.App.Srv().Cloud = cloudImpl + }() + th.App.Srv().Cloud = &cloud + + var reviewProfile map[string]any + resp, err := th.Client.SubmitTrueUpReview(reviewProfile) require.NoError(t, err) require.Equal(t, http.StatusOK, resp.StatusCode) }) t.Run("returns 501 when ran by cloud user", func(t *testing.T) { + th := Setup(t).InitBasic() + defer th.TearDown() + th.App.Srv().SetLicense(model.NewTestLicense()) + th.App.Srv().SetLicense(model.NewTestLicense("cloud")) resp, err := th.SystemAdminClient.DoAPIPost("/license/review", "") @@ -500,12 +515,19 @@ func TestRequestTrueUpReview(t *testing.T) { }) t.Run("returns 403 when user does not have permissions", func(t *testing.T) { + th := Setup(t).InitBasic() + defer th.TearDown() + th.App.Srv().SetLicense(model.NewTestLicense()) + resp, err := th.Client.DoAPIPost("/license/review", "") require.Error(t, err) require.Equal(t, http.StatusForbidden, resp.StatusCode) }) t.Run("returns 400 when license is nil", func(t *testing.T) { + th := Setup(t).InitBasic() + defer th.TearDown() + th.App.Srv().SetLicense(nil) resp, err := th.SystemAdminClient.DoAPIPost("/license/review", "") 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..e3d3863049 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) { @@ -1541,6 +1541,12 @@ func TestGetFlaggedPostsForUser(t *testing.T) { mockStore.On("License").Return(th.App.Srv().Store().License()) mockStore.On("Role").Return(th.App.Srv().Store().Role()) mockStore.On("Close").Return(nil) + + // Playbooks DB job requires a plugin mock + pluginStore := mocks.PluginStore{} + pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil) + mockStore.On("Plugin").Return(&pluginStore) + th.App.Srv().SetStore(&mockStore) _, resp, err = th.SystemAdminClient.GetFlaggedPostsForUser(user.Id, 0, 10) 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 705f2680d3..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 ( @@ -190,6 +190,8 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) { s["CanReceiveNotifications"] = c.App.SendTestPushNotification(deviceID) } + s["ActiveSearchBackend"] = c.App.ActiveSearchBackend() + if s[model.STATUS] != model.StatusOk { w.WriteHeader(http.StatusInternalServerError) } @@ -295,7 +297,7 @@ func databaseRecycle(c *Context, w http.ResponseWriter, r *http.Request) { return } - c.App.RecycleDatabaseConnection() + c.App.RecycleDatabaseConnection(c.AppContext) auditRec.Success() ReturnStatusOK(w) @@ -348,7 +350,7 @@ func queryLogs(c *Context, w http.ResponseWriter, r *http.Request) { return } - logs, logerr := c.App.QueryLogs(c.Params.Page, c.Params.LogsPerPage, logFilter) + logs, logerr := c.App.QueryLogs(c.AppContext, c.Params.Page, c.Params.LogsPerPage, logFilter) if logerr != nil { c.Err = logerr return @@ -387,7 +389,7 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) { return } - lines, appErr := c.App.GetLogs(c.Params.Page, c.Params.LogsPerPage) + lines, appErr := c.App.GetLogs(c.AppContext, c.Params.Page, c.Params.LogsPerPage) if appErr != nil { c.Err = appErr return 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 510571f38d..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 ( @@ -117,6 +117,11 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { } } + if team.SchemeId != nil && !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionSysconsoleWriteUserManagementPermissions) { + c.SetPermissionError(model.PermissionSysconsoleWriteUserManagementPermissions) + return + } + rteam, err := c.App.CreateTeamWithUser(c.AppContext, &team, c.AppContext.Session().UserId) if err != nil { c.Err = err 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 80d6839af4..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) { @@ -95,6 +95,39 @@ func TestCreateTeam(t *testing.T) { CheckForbiddenStatus(t, resp) }) + t.Run("should verify user permissions during team creation", func(t *testing.T) { + th.App.Srv().SetLicense(model.NewTestLicense("custom_permissions_schemes")) + th.App.SetPhase2PermissionsMigrationStatus(true) + + sc := th.SystemAdminClient + scheme, _, err := sc.CreateScheme(&model.Scheme{ + DisplayName: "dn_" + model.NewId(), + Name: model.NewId(), + Scope: model.SchemeScopeTeam, + }) + require.NoError(t, err) + + team, _, err := sc.CreateTeam(&model.Team{ + DisplayName: "dn_" + model.NewId(), + Name: GenerateTestTeamName(), + Email: th.GenerateTestEmail(), + Type: model.TeamOpen, + SchemeId: &scheme.Id, + }) + require.NoError(t, err) + require.Equal(t, scheme.Id, *team.SchemeId) + + _, r, err := th.Client.CreateTeam(&model.Team{ + DisplayName: "dn_" + model.NewId(), + Name: GenerateTestTeamName(), + Email: th.GenerateTestEmail(), + Type: model.TeamOpen, + SchemeId: &scheme.Id, + }) + require.Error(t, err) + CheckForbiddenStatus(t, r) + }) + t.Run("should take under consideration the server language when creating a new team", func(t *testing.T) { c := th.SystemAdminClient cfg, _, err := c.GetConfig() 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..8d9673ed9e 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) { @@ -2714,7 +2714,7 @@ func TestGetUsersInTeam(t *testing.T) { } func TestGetUsersNotInTeam(t *testing.T) { - th := Setup(t).InitBasic() + th := Setup(t).InitBasic().DeleteBots() defer th.TearDown() teamId := th.BasicTeam.Id 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 697e825812..b559dca1e0 100644 --- a/server/channels/app/admin.go +++ b/server/channels/app/admin.go @@ -10,18 +10,18 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v6/model" - "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/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/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{ Size: 1, }) -func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) { +func (s *Server) GetLogs(c request.CTX, page, perPage int) ([]string, *model.AppError) { var lines []string license := s.License() @@ -33,7 +33,7 @@ func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) { lines = append(lines, "-----------------------------------------------------------------------------------------------------------") lines = append(lines, "-----------------------------------------------------------------------------------------------------------") } else { - mlog.Error("Could not get cluster info") + c.Logger().Error("Could not get cluster info") } } @@ -56,7 +56,7 @@ func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) { return lines, nil } -func (s *Server) QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) { +func (s *Server) QueryLogs(c request.CTX, page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) { logData := make(map[string][]string) serverName := "default" @@ -66,7 +66,7 @@ func (s *Server) QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[s if info := s.platform.Cluster().GetMyClusterInfo(); info != nil { serverName = info.Hostname } else { - mlog.Error("Could not get cluster info") + c.Logger().Error("Could not get cluster info") } } @@ -111,12 +111,12 @@ func AddLocalLogs(logData map[string][]string, s *Server, page, perPage int, ser return nil } -func (a *App) QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) { - return a.Srv().QueryLogs(page, perPage, logFilter) +func (a *App) QueryLogs(c request.CTX, page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) { + return a.Srv().QueryLogs(c, page, perPage, logFilter) } -func (a *App) GetLogs(page, perPage int) ([]string, *model.AppError) { - return a.Srv().GetLogs(page, perPage) +func (a *App) GetLogs(c request.CTX, page, perPage int) ([]string, *model.AppError) { + return a.Srv().GetLogs(c, page, perPage) } func (s *Server) GetLogsSkipSend(page, perPage int, logFilter *model.LogFilter) ([]string, *model.AppError) { @@ -146,15 +146,15 @@ func (s *Server) InvalidateAllCachesSkipSend() { } -func (a *App) RecycleDatabaseConnection() { - mlog.Info("Attempting to recycle database connections.") +func (a *App) RecycleDatabaseConnection(c request.CTX) { + c.Logger().Info("Attempting to recycle database connections.") // This works by setting 10 seconds as the max conn lifetime for all DB connections. // This allows in gradually closing connections as they expire. In future, we can think // of exposing this as a param from the REST api. a.Srv().Store().RecycleDBConnections(10 * time.Second) - mlog.Info("Finished recycling database connections.") + c.Logger().Info("Finished recycling database connections.") } func (a *App) TestSiteURL(siteURL string) *model.AppError { 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 eb30bc0779..2c38a3afd8 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. @@ -264,8 +264,6 @@ type AppIface interface { // MoveChannel method is prone to data races if someone joins to channel during the move process. However this // function is only exposed to sysadmins and the possibility of this edge case is relatively small. MoveChannel(c request.CTX, team *model.Team, channel *model.Channel, user *model.User) *model.AppError - // NewWebConn returns a new WebConn instance. - NewWebConn(cfg *platform.WebConnConfig) *platform.WebConn // NotifySessionsExpired is called periodically from the job server to notify any mobile sessions that have expired. NotifySessionsExpired() error // OverrideIconURLIfEmoji changes the post icon override URL prop, if it has an emoji icon, @@ -402,6 +400,7 @@ type AppIface interface { VerifyPlugin(plugin, signature io.ReadSeeker) *model.AppError AccountMigration() einterfaces.AccountMigrationInterface ActivateMfa(userID, token string) *model.AppError + ActiveSearchBackend() string AddChannelsToRetentionPolicy(policyID string, channelIDs []string) *model.AppError AddConfigListener(listener func(*model.Config, *model.Config)) string AddDirectChannels(c request.CTX, teamID string, user *model.User) *model.AppError @@ -682,7 +681,7 @@ type AppIface interface { GetJobsPage(page int, perPage int) ([]*model.Job, *model.AppError) GetLatestTermsOfService() (*model.TermsOfService, *model.AppError) GetLatestVersion(latestVersionUrl string) (*model.GithubReleaseInfo, *model.AppError) - GetLogs(page, perPage int) ([]string, *model.AppError) + GetLogs(c request.CTX, page, perPage int) ([]string, *model.AppError) GetLogsSkipSend(page, perPage int, logFilter *model.LogFilter) ([]string, *model.AppError) GetMemberCountsByGroup(ctx context.Context, channelID string, includeTimezones bool) ([]*model.ChannelMemberCountByGroup, *model.AppError) GetMessageForNotification(post *model.Post, translateFunc i18n.TranslateFunc) string @@ -893,6 +892,7 @@ type AppIface interface { InviteNewUsersToTeam(emailList []string, teamID, senderId string) *model.AppError InviteNewUsersToTeamGracefully(memberInvite *model.MemberInvite, teamID, senderId string, reminderInterval string) ([]*model.EmailInviteWithError, *model.AppError) IsCRTEnabledForUser(c request.CTX, userID string) bool + IsConfigReadOnly() bool IsFirstAdmin(user *model.User) bool IsFirstUserAccount() bool IsLeader() bool @@ -961,9 +961,9 @@ type AppIface interface { PublishUserTyping(userID, channelID, parentId string) *model.AppError PurgeBleveIndexes() *model.AppError PurgeElasticsearchIndexes() *model.AppError - QueryLogs(page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) + QueryLogs(c request.CTX, page, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) ReadFile(path string) ([]byte, *model.AppError) - RecycleDatabaseConnection() + RecycleDatabaseConnection(c request.CTX) RegenCommandToken(cmd *model.Command) (*model.Command, *model.AppError) RegenOutgoingWebhookToken(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, *model.AppError) RegenerateOAuthAppSecret(app *model.OAuthApp) (*model.OAuthApp, *model.AppError) diff --git a/server/channels/app/app_test.go b/server/channels/app/app_test.go index 291a4daa5f..22f221d47b 100644 --- a/server/channels/app/app_test.go +++ b/server/channels/app/app_test.go @@ -12,12 +12,13 @@ import ( "github.com/stretchr/testify/assert" "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/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost-server/server/v8/model" ) -/* Temporarily comment out until MM-11108 +/* TODO: Temporarily comment out until MM-11108 func TestAppRace(t *testing.T) { for i := 0; i < 10; i++ { a, err := New() @@ -61,6 +62,8 @@ func TestUnitUpdateConfig(t *testing.T) { prev := *th.App.Config().ServiceSettings.SiteURL + require.False(t, th.App.IsConfigReadOnly()) + var called int32 th.App.AddConfigListener(func(old, current *model.Config) { atomic.AddInt32(&called, 1) 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..4106cd1966 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) { @@ -85,6 +85,12 @@ func TestSessionHasPermissionToChannel(t *testing.T) { // Regression test for MM-29812 // Mock the channel store so getting the channel returns with an error, as per the bug report. mockStore := mocks.Store{} + + // Playbooks DB job requires a plugin mock + pluginStore := mocks.PluginStore{} + pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil) + mockStore.On("Plugin").Return(&pluginStore) + mockChannelStore := mocks.ChannelStore{} mockChannelStore.On("Get", mock.Anything, mock.Anything).Return(nil, fmt.Errorf("arbitrary error")) mockChannelStore.On("GetAllChannelMembersForUser", mock.Anything, mock.Anything, mock.Anything).Return(th.App.Srv().Store().Channel().GetAllChannelMembersForUser(th.BasicUser.Id, false, false)) 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..c55a01414e 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) { @@ -278,7 +278,7 @@ func TestGetBot(t *testing.T) { } func TestGetBots(t *testing.T) { - th := Setup(t) + th := Setup(t).DeleteBots() defer th.TearDown() OwnerId1 := model.NewId() 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..eaf1171a6c 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) { @@ -554,7 +554,7 @@ func TestGetDirectChannelCreatesChannelMemberHistoryRecord(t *testing.T) { } func TestAddUserToChannelCreatesChannelMemberHistoryRecord(t *testing.T) { - th := Setup(t).InitBasic() + th := Setup(t).InitBasic().DeleteBots() defer th.TearDown() // create a user and add it to a channel 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..d7265935c3 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 ( @@ -40,6 +40,10 @@ func (a *App) UpdateConfig(f func(*model.Config)) { a.Srv().platform.UpdateConfig(f) } +func (a *App) IsConfigReadOnly() bool { + return a.Srv().platform.IsConfigReadOnly() +} + func (a *App) ReloadConfig() error { return a.Srv().platform.ReloadConfig() } 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 4b52efd8e9..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) { @@ -278,6 +278,7 @@ func TestGetDraftsForUser(t *testing.T) { assert.Nil(t, createDraftErr2) t.Run("get drafts", func(t *testing.T) { + t.Skip("MM-52088") draftResp, err := th.App.GetDraftsForUser(user.Id, th.BasicTeam.Id) assert.Nil(t, err) 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..294de97280 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 { @@ -52,8 +52,8 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo } configStore := config.NewTestMemoryStore() - memoryConfig := configStore.Get() + memoryConfig.SqlSettings = *mainHelper.GetSQLSettings() *memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins") *memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp") *memoryConfig.PluginSettings.AutomaticPrepackagedPlugins = false @@ -138,7 +138,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo return th } -func Setup(tb testing.TB) *TestHelper { +func Setup(tb testing.TB, options ...Option) *TestHelper { if testing.Short() { tb.SkipNow() } @@ -147,7 +147,7 @@ func Setup(tb testing.TB) *TestHelper { dbStore.MarkSystemRanUnitTests() mainHelper.PreloadMigrations() - return setupTestHelper(dbStore, false, true, nil, tb) + return setupTestHelper(dbStore, false, true, options, tb) } func SetupWithoutPreloadMigrations(tb testing.TB) *TestHelper { @@ -157,13 +157,16 @@ func SetupWithoutPreloadMigrations(tb testing.TB) *TestHelper { dbStore := mainHelper.GetStore() dbStore.DropAllTables() dbStore.MarkSystemRanUnitTests() + // Only boards migrations are applied + mainHelper.PreloadBoardsMigrationsIfNeeded() return setupTestHelper(dbStore, false, true, nil, tb) } func SetupWithStoreMock(tb testing.TB) *TestHelper { mockStore := testlib.GetMockStoreForSetupFunctions() - th := setupTestHelper(mockStore, false, false, nil, tb) + setupOptions := []Option{SkipProductsInitialization()} + th := setupTestHelper(mockStore, false, false, setupOptions, tb) statusMock := mocks.StatusStore{} statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil) statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil) @@ -184,7 +187,8 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper { func SetupEnterpriseWithStoreMock(tb testing.TB) *TestHelper { mockStore := testlib.GetMockStoreForSetupFunctions() - th := setupTestHelper(mockStore, true, false, nil, tb) + setupOptions := []Option{SkipProductsInitialization()} + th := setupTestHelper(mockStore, true, false, setupOptions, tb) statusMock := mocks.StatusStore{} statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil) statusMock.On("Get", "user1").Return(&model.Status{UserId: "user1", Status: model.StatusOnline}, nil) @@ -249,6 +253,14 @@ func (th *TestHelper) InitBasic() *TestHelper { return th } +func (th *TestHelper) DeleteBots() *TestHelper { + preexistingBots, _ := th.App.GetBots(&model.BotGetOptions{Page: 0, PerPage: 100}) + for _, bot := range preexistingBots { + th.App.PermanentDeleteBot(bot.UserId) + } + return th +} + func (*TestHelper) MakeEmail() string { return "success_" + model.NewId() + "@simulator.amazonses.com" } 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..b4803db659 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) { @@ -1433,6 +1433,10 @@ func TestPushNotificationRace(t *testing.T) { memoryStore := config.NewTestMemoryStore() mockStore := testlib.GetMockStoreForSetupFunctions() + // Playbooks DB job requires a plugin mock + pluginStore := mocks.PluginStore{} + pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil) + mockStore.On("Plugin").Return(&pluginStore) mockPreferenceStore := mocks.PreferenceStore{} mockPreferenceStore.On("Get", mock.AnythingOfType("string"), @@ -1445,10 +1449,12 @@ func TestPushNotificationRace(t *testing.T) { Router: mux.NewRouter(), } var err error - s.platform, err = platform.New(platform.ServiceConfig{ - ConfigStore: memoryStore, - }, platform.SetFileStore(&fmocks.FileBackend{})) - s.SetStore(mockStore) + s.platform, err = platform.New( + platform.ServiceConfig{ + ConfigStore: memoryStore, + }, + platform.SetFileStore(&fmocks.FileBackend{}), + platform.StoreOverride(mockStore)) require.NoError(t, err) serviceMap := map[product.ServiceKey]any{ ServerKey: s, 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 6e522bb971..c109b9a3ce 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" ) @@ -89,6 +89,23 @@ func (a *OpenTracingAppLayer) ActivateMfa(userID string, token string) *model.Ap return resultVar0 } +func (a *OpenTracingAppLayer) ActiveSearchBackend() string { + origCtx := a.ctx + span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.ActiveSearchBackend") + + a.ctx = newCtx + a.app.Srv().Store().SetContext(newCtx) + defer func() { + a.app.Srv().Store().SetContext(origCtx) + a.ctx = origCtx + }() + + defer span.Finish() + resultVar0 := a.app.ActiveSearchBackend() + + return resultVar0 +} + func (a *OpenTracingAppLayer) AddChannelMember(c request.CTX, userID string, channel *model.Channel, opts app.ChannelMemberOpts) (*model.ChannelMember, *model.AppError) { origCtx := a.ctx span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.AddChannelMember") @@ -7111,7 +7128,7 @@ func (a *OpenTracingAppLayer) GetLdapGroup(ldapGroupID string) (*model.Group, *m return resultVar0, resultVar1 } -func (a *OpenTracingAppLayer) GetLogs(page int, perPage int) ([]string, *model.AppError) { +func (a *OpenTracingAppLayer) GetLogs(c request.CTX, page int, perPage int) ([]string, *model.AppError) { origCtx := a.ctx span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetLogs") @@ -7123,7 +7140,7 @@ func (a *OpenTracingAppLayer) GetLogs(page int, perPage int) ([]string, *model.A }() defer span.Finish() - resultVar0, resultVar1 := a.app.GetLogs(page, perPage) + resultVar0, resultVar1 := a.app.GetLogs(c, page, perPage) if resultVar1 != nil { span.LogFields(spanlog.Error(resultVar1)) @@ -11992,6 +12009,23 @@ func (a *OpenTracingAppLayer) IsCRTEnabledForUser(c request.CTX, userID string) return resultVar0 } +func (a *OpenTracingAppLayer) IsConfigReadOnly() bool { + origCtx := a.ctx + span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.IsConfigReadOnly") + + a.ctx = newCtx + a.app.Srv().Store().SetContext(newCtx) + defer func() { + a.app.Srv().Store().SetContext(origCtx) + a.ctx = origCtx + }() + + defer span.Finish() + resultVar0 := a.app.IsConfigReadOnly() + + return resultVar0 +} + func (a *OpenTracingAppLayer) IsFirstAdmin(user *model.User) bool { origCtx := a.ctx span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.IsFirstAdmin") @@ -12761,23 +12795,6 @@ func (a *OpenTracingAppLayer) NewPluginAPI(c *request.Context, manifest *model.M return resultVar0 } -func (a *OpenTracingAppLayer) NewWebConn(cfg *platform.WebConnConfig) *platform.WebConn { - origCtx := a.ctx - span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.NewWebConn") - - a.ctx = newCtx - a.app.Srv().Store().SetContext(newCtx) - defer func() { - a.app.Srv().Store().SetContext(origCtx) - a.ctx = origCtx - }() - - defer span.Finish() - resultVar0 := a.app.NewWebConn(cfg) - - return resultVar0 -} - func (a *OpenTracingAppLayer) NotifyAndSetWarnMetricAck(warnMetricId string, sender *model.User, forceAck bool, isBot bool) *model.AppError { origCtx := a.ctx span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.NotifyAndSetWarnMetricAck") @@ -13624,7 +13641,7 @@ func (a *OpenTracingAppLayer) PurgeElasticsearchIndexes() *model.AppError { return resultVar0 } -func (a *OpenTracingAppLayer) QueryLogs(page int, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) { +func (a *OpenTracingAppLayer) QueryLogs(c request.CTX, page int, perPage int, logFilter *model.LogFilter) (map[string][]string, *model.AppError) { origCtx := a.ctx span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.QueryLogs") @@ -13636,7 +13653,7 @@ func (a *OpenTracingAppLayer) QueryLogs(page int, perPage int, logFilter *model. }() defer span.Finish() - resultVar0, resultVar1 := a.app.QueryLogs(page, perPage, logFilter) + resultVar0, resultVar1 := a.app.QueryLogs(c, page, perPage, logFilter) if resultVar1 != nil { span.LogFields(spanlog.Error(resultVar1)) @@ -13668,7 +13685,7 @@ func (a *OpenTracingAppLayer) ReadFile(path string) ([]byte, *model.AppError) { return resultVar0, resultVar1 } -func (a *OpenTracingAppLayer) RecycleDatabaseConnection() { +func (a *OpenTracingAppLayer) RecycleDatabaseConnection(c request.CTX) { origCtx := a.ctx span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.RecycleDatabaseConnection") @@ -13680,7 +13697,7 @@ func (a *OpenTracingAppLayer) RecycleDatabaseConnection() { }() defer span.Finish() - a.app.RecycleDatabaseConnection() + a.app.RecycleDatabaseConnection(c) } func (a *OpenTracingAppLayer) RegenCommandToken(cmd *model.Command) (*model.Command, *model.AppError) { diff --git a/server/channels/app/options.go b/server/channels/app/options.go index 04b663dd69..4134194bf7 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 @@ -103,6 +103,17 @@ func SkipPostInitialization() Option { } } +// SkipProductsInitialization is intended for testing only, in cases +// where we're mocking components like the store and products cannot +// be initialized correctly +func SkipProductsInitialization() Option { + return func(s *Server) error { + s.skipProductsInit = true + + return nil + } +} + type AppOption func(a *App) type AppOptionCreator func() []AppOption 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..30dddabd61 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. @@ -65,6 +65,11 @@ func (ps *PlatformService) UpdateConfig(f func(*model.Config)) { } } +// IsConfigReadOnly returns true if the underlying configstore is readonly. +func (ps *PlatformService) IsConfigReadOnly() bool { + return ps.configStore.IsReadOnly() +} + // SaveConfig replaces the active configuration, optionally notifying cluster peers. // It returns both the previous and current configs. func (ps *PlatformService) SaveConfig(newCfg *model.Config, sendConfigChangeClusterMessage bool) (*model.Config, *model.Config, *model.AppError) { 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..e4adda7ea4 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 { @@ -99,6 +99,7 @@ func (th *TestHelper) InitBasic() *TestHelper { func SetupWithStoreMock(tb testing.TB, options ...Option) *TestHelper { mockStore := testlib.GetMockStoreForSetupFunctions() + options = append(options, StoreOverride(mockStore)) th := setupTestHelper(mockStore, false, false, tb, options...) statusMock := mocks.StatusStore{} statusMock.On("UpdateExpiredDNDStatuses").Return([]*model.Status{}, nil) @@ -136,6 +137,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo configStore := config.NewTestMemoryStore() memoryConfig := configStore.Get() + memoryConfig.SqlSettings = *mainHelper.GetSQLSettings() *memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins") *memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp") *memoryConfig.PluginSettings.AutomaticPrepackagedPlugins = false 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..f9840c35bf 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) { @@ -28,16 +28,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) { if driverName == "" { driverName = model.DatabaseDriverPostgres } - dsn := "" - if driverName == model.DatabaseDriverPostgres { - dsn = os.Getenv("TEST_DATABASE_POSTGRESQL_DSN") - } else { - dsn = os.Getenv("TEST_DATABASE_MYSQL_DSN") - } cfg.SqlSettings = *storetest.MakeSqlSettings(driverName, false) - if dsn != "" { - cfg.SqlSettings.DataSource = &dsn - } cfg.SqlSettings.DataSourceReplicas = []string{*cfg.SqlSettings.DataSource} cfg.SqlSettings.DataSourceSearchReplicas = []string{*cfg.SqlSettings.DataSource} 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..d11b7c4fec 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 { @@ -82,6 +82,7 @@ func TestHubStopWithMultipleConnections(t *testing.T) { // block the caller indefinitely. func TestHubStopRaceCondition(t *testing.T) { th := Setup(t).InitBasic() + defer th.Service.Store.Close() // We do not call TearDown because th.TearDown shuts down the hub again. And hub close is not idempotent. // Making it idempotent is not really important to the server because close only happens once. // So we just use this quick hack for the test. 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 210002a3ff..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" @@ -352,7 +352,7 @@ func (ch *Channels) syncPlugins() *model.AppError { } mlog.Info("Syncing plugin from file store", mlog.String("bundle", plugin.path)) - if _, err := ch.installPluginLocally(reader, signature, installPluginLocallyAlways); err != nil { + if _, err := ch.installPluginLocally(reader, signature, installPluginLocallyAlways); err != nil && err.Id != "app.plugin.blocked.app_error" && err.Id != "app.plugin.skip_installation.app_error" { mlog.Error("Failed to sync plugin from file store", mlog.String("bundle", plugin.path), mlog.Err(err)) } }(plugin) @@ -952,6 +952,11 @@ func (ch *Channels) processPrepackagedPlugins(pluginsDir string) []*plugin.Prepa defer wg.Done() p, err := ch.processPrepackagedPlugin(psPath) if err != nil { + var appErr *model.AppError + // A log line already appears if the plugin is on the blocklist + if errors.As(err, &appErr) && (appErr.Id == "app.plugin.blocked.app_error" || appErr.Id == "app.plugin.skip_installation.app_error") { + return + } mlog.Error("Failed to install prepackaged plugin", mlog.String("path", psPath.path), mlog.Err(err)) return } 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..2ba65aa5f9 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 { @@ -304,7 +304,7 @@ func TestPluginAPIUpdateUserPreferences(t *testing.T) { } func TestPluginAPIGetUsers(t *testing.T) { - th := Setup(t) + th := Setup(t).DeleteBots() defer th.TearDown() api := th.SetupPluginAPI() @@ -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) @@ -1171,7 +1171,7 @@ func TestBasicAPIPlugins(t *testing.T) { mainPath := path.Join(testFolder, d, "main.go") _, err := os.Stat(mainPath) require.NoError(t, err, "Cannot find plugin main file at %v", mainPath) - th := Setup(t).InitBasic() + th := Setup(t).InitBasic().DeleteBots() defer th.TearDown() setDefaultPluginConfig(th, dir.Name()) err = pluginAPIHookTest(t, th, mainPath, dir.Name(), defaultSchema) @@ -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..3c70fb718a 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 { @@ -465,7 +465,6 @@ func (p *TProduct) ExecuteCommand(c *plugin.Context, args *model.CommandArgs) (* } func TestProductCommands(t *testing.T) { - products := map[string]product.Manifest{ "productT": { Initializer: newTProduct, @@ -474,10 +473,11 @@ func TestProductCommands(t *testing.T) { } t.Run("Execute product command", func(t *testing.T) { - th := Setup(t).InitBasic() + th := Setup(t, SkipProductsInitialization()).InitBasic() defer th.TearDown() // Server hijack. // This must be done in a cleaner way. + th.Server.skipProductsInit = false th.Server.initializeProducts(products, th.Server.services) th.Server.products["productT"].Start() require.Len(t, th.Server.products, 2) // 1 product + channels @@ -504,11 +504,11 @@ func TestProductCommands(t *testing.T) { }) t.Run("Product commands can override builtin commands", func(t *testing.T) { - th := Setup(t).InitBasic() + th := Setup(t, SkipProductsInitialization()).InitBasic() defer th.TearDown() - // Server hijack. // This must be done in a cleaner way. + th.Server.skipProductsInit = false th.Server.initializeProducts(products, th.Server.services) th.Server.products["productT"].Start() require.Len(t, th.Server.products, 2) // 1 product + channels @@ -535,8 +535,7 @@ func TestProductCommands(t *testing.T) { }) t.Run("Plugin commands can override product commands", func(t *testing.T) { - - th := Setup(t).InitBasic() + th := Setup(t, SkipProductsInitialization()).InitBasic() defer th.TearDown() th.App.UpdateConfig(func(cfg *model.Config) { @@ -549,8 +548,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 { @@ -602,6 +601,7 @@ func TestProductCommands(t *testing.T) { // Server hijack. // This must be done in a cleaner way. + th.Server.skipProductsInit = false th.Server.initializeProducts(products, th.Server.services) th.Server.products["productT"].Start() require.Len(t, th.Server.products, 2) // 1 product + channels 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..0238457662 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 { @@ -1202,7 +1202,7 @@ func TestHookReactionHasBeenRemoved(t *testing.T) { } func TestHookRunDataRetention(t *testing.T) { - th := Setup(t).InitBasic() + th := Setup(t, SkipProductsInitialization()).InitBasic() defer th.TearDown() tearDown, pluginIDs, _ := SetAppEnvironmentWithPlugins(t, @@ -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 5db3e2cb77..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 @@ -92,7 +92,10 @@ func (ch *Channels) installPluginFromData(data model.PluginEventData) { manifest, appErr := ch.installPluginLocally(reader, signature, installPluginLocallyAlways) if appErr != nil { - mlog.Error("Failed to sync plugin from file store", mlog.String("bundle", plugin.path), mlog.Err(appErr)) + // A log line already appears if the plugin is on the blocklist or skipped + if appErr.Id != "app.plugin.blocked.app_error" && appErr.Id != "app.plugin.skip_installation.app_error" { + mlog.Error("Failed to sync plugin from file store", mlog.String("bundle", plugin.path), mlog.Err(appErr)) + } return } @@ -330,8 +333,8 @@ func (ch *Channels) installExtractedPlugin(manifest *model.Manifest, fromPluginD // Check plugin id is not blocked if plugin.PluginIDIsBlocked(manifest.Id) { - mlog.Debug("Skipping installation of plugin since plugin is on blocklist", mlog.String("plugin_id", manifest.Id)) - return nil, nil + mlog.Debug("Skipping installation of plugin since plugin is on blocklist. Some plugins are blocked because they are built into this version of Mattermost.", mlog.String("plugin_id", manifest.Id)) + return nil, model.NewAppError("installExtractedPlugin", "app.plugin.blocked.app_error", map[string]any{"Id": manifest.Id}, "", http.StatusInternalServerError) } // Check for plugins installed with the same ID. @@ -365,7 +368,7 @@ func (ch *Channels) installExtractedPlugin(manifest *model.Manifest, fromPluginD if version.LTE(existingVersion) { mlog.Debug("Skipping local installation of plugin since existing version is newer", mlog.String("plugin_id", manifest.Id)) - return nil, nil + return nil, model.NewAppError("installExtractedPlugin", "app.plugin.skip_installation.app_error", map[string]any{"Id": manifest.Id}, "", http.StatusInternalServerError) } } diff --git a/server/channels/app/plugin_install_test.go b/server/channels/app/plugin_install_test.go index 5fde414bd6..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 { @@ -172,10 +172,9 @@ func TestInstallPluginLocally(t *testing.T) { defer th.TearDown() cleanExistingBundles(t, th) - manifest, appErr := installPlugin(t, th, "playbooks", "0.0.1", installPluginLocallyAlways) - require.Nil(t, appErr) - require.Nil(t, manifest) - + _, appErr := installPlugin(t, th, "playbooks", "0.0.1", installPluginLocallyAlways) + require.NotNil(t, appErr) + require.Equal(t, "app.plugin.blocked.app_error", appErr.Id) assertBundleInfoManifests(t, th, []*model.Manifest{}) }) @@ -222,9 +221,9 @@ func TestInstallPluginLocally(t *testing.T) { require.Nil(t, appErr) require.NotNil(t, existingManifest) - manifest, appErr := installPlugin(t, th, "valid", "0.0.1", installPluginLocallyOnlyIfNewOrUpgrade) - require.Nil(t, appErr) - require.Nil(t, manifest) + _, appErr = installPlugin(t, th, "valid", "0.0.1", installPluginLocallyOnlyIfNewOrUpgrade) + require.NotNil(t, appErr) + require.Equal(t, "app.plugin.skip_installation.app_error", appErr.Id) assertBundleInfoManifests(t, th, []*model.Manifest{existingManifest}) }) @@ -238,9 +237,9 @@ func TestInstallPluginLocally(t *testing.T) { require.Nil(t, appErr) require.NotNil(t, existingManifest) - manifest, appErr := installPlugin(t, th, "valid", "0.0.2", installPluginLocallyOnlyIfNewOrUpgrade) - require.Nil(t, appErr) - require.Nil(t, manifest) + _, appErr = installPlugin(t, th, "valid", "0.0.2", installPluginLocallyOnlyIfNewOrUpgrade) + require.NotNil(t, appErr) + require.Equal(t, "app.plugin.skip_installation.app_error", appErr.Id) assertBundleInfoManifests(t, th, []*model.Manifest{existingManifest}) }) 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 460354eaa5..33b50e00ff 100644 --- a/server/channels/app/post_metadata.go +++ b/server/channels/app/post_metadata.go @@ -4,6 +4,7 @@ package app import ( + "bufio" "bytes" "fmt" "image" @@ -18,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 { @@ -764,7 +765,24 @@ func cacheLinkMetadata(requestURL string, timestamp int64, og *opengraph.OpenGra platform.LinkCache().SetWithExpiry(strconv.FormatInt(model.GenerateLinkMetadataHash(requestURL, timestamp), 16), metadata, platform.LinkCacheDuration) } +// peekContentType peeks at the first 512 bytes of p, and attempts to detect +// the content type. Returns empty string if error occurs. +func peekContentType(p *bufio.Reader) string { + byt, err := p.Peek(512) + if err != nil && err != bufio.ErrBufferFull && err != io.EOF { + return "" + } + return http.DetectContentType(byt) +} + func (a *App) parseLinkMetadata(requestURL string, body io.Reader, contentType string) (*opengraph.OpenGraph, *model.PostImage, error) { + if contentType == "" { + bufRd := bufio.NewReader(body) + // If the content-type is missing we try to detect it from the actual data. + contentType = peekContentType(bufRd) + body = bufRd + } + if contentType == "image/svg+xml" { image := &model.PostImage{ Format: "svg", diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go index 8ee5f71d3b..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) { @@ -2595,6 +2595,18 @@ func TestParseLinkMetadata(t *testing.T) { }, dimensions) }) + t.Run("image with no content-type given", func(t *testing.T) { + og, dimensions, err := th.App.parseLinkMetadata(imageURL, makeImageReader(), "") + assert.NoError(t, err) + + assert.Nil(t, og) + assert.Equal(t, &model.PostImage{ + Format: "png", + Width: 408, + Height: 336, + }, dimensions) + }) + t.Run("malformed image", func(t *testing.T) { og, dimensions, err := th.App.parseLinkMetadata(imageURL, makeOpenGraphReader(), "image/png") assert.Error(t, err) 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..ec32b96a48 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" ) @@ -3150,6 +3150,7 @@ func TestGetTopThreadsForUserSince(t *testing.T) { } func TestGetEditHistoryForPost(t *testing.T) { + t.Skip("This needs fixing, OriginalId seems to be empty for all posts") th := Setup(t).InitBasic() defer th.TearDown() 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..bcffb6b504 100644 --- a/server/channels/app/product.go +++ b/server/channels/app/product.go @@ -9,7 +9,8 @@ import ( "os" "strings" - "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/platform/shared/mlog" ) func (s *Server) initializeProducts( @@ -71,6 +72,11 @@ func (s *Server) initializeProducts( } func (s *Server) shouldStart(product string) bool { + if s.skipProductsInit && product != "channels" { + s.Log().Warn("Skipping product start: disabled via server options", mlog.String("product", product)) + return false + } + if product == "boards" { if os.Getenv("MM_DISABLE_BOARDS") == "true" { s.Log().Warn("Skipping Boards start: disabled via env var") 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..1002eedad6 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 ( @@ -39,8 +39,14 @@ func (p *productB) Start() error { return nil } func (p *productB) Stop() error { return nil } func TestInitializeProducts(t *testing.T) { - ps, err := platform.New(platform.ServiceConfig{ConfigStore: config.NewTestMemoryStore()}) + configStore := config.NewTestMemoryStore() + memoryConfig := configStore.Get() + memoryConfig.SqlSettings = *mainHelper.GetSQLSettings() + configStore.Set(memoryConfig) + + ps, err := platform.New(platform.ServiceConfig{ConfigStore: configStore}) require.NoError(t, err) + defer ps.Shutdown() t.Run("2 products and no circular dependency", func(t *testing.T) { serviceMap := map[product.ServiceKey]any{ @@ -148,24 +154,4 @@ func TestInitializeProducts(t *testing.T) { require.NoError(t, err) require.Len(t, server.products, 2) }) - - t.Run("boards product to be blocked", func(t *testing.T) { - products := map[string]product.Manifest{ - "productA": { - Initializer: newProductA, - }, - "boards": { - Initializer: newProductB, - }, - } - - server := &Server{ - products: make(map[string]product.Product), - platform: ps, - } - - err := server.initializeProducts(products, map[product.ServiceKey]any{}) - require.NoError(t, err) - require.Len(t, server.products, 1) - }) } 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 d441662a5f..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 { @@ -60,3 +60,7 @@ func (a *App) PurgeBleveIndexes() *model.AppError { } return nil } + +func (a *App) ActiveSearchBackend() string { + return a.ch.srv.platform.SearchEngine.ActiveEngine() +} 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 6197c6c55b..a9aeb47dc8 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 @@ -137,6 +137,8 @@ type Server struct { tracer *tracing.Tracer + skipProductsInit bool + products map[string]product.Product services map[product.ServiceKey]any @@ -260,8 +262,17 @@ func NewServer(options ...Option) (*Server, error) { product.CommandKey: app, } - // Step 4: Initialize products. - // Depends on s.httpService. + // It is important to initialize the hub only after the global logger is set + // to avoid race conditions while logging from inside the hub. + // Step 4: Start platform + s.platform.Start() + + // NOTE: There should be no call to App.Srv().Channels() before step 5 is done + // otherwise it will throw a panic. + + // Step 5: Initialize products. + // Depends on s.httpService, and depends on the hub to be initialized. + // Otherwise we run into race conditions. err = s.initializeProducts(product.GetProducts(), serviceMap) if err != nil { return nil, errors.Wrap(err, "failed to initialize products") @@ -275,11 +286,6 @@ func NewServer(options ...Option) (*Server, error) { } app.ch = channelsWrapper.app.ch - // It is important to initialize the hub only after the global logger is set - // to avoid race conditions while logging from inside the hub. - // Step 5: Start hub in platform which the hub depends on s.Channels() (step 4) - s.platform.Start() - // ------------------------------------------------------------------------- // Everything below this is not order sensitive and safe to be moved around. // If you are adding a new field that is non-channels specific, please add diff --git a/server/channels/app/server_test.go b/server/channels/app/server_test.go index 00d2c66f71..5403c82ffe 100644 --- a/server/channels/app/server_test.go +++ b/server/channels/app/server_test.go @@ -24,20 +24,25 @@ 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 newServer(t *testing.T) (*Server, error) { + return newServerWithConfig(t, func(_ *model.Config) {}) +} + func newServerWithConfig(t *testing.T, f func(cfg *model.Config)) (*Server, error) { configStore, err := config.NewMemoryStore() require.NoError(t, err) store, err := config.NewStoreFromBacking(configStore, nil, false) require.NoError(t, err) cfg := store.Get() + cfg.SqlSettings = *mainHelper.GetSQLSettings() f(cfg) store.Set(cfg) @@ -61,13 +66,13 @@ func TestStartServerSuccess(t *testing.T) { } func TestStartServerPortUnavailable(t *testing.T) { - s, err := NewServer() - require.NoError(t, err) - // Listen on the next available port listener, err := net.Listen("tcp", "localhost:0") require.NoError(t, err) + s, err := newServer(t) + require.NoError(t, err) + // Attempt to listen on the port used above. s.platform.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = listener.Addr().String() @@ -105,6 +110,7 @@ func TestStartServerNoS3Bucket(t *testing.T) { AmazonS3SSL: model.NewBool(false), } *cfg.ServiceSettings.ListenAddress = "localhost:0" + cfg.SqlSettings = *mainHelper.GetSQLSettings() _, _, err := store.Set(cfg) require.NoError(t, err) @@ -162,7 +168,7 @@ func TestDatabaseTypeAndMattermostVersion(t *testing.T) { os.Setenv("MM_SQLSETTINGS_DRIVERNAME", "postgres") - th := Setup(t) + th := Setup(t, SkipProductsInitialization()) defer th.TearDown() databaseType, mattermostVersion := th.Server.DatabaseTypeAndSchemaVersion() @@ -171,7 +177,7 @@ func TestDatabaseTypeAndMattermostVersion(t *testing.T) { os.Setenv("MM_SQLSETTINGS_DRIVERNAME", "mysql") - th2 := Setup(t) + th2 := Setup(t, SkipProductsInitialization()) defer th2.TearDown() databaseType, mattermostVersion = th2.Server.DatabaseTypeAndSchemaVersion() @@ -190,6 +196,7 @@ func TestStartServerTLSVersion(t *testing.T) { *cfg.ServiceSettings.TLSMinVer = "1.2" *cfg.ServiceSettings.TLSKeyFile = path.Join(testDir, "tls_test_key.pem") *cfg.ServiceSettings.TLSCertFile = path.Join(testDir, "tls_test_cert.pem") + cfg.SqlSettings = *mainHelper.GetSQLSettings() store.Set(cfg) @@ -316,7 +323,7 @@ func TestPanicLog(t *testing.T) { logger.LockConfiguration() // Creating a server with logger - s, err := NewServer() + s, err := newServer(t) require.NoError(t, err) s.Platform().SetLogger(logger) 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..b0890d3d38 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 { @@ -51,6 +51,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo if configSet != nil { configSet(memoryConfig) } + memoryConfig.SqlSettings = *mainHelper.GetSQLSettings() *memoryConfig.PluginSettings.Directory = filepath.Join(tempWorkspace, "plugins") *memoryConfig.PluginSettings.ClientDirectory = filepath.Join(tempWorkspace, "webapp") *memoryConfig.PluginSettings.AutomaticPrepackagedPlugins = false @@ -142,6 +143,7 @@ func setup(tb testing.TB) *TestHelper { dbStore := mainHelper.GetStore() dbStore.DropAllTables() dbStore.MarkSystemRanUnitTests() + mainHelper.PreloadBoardsMigrationsIfNeeded() return setupTestHelper(dbStore, false, true, tb, nil) } 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..703a39db9b 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 { @@ -1026,7 +1026,7 @@ func TestCreateUserWithToken(t *testing.T) { } func TestPermanentDeleteUser(t *testing.T) { - th := Setup(t).InitBasic() + th := Setup(t).InitBasic().DeleteBots() defer th.TearDown() b := []byte("testimage") diff --git a/server/channels/app/user_viewmembers_test.go b/server/channels/app/user_viewmembers_test.go index 9a14fc652c..7da06426e8 100644 --- a/server/channels/app/user_viewmembers_test.go +++ b/server/channels/app/user_viewmembers_test.go @@ -9,12 +9,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/store" + "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRestrictedViewMembers(t *testing.T) { - th := Setup(t) + th := Setup(t).DeleteBots() defer th.TearDown() user1 := th.CreateUser() 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 f0c4bb94c5..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, @@ -13,8 +13,3 @@ import ( func (a *App) PopulateWebConnConfig(s *model.Session, cfg *platform.WebConnConfig, seqVal string) (*platform.WebConnConfig, error) { return a.Srv().Platform().PopulateWebConnConfig(s, cfg, seqVal) } - -// NewWebConn returns a new WebConn instance. -func (a *App) NewWebConn(cfg *platform.WebConnConfig) *platform.WebConn { - return a.Srv().Platform().NewWebConn(cfg, a, a.ch) -} 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 400193ae02..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-plugin-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 1f67662f7a..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-plugin-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 4d9699509b..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-plugin-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 ae6126f9d1..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-plugin-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 70cdc4676a..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 { @@ -48,4 +48,7 @@ type CloudInterface interface { SelfServeDeleteWorkspace(userID string, deletionRequest *model.WorkspaceDeletionRequest) error SubscribeToNewsletter(userID string, req *model.SubscribeNewsletterRequest) error + + // Used only for when a customer has telemetry disabled. In this scenario, true up review telemetry will be submitted via CWS. + SubmitTrueUpReview(userID string, trueUpReviewProfile map[string]any) error } 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 f84300dbec..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" ) @@ -594,6 +594,20 @@ func (_m *CloudInterface) SelfServeDeleteWorkspace(userID string, deletionReques return r0 } +// SubmitTrueUpReview provides a mock function with given fields: userID, trueUpReviewProfile +func (_m *CloudInterface) SubmitTrueUpReview(userID string, trueUpReviewProfile map[string]interface{}) error { + ret := _m.Called(userID, trueUpReviewProfile) + + var r0 error + if rf, ok := ret.Get(0).(func(string, map[string]interface{}) error); ok { + r0 = rf(userID, trueUpReviewProfile) + } else { + r0 = ret.Error(0) + } + + return r0 +} + // SubscribeToNewsletter provides a mock function with given fields: userID, req func (_m *CloudInterface) SubscribeToNewsletter(userID string, req *model.SubscribeNewsletterRequest) error { ret := _m.Called(userID, req) 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..d39f92661c 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 @@ -993,6 +993,7 @@ func (ss *SqlStore) TrueUpReview() store.TrueUpReviewStore { } func (ss *SqlStore) DropAllTables() { + var tableSchemaFn string if ss.DriverName() == model.DatabaseDriverPostgres { ss.masterX.Exec(`DO $func$ @@ -1002,18 +1003,57 @@ func (ss *SqlStore) DropAllTables() { FROM pg_class WHERE relkind = 'r' -- only tables AND relnamespace = 'public'::regnamespace - AND NOT relname = 'db_migrations' + AND NOT ( + relname = 'db_migrations' OR + relname = 'focalboard_schema_migrations' OR + relname = 'focalboard_boards' OR + relname = 'focalboard_blocks' + ) ); END $func$;`) + tableSchemaFn = "current_schema()" } else { tables := []string{} ss.masterX.Select(&tables, `show tables`) for _, t := range tables { - if t != "db_migrations" { + if t != "db_migrations" && + t != "focalboard_schema_migrations" && + t != "focalboard_boards" && + t != "focalboard_blocks" { ss.masterX.Exec(`TRUNCATE TABLE ` + t) + } } + tableSchemaFn = "DATABASE()" + } + + var boardsTableCount int + err := ss.masterX.Get(&boardsTableCount, ` + SELECT COUNT(*) + FROM INFORMATION_SCHEMA.TABLES + WHERE TABLE_SCHEMA = `+tableSchemaFn+` + AND TABLE_NAME = 'focalboard_schema_migrations'`) + if err != nil { + panic(errors.Wrap(err, "Error dropping all tables. Cannot query INFORMATION_SCHEMA table to check for focalboard_schema_migrations table")) + } + + if boardsTableCount != 0 { + _, blErr := ss.masterX.Exec(` + DELETE FROM focalboard_blocks + WHERE board_id IN ( + SELECT id + FROM focalboard_boards + WHERE NOT is_template + )`) + if blErr != nil { + panic(errors.Wrap(blErr, "Error deleting all non-template blocks")) + } + + _, boErr := ss.masterX.Exec(`DELETE FROM focalboard_boards WHERE NOT is_template`) + if boErr != nil { + panic(errors.Wrap(boErr, "Error delegint all non-template boards")) + } } } 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..f74a562568 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 { @@ -41,6 +41,11 @@ type HelperOptions struct { } func NewMainHelper() *MainHelper { + // Ignore any globally defined datasource if a test dsn defined + if os.Getenv("TEST_DATABASE_MYSQL_DSN") != "" || os.Getenv("TEST_DATABASE_POSTGRESQL_DSN") != "" { + os.Unsetenv("MM_SQLSETTINGS_DATASOURCE") + } + return NewMainHelperWithOptions(&HelperOptions{ EnableStore: true, EnableResources: true, @@ -48,6 +53,11 @@ func NewMainHelper() *MainHelper { } func NewMainHelperWithOptions(options *HelperOptions) *MainHelper { + // Ignore any globally defined datasource if a test dsn defined + if os.Getenv("TEST_DATABASE_MYSQL_DSN") != "" || os.Getenv("TEST_DATABASE_POSTGRESQL_DSN") != "" { + os.Unsetenv("MM_SQLSETTINGS_DATASOURCE") + } + var mainHelper MainHelper flag.Parse() @@ -153,6 +163,7 @@ func (h *MainHelper) setupResources() { func (h *MainHelper) PreloadMigrations() { var buf []byte var err error + basePath := os.Getenv("MM_SERVER_PATH") if basePath == "" { basePath = "mattermost-server/server" @@ -177,6 +188,62 @@ func (h *MainHelper) PreloadMigrations() { if err != nil { panic(errors.Wrap(err, "Error preloading migrations. Check if you have &multiStatements=true in your DSN if you are using MySQL. Or perhaps the schema changed? If yes, then update the warmup files accordingly")) } + + h.PreloadBoardsMigrationsIfNeeded() +} + +// PreloadBoardsMigrationsIfNeeded loads boards migrations if the +// focalboard_schema_migrations table exists already. +// Besides this, the same compatibility and breaking conditions that +// PreloadMigrations has apply here. +// +// Re-generate the files with: +// pg_dump -a -h localhost -U mmuser -d <> --no-comments --inserts -t focalboard_system_settings +// mysqldump -u root -p <> --no-create-info --extended-insert=FALSE focalboard_system_settings +func (h *MainHelper) PreloadBoardsMigrationsIfNeeded() { + tableSchemaFn := "current_schema()" + if *h.Settings.DriverName == model.DatabaseDriverMysql { + tableSchemaFn = "DATABASE()" + } + + basePath := os.Getenv("MM_SERVER_PATH") + if basePath == "" { + basePath = "mattermost-server/server" + } + relPath := "channels/testlib/testdata" + + handle := h.SQLStore.GetMasterX() + var boardsTableCount int + gErr := handle.Get(&boardsTableCount, ` + SELECT COUNT(*) + FROM INFORMATION_SCHEMA.TABLES + WHERE TABLE_SCHEMA = `+tableSchemaFn+` + AND TABLE_NAME = 'focalboard_schema_migrations'`) + if gErr != nil { + panic(errors.Wrap(gErr, "Error preloading migrations. Cannot query INFORMATION_SCHEMA table to check for focalboard_schema_migrations table")) + } + + var buf []byte + var err error + if boardsTableCount != 0 { + switch *h.Settings.DriverName { + case model.DatabaseDriverPostgres: + boardsFinalPath := filepath.Join(basePath, relPath, "boards_postgres_migration_warmup.sql") + buf, err = os.ReadFile(boardsFinalPath) + if err != nil { + panic(fmt.Errorf("cannot read file: %v", err)) + } + case model.DatabaseDriverMysql: + boardsFinalPath := filepath.Join(basePath, relPath, "boards_mysql_migration_warmup.sql") + buf, err = os.ReadFile(boardsFinalPath) + if err != nil { + panic(fmt.Errorf("cannot read file: %v", err)) + } + } + if _, err := handle.Exec(string(buf)); err != nil { + panic(errors.Wrap(err, "Error preloading boards migrations. Check if you have &multiStatements=true in your DSN if you are using MySQL. Or perhaps the schema changed? If yes, then update the warmup files accordingly")) + } + } } func (h *MainHelper) Close() error { 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..05e944fba9 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 { @@ -101,6 +101,9 @@ func GetMockStoreForSetupFunctions() *mocks.Store { oAuthStore := mocks.OAuthStore{} groupStore := mocks.GroupStore{} + pluginStore := mocks.PluginStore{} + pluginStore.On("List", mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil) + mockStore.On("System").Return(&systemStore) mockStore.On("User").Return(&userStore) mockStore.On("Post").Return(&postStore) @@ -116,6 +119,7 @@ func GetMockStoreForSetupFunctions() *mocks.Store { mockStore.On("OAuth").Return(&oAuthStore) mockStore.On("Group").Return(&groupStore) mockStore.On("GetDBSchemaVersion").Return(1, nil) + mockStore.On("Plugin").Return(&pluginStore) return &mockStore } diff --git a/server/channels/testlib/testdata/boards_mysql_migration_warmup.sql b/server/channels/testlib/testdata/boards_mysql_migration_warmup.sql new file mode 100644 index 0000000000..d279598e92 --- /dev/null +++ b/server/channels/testlib/testdata/boards_mysql_migration_warmup.sql @@ -0,0 +1,41 @@ +-- MySQL dump 10.13 Distrib 5.7.12, for Linux (x86_64) +-- +-- Host: localhost Database: mattermost_test +-- ------------------------------------------------------ +-- Server version 5.7.12 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Dumping data for table `focalboard_system_settings` +-- + +LOCK TABLES `focalboard_system_settings` WRITE; +/*!40000 ALTER TABLE `focalboard_system_settings` DISABLE KEYS */; +INSERT INTO `focalboard_system_settings` VALUES ('CategoryUuidIdMigrationComplete','true'); +INSERT INTO `focalboard_system_settings` VALUES ('DeDuplicateCategoryBoardTableComplete','true'); +INSERT INTO `focalboard_system_settings` VALUES ('DeletedMembershipBoardsMigrationComplete','true'); +INSERT INTO `focalboard_system_settings` VALUES ('TeamLessBoardsMigrationComplete','true'); +INSERT INTO `focalboard_system_settings` VALUES ('UniqueIDsMigrationComplete','true'); +/*!40000 ALTER TABLE `focalboard_system_settings` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2023-03-31 11:37:35 diff --git a/server/channels/testlib/testdata/boards_postgres_migration_warmup.sql b/server/channels/testlib/testdata/boards_postgres_migration_warmup.sql new file mode 100644 index 0000000000..7519e8076a --- /dev/null +++ b/server/channels/testlib/testdata/boards_postgres_migration_warmup.sql @@ -0,0 +1,26 @@ +-- +-- PostgreSQL database dump +-- + +-- Dumped from database version 10.20 (Debian 10.20-1.pgdg90+1) +-- Dumped by pg_dump version 14.7 + +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; + +-- +-- Data for Name: focalboard_system_settings; Type: TABLE DATA; Schema: public; Owner: mmuser +-- + +INSERT INTO public.focalboard_system_settings VALUES ('UniqueIDsMigrationComplete', 'true'); +INSERT INTO public.focalboard_system_settings VALUES ('TeamLessBoardsMigrationComplete', 'true'); +INSERT INTO public.focalboard_system_settings VALUES ('DeletedMembershipBoardsMigrationComplete', 'true'); +INSERT INTO public.focalboard_system_settings VALUES ('CategoryUuidIdMigrationComplete', 'true'); +INSERT INTO public.focalboard_system_settings VALUES ('DeDuplicateCategoryBoardTableComplete', 'true'); + + +-- +-- PostgreSQL database dump complete +-- 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..2c4fb8d229 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 @@ -55,7 +55,7 @@ func SetupWithStoreMock(tb testing.TB) *TestHelper { tb.SkipNow() } - th := setupTestHelper(tb, false) + th := setupTestHelper(tb, false, []app.Option{app.SkipProductsInitialization()}) emptyMockStore := mocks.Store{} emptyMockStore.On("Close").Return(nil) th.App.Srv().SetStore(&emptyMockStore) @@ -68,17 +68,18 @@ func Setup(tb testing.TB) *TestHelper { } store := mainHelper.GetStore() store.DropAllTables() - return setupTestHelper(tb, true) + mainHelper.PreloadBoardsMigrationsIfNeeded() + return setupTestHelper(tb, true, nil) } -func setupTestHelper(tb testing.TB, includeCacheLayer bool) *TestHelper { +func setupTestHelper(tb testing.TB, includeCacheLayer bool, options []app.Option) *TestHelper { memoryStore := config.NewTestMemoryStore() newConfig := memoryStore.Get().Clone() + newConfig.SqlSettings = *mainHelper.GetSQLSettings() *newConfig.AnnouncementSettings.AdminNoticesEnabled = false *newConfig.AnnouncementSettings.UserNoticesEnabled = false *newConfig.PluginSettings.AutomaticPrepackagedPlugins = false memoryStore.Set(newConfig) - var options []app.Option options = append(options, app.ConfigStore(memoryStore)) options = append(options, app.StoreOverride(mainHelper.Store)) @@ -204,7 +205,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 +292,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..d8eaf66e8f 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 ( @@ -65,6 +65,7 @@ func TestRunServerSuccess(t *testing.T) { // Use non-default listening port in case another server instance is already running. cfg := configStore.Get() *cfg.ServiceSettings.ListenAddress = unitTestListeningPort + cfg.SqlSettings = *mainHelper.GetSQLSettings() configStore.Set(cfg) err := runServer(configStore, th.interruptChan) @@ -117,6 +118,7 @@ func TestRunServerSystemdNotification(t *testing.T) { // Use non-default listening port in case another server instance is already running. cfg := configStore.Get() *cfg.ServiceSettings.ListenAddress = unitTestListeningPort + cfg.SqlSettings = *mainHelper.GetSQLSettings() configStore.Set(cfg) // Start and stop the server @@ -142,6 +144,7 @@ func TestRunServerNoSystemd(t *testing.T) { // Use non-default listening port in case another server instance is already running. cfg := configStore.Get() *cfg.ServiceSettings.ListenAddress = unitTestListeningPort + cfg.SqlSettings = *mainHelper.GetSQLSettings() configStore.Set(cfg) err := runServer(configStore, th.interruptChan) 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 72% rename from go.mod rename to server/go.mod index 4d95ef02c1..20e82eb78b 100644 --- a/go.mod +++ b/server/go.mod @@ -1,15 +1,15 @@ -module github.com/mattermost/mattermost-server/v6 +module github.com/mattermost/mattermost-server/server/v8 go 1.19 require ( code.sajari.com/docconv v1.3.5 - github.com/Masterminds/semver/v3 v3.2.0 - github.com/Masterminds/squirrel v1.5.3 + github.com/Masterminds/semver/v3 v3.2.1 + github.com/Masterminds/squirrel v1.5.4 github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1 - github.com/aws/aws-sdk-go v1.44.173 + github.com/aws/aws-sdk-go v1.44.240 github.com/blang/semver v3.5.1+incompatible - github.com/blevesearch/bleve/v2 v2.3.6 + github.com/blevesearch/bleve/v2 v2.3.7 github.com/cespare/xxhash/v2 v2.2.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3 @@ -17,7 +17,7 @@ require ( github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a github.com/francoispqt/gojay v1.2.13 github.com/fsnotify/fsnotify v1.6.0 - github.com/getsentry/sentry-go v0.16.0 + github.com/getsentry/sentry-go v0.20.0 github.com/go-sql-driver/mysql v1.7.0 github.com/golang-migrate/migrate/v4 v4.15.2 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 @@ -31,9 +31,9 @@ require ( github.com/graph-gophers/dataloader/v7 v7.1.0 github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c - github.com/hashicorp/go-hclog v1.4.0 - github.com/hashicorp/go-plugin v1.4.8 - github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba + github.com/hashicorp/go-hclog v1.5.0 + github.com/hashicorp/go-plugin v1.4.9 + github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 github.com/jmoiron/sqlx v1.3.5 github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 @@ -42,32 +42,31 @@ require ( github.com/mattermost/gziphandler v0.0.1 github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d github.com/mattermost/logr/v2 v2.0.16 - github.com/mattermost/mattermost-plugin-playbooks/client v0.7.0 github.com/mattermost/morph v1.0.5-0.20221115094356-4c18a75b1f5e github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 github.com/mattermost/squirrel v0.2.0 github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538 github.com/mholt/archiver/v3 v3.5.1 - github.com/microcosm-cc/bluemonday v1.0.21 - github.com/minio/minio-go/v7 v7.0.45 - github.com/mitchellh/mapstructure v1.4.3 + github.com/microcosm-cc/bluemonday v1.0.23 + github.com/minio/minio-go/v7 v7.0.51 + github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/run v1.1.0 github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb github.com/opentracing/opentracing-go v1.2.0 github.com/pborman/uuid v1.2.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.12.1 + github.com/prometheus/client_golang v1.14.0 github.com/reflog/dateconstraints v0.2.1 - github.com/rivo/uniseg v0.4.3 + github.com/rivo/uniseg v0.4.4 github.com/rs/cors v1.8.3 github.com/rudderlabs/analytics-go v3.3.3+incompatible github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd - github.com/sergi/go-diff v1.2.0 + github.com/sergi/go-diff v1.3.1 github.com/sirupsen/logrus v1.9.0 - github.com/spf13/cobra v1.6.1 - github.com/spf13/viper v1.10.1 - github.com/splitio/go-client/v6 v6.2.1 - github.com/stretchr/testify v1.8.1 + github.com/spf13/cobra v1.7.0 + github.com/spf13/viper v1.15.0 + github.com/splitio/go-client/v6 v6.3.1 + github.com/stretchr/testify v1.8.2 github.com/throttled/throttled v2.2.5+incompatible github.com/tinylib/msgp v1.1.8 github.com/uber/jaeger-client-go v2.30.0+incompatible @@ -76,14 +75,14 @@ require ( github.com/wiggin77/merror v1.0.4 github.com/writeas/go-strip-markdown v2.0.1+incompatible github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c - github.com/yuin/goldmark v1.5.3 - golang.org/x/crypto v0.5.0 - golang.org/x/image v0.3.0 - golang.org/x/net v0.8.0 - golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b + github.com/yuin/goldmark v1.5.4 + golang.org/x/crypto v0.8.0 + golang.org/x/image v0.7.0 + golang.org/x/net v0.9.0 + golang.org/x/oauth2 v0.7.0 golang.org/x/sync v0.1.0 - golang.org/x/text v0.8.0 - golang.org/x/tools v0.6.0 + golang.org/x/text v0.9.0 + golang.org/x/tools v0.8.0 gopkg.in/guregu/null.v4 v4.0.0 gopkg.in/mail.v2 v2.3.1 gopkg.in/yaml.v2 v2.4.0 @@ -91,16 +90,17 @@ require ( ) require ( + github.com/HdrHistogram/hdrhistogram-go v0.9.0 // indirect github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052 // indirect - github.com/PuerkitoBio/goquery v1.8.0 // indirect - github.com/RoaringBitmap/roaring v1.2.1 // indirect + github.com/PuerkitoBio/goquery v1.8.1 // indirect + github.com/RoaringBitmap/roaring v1.2.3 // indirect github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625 // indirect - github.com/andybalholm/brotli v1.0.4 // indirect + github.com/andybalholm/brotli v1.0.5 // indirect github.com/andybalholm/cascadia v1.3.1 // indirect github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bits-and-blooms/bitset v1.4.0 // indirect + github.com/bits-and-blooms/bitset v1.5.0 // indirect github.com/bits-and-blooms/bloom/v3 v3.3.1 // indirect github.com/blevesearch/bleve_index_api v1.0.5 // indirect github.com/blevesearch/geo v0.1.17 // indirect @@ -116,21 +116,21 @@ require ( github.com/blevesearch/zapx/v12 v12.3.7 // indirect github.com/blevesearch/zapx/v13 v13.3.7 // indirect github.com/blevesearch/zapx/v14 v14.3.7 // indirect - github.com/blevesearch/zapx/v15 v15.3.8 // indirect + github.com/blevesearch/zapx/v15 v15.3.9 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect - github.com/fatih/color v1.13.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/fatih/color v1.15.0 // indirect github.com/fatih/set v0.2.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 // indirect github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-resty/resty/v2 v2.7.0 // indirect - github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/geo v0.0.0-20230404232722-c4acd7a044dc // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/gomodule/redigo v2.0.0+incompatible // indirect github.com/google/uuid v1.3.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/gorilla/css v1.0.0 // indirect @@ -141,17 +141,17 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect - github.com/klauspost/compress v1.15.14 // indirect - github.com/klauspost/cpuid/v2 v2.2.3 // indirect + github.com/klauspost/compress v1.16.4 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/klauspost/pgzip v1.2.5 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/sha256-simd v1.0.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect @@ -162,26 +162,28 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/otiai10/gosseract/v2 v2.4.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.7 // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.33.0 // indirect - github.com/prometheus/procfs v0.7.3 // indirect - github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect + github.com/redis/go-redis/v9 v9.0.3 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/richardlehane/mscfb v1.0.4 // indirect github.com/richardlehane/msoleps v1.0.3 // indirect github.com/rs/xid v1.4.0 // indirect github.com/segmentio/backo-go v1.0.1 // indirect - github.com/spf13/afero v1.8.2 // indirect - github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/splitio/go-split-commons/v4 v4.2.3 // indirect - github.com/splitio/go-toolkit/v5 v5.2.2 // indirect + github.com/splitio/go-split-commons/v4 v4.3.1 // indirect + github.com/splitio/go-toolkit/v5 v5.3.0 // indirect github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/subosito/gotenv v1.2.0 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/tidwall/gjson v1.14.4 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect @@ -189,25 +191,25 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/wiggin77/srslog v1.0.1 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - go.etcd.io/bbolt v1.3.6 // indirect + go.etcd.io/bbolt v1.3.7 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect + golang.org/x/mod v0.10.0 // indirect + golang.org/x/sys v0.7.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf // indirect - google.golang.org/grpc v1.51.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.54.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect - lukechampine.com/uint128 v1.2.0 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect + lukechampine.com/uint128 v1.3.0 // indirect modernc.org/cc/v3 v3.40.0 // indirect modernc.org/ccgo/v3 v3.16.13 // indirect - modernc.org/libc v1.22.2 // indirect + modernc.org/libc v1.22.3 // indirect modernc.org/mathutil v1.5.0 // indirect modernc.org/memory v1.5.0 // indirect modernc.org/opt v0.1.3 // indirect - modernc.org/sqlite v1.20.1 // indirect + modernc.org/sqlite v1.21.1 // indirect modernc.org/strutil v1.1.3 // indirect modernc.org/token v1.1.0 // indirect ) diff --git a/go.sum b/server/go.sum similarity index 82% rename from go.sum rename to server/go.sum index 7aff53830e..67c290126e 100644 --- a/go.sum +++ b/server/go.sum @@ -4,7 +4,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= -cloud.google.com/go v0.37.1/go.mod h1:SAbnLi6YTSPKSI0dTUEOVLCkyPfKXK8n4ibqiMoj4ok= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= @@ -18,8 +17,6 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.63.0/go.mod h1:GmezbQc7T2snqkEXWfZ0sy0VfkB/ivI2DdtJL2DEmlg= -cloud.google.com/go v0.64.0/go.mod h1:xfORb36jGvE+6EexW71nMEtL025s3x6xvuYUKM4JLv4= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= @@ -52,7 +49,6 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/spanner v1.9.0/go.mod h1:xvlEn0NZ5v1iJPYsBnUVRDNvccDxsBTEi16pJRKQVws= cloud.google.com/go/spanner v1.28.0/go.mod h1:7m6mtQZn/hMbMfx62ct5EWrGND4DNqkXyrmBPRS+OJo= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= @@ -60,10 +56,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -code.sajari.com/docconv v1.1.1-0.20210427001343-7b3472bc323a/go.mod h1:KPNt2zuWplps1W0TpOb6ltHj4Xu+j6h7a+YkqGHrxQE= code.sajari.com/docconv v1.3.5 h1:RBBs6aT3/5gHHWzAaxBj85e3ozsu05s2kAslhW7i+Ag= code.sajari.com/docconv v1.3.5/go.mod h1:EDkTrwa2yO2O9EbVpD3dlHXDVcxbfKDWnDNE/8vbbP8= -contrib.go.opencensus.io/exporter/ocagent v0.4.9/go.mod h1:ueLzZcP7LPhPulEBukGn4aLh7Mx9YJwpVJ9nL2FYltw= dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= @@ -71,18 +65,14 @@ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= -github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v26.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v11.5.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= @@ -97,29 +87,17 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ClickHouse/clickhouse-go v1.3.12/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= -github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= -github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/HdrHistogram/hdrhistogram-go v0.9.0 h1:dpujRju0R4M/QZzcnR1LH1qm+TVG3UzkWdp5tH1WMcg= github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4= github.com/JalfResi/justext v0.0.0-20170829062021-c0282dea7198/go.mod h1:0SURuH1rsE8aVWvutuMZghRNrNrYEUzibzJfhEYR8L0= github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052 h1:8T2zMbhLBbH9514PIQVHdsGhypMrsB4CxwbldKA9sBA= github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052/go.mod h1:0SURuH1rsE8aVWvutuMZghRNrNrYEUzibzJfhEYR8L0= -github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Julusian/godocdown v0.0.0-20170816220326-6d19f8ff2df8/go.mod h1:INZr5t32rG59/5xeltqoCJoNY7e5x/3xoY9WSWVWg74= -github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Masterminds/squirrel v1.5.0/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= -github.com/Masterminds/squirrel v1.5.3 h1:YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvdHpkZc= -github.com/Masterminds/squirrel v1.5.3/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= -github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= +github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= +github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= +github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= @@ -146,29 +124,20 @@ github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:m github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PaulARoy/azurestoragecache v0.0.0-20170906084534-3c249a3ba788/go.mod h1:lY1dZd8HBzJ10eqKERHn3CU59tfhzcAVb2c0ZhIWSOk= github.com/PuerkitoBio/goquery v1.4.1/go.mod h1:T9ezsOHcCrDCgA8aF1Cqr3sSYbO/xgdy8/R/XiIMAhA= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= -github.com/PuerkitoBio/goquery v1.7.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= -github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= -github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= +github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= +github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= -github.com/RoaringBitmap/roaring v0.8.0/go.mod h1:jdT9ykXwHFNdJbEtxePexlFYH9LXucApeS0/+/g+p1I= -github.com/RoaringBitmap/roaring v1.2.1 h1:58/LJlg/81wfEHd5L9qsHduznOIhyv4qb1yWcSvVq9A= -github.com/RoaringBitmap/roaring v1.2.1/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA= -github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= +github.com/RoaringBitmap/roaring v1.2.3 h1:yqreLINqIrX22ErkKI0vY47/ivtJr6n+kMhVOVmhWBY= +github.com/RoaringBitmap/roaring v1.2.3/go.mod h1:plvDsJQpxOC5bw8LRteu/MLWHsHez/3y6cubLI4/1yE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/advancedlogic/GoOse v0.0.0-20191112112754-e742535969c1/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w= -github.com/advancedlogic/GoOse v0.0.0-20200830213114-1225d531e0ad/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w= github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625 h1:LZIP5Bj5poWWRZ8fcL4ZwCupb4FwcTFK2RCTxkGnCX8= github.com/advancedlogic/GoOse v0.0.0-20210820140952-9d5822d4a625/go.mod h1:f3HCSN1fBWjcpGtXyM119MJgeQl838v6so/PQOqvE1w= -github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -177,11 +146,9 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= -github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY= @@ -189,10 +156,8 @@ github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x0 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0= github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY= github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/araddon/dateparse v0.0.0-20180729174819-cfd92a431d0e/go.mod h1:SLqhdZcd+dF3TEVL2RMoob5bBP5R1P1qkox+HtCBgGI= github.com/araddon/dateparse v0.0.0-20200409225146-d820a6159ab1/go.mod h1:SLqhdZcd+dF3TEVL2RMoob5bBP5R1P1qkox+HtCBgGI= github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA= @@ -200,17 +165,14 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoU github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1 h1:9h8f71kuF1pqovnn9h7LTHLEjxzyQaj0j1rQq5nsMM4= github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1/go.mod h1:noBAuukeYOXa0aXGqxr24tADqkwDO2KRD15FsuaZ5a8= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.19.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.38.67/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic= -github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.240 h1:38f1qBTuzotDC6bgSNLw1vrrYaoWL8MNNzwTsGjP6TY= +github.com/aws/aws-sdk-go v1.44.240/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.6.0/go.mod h1:TNtBVmka80lRPk5+S9ZqVfFszOQAGJJ9KbT3EM3CHNU= @@ -239,8 +201,6 @@ github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= -github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -252,8 +212,8 @@ github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCS github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bitset v1.3.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bitset v1.4.0 h1:+YZ8ePm+He2pU3dZlIZiOeAKfrBkXi1lSrXJ/Xzgbu8= -github.com/bits-and-blooms/bitset v1.4.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8= +github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bits-and-blooms/bloom/v3 v3.3.1 h1:K2+A19bXT8gJR5mU7y+1yW6hsKfNCjcP2uNfLFKncjQ= github.com/bits-and-blooms/bloom/v3 v3.3.1/go.mod h1:bhUUknWd5khVbTe4UgMCSiOOVJzr3tMoijSK3WwvW90= github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= @@ -261,25 +221,20 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blevesearch/bleve v1.0.14/go.mod h1:e/LJTr+E7EaoVdkQZTfoz7dt4KoDNvDbLb8MSKuNTLQ= -github.com/blevesearch/bleve/v2 v2.3.6 h1:NlntUHcV5CSWIhpugx4d/BRMGCiaoI8ZZXrXlahzNq4= -github.com/blevesearch/bleve/v2 v2.3.6/go.mod h1:JM2legf1cKVkdV8Ehu7msKIOKC0McSw0Q16Fmv9vsW4= +github.com/blevesearch/bleve/v2 v2.3.7 h1:nIfIrhv28tvgBpbVF8Dq7/U1zW/YiwSqg/PBgE3x8bo= +github.com/blevesearch/bleve/v2 v2.3.7/go.mod h1:2tToYD6mDeseIA13jcZiEEqYrVLg6xdk0v6+F7dWquU= github.com/blevesearch/bleve_index_api v1.0.5 h1:Lc986kpC4Z0/n1g3gg8ul7H+lxgOQPcXb9SxvQGu+tw= github.com/blevesearch/bleve_index_api v1.0.5/go.mod h1:YXMDwaXFFXwncRS8UobWs7nvo0DmusriM1nztTlj1ms= -github.com/blevesearch/blevex v1.0.0/go.mod h1:2rNVqoG2BZI8t1/P1awgTKnGlx5MP9ZbtEciQaNhswc= -github.com/blevesearch/cld2 v0.0.0-20200327141045-8b5f551d37f5/go.mod h1:PN0QNTLs9+j1bKy3d/GB/59wsNBFC4sWLWG3k69lWbc= github.com/blevesearch/geo v0.1.17 h1:AguzI6/5mHXapzB0gE9IKWo+wWPHZmXZoscHcjFgAFA= github.com/blevesearch/geo v0.1.17/go.mod h1:uRMGWG0HJYfWfFJpK3zTdnnr1K+ksZTuWKhXeSokfnM= github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo= github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M= github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y= github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgYICSZ3w0tYk= -github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc= github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs= github.com/blevesearch/scorch_segment_api/v2 v2.1.4 h1:LmGmo5twU3gV+natJbKmOktS9eMhokPGKWuR+jX84vk= github.com/blevesearch/scorch_segment_api/v2 v2.1.4/go.mod h1:PgVnbbg/t1UkgezPDu8EHLi1BHQ17xUwsFdU6NnOYS0= -github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ= github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU= github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw= github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s= @@ -288,11 +243,6 @@ github.com/blevesearch/upsidedown_store_api v1.0.2 h1:U53Q6YoWEARVLd1OYNc9kvhBMG github.com/blevesearch/upsidedown_store_api v1.0.2/go.mod h1:M01mh3Gpfy56Ps/UXHjEO/knbqyQ1Oamg8If49gRwrQ= github.com/blevesearch/vellum v1.0.9 h1:PL+NWVk3dDGPCV0hoDu9XLLJgqU4E5s/dOeEJByQ2uQ= github.com/blevesearch/vellum v1.0.9/go.mod h1:ul1oT0FhSMDIExNjIxHqJoGpVrBpKCdgDQNxfqgJt7k= -github.com/blevesearch/zap/v11 v11.0.14/go.mod h1:MUEZh6VHGXv1PKx3WnCbdP404LGG2IZVa/L66pyFwnY= -github.com/blevesearch/zap/v12 v12.0.14/go.mod h1:rOnuZOiMKPQj18AEKEHJxuI14236tTQ1ZJz4PAnWlUg= -github.com/blevesearch/zap/v13 v13.0.6/go.mod h1:L89gsjdRKGyGrRN6nCpIScCvvkyxvmeDCwZRcjjPCrw= -github.com/blevesearch/zap/v14 v14.0.5/go.mod h1:bWe8S7tRrSBTIaZ6cLRbgNH4TUDaC9LZSpRGs85AsGY= -github.com/blevesearch/zap/v15 v15.0.3/go.mod h1:iuwQrImsh1WjWJ0Ue2kBqY83a0rFtJTqfa9fp1rbVVU= github.com/blevesearch/zapx/v11 v11.3.7 h1:Y6yIAF/DVPiqZUA/jNgSLXmqewfzwHzuwfKyfdG+Xaw= github.com/blevesearch/zapx/v11 v11.3.7/go.mod h1:Xk9Z69AoAWIOvWudNDMlxJDqSYGf90LS0EfnaAIvXCA= github.com/blevesearch/zapx/v12 v12.3.7 h1:DfQ6rsmZfEK4PzzJJRXjiM6AObG02+HWvprlXQ1Y7eI= @@ -301,23 +251,23 @@ github.com/blevesearch/zapx/v13 v13.3.7 h1:igIQg5eKmjw168I7av0Vtwedf7kHnQro/M+ub github.com/blevesearch/zapx/v13 v13.3.7/go.mod h1:yyrB4kJ0OT75UPZwT/zS+Ru0/jYKorCOOSY5dBzAy+s= github.com/blevesearch/zapx/v14 v14.3.7 h1:gfe+fbWslDWP/evHLtp/GOvmNM3sw1BbqD7LhycBX20= github.com/blevesearch/zapx/v14 v14.3.7/go.mod h1:9J/RbOkqZ1KSjmkOes03AkETX7hrXT0sFMpWH4ewC4w= -github.com/blevesearch/zapx/v15 v15.3.8 h1:q4uMngBHzL1IIhRc8AJUEkj6dGOE3u1l3phLu7hq8uk= -github.com/blevesearch/zapx/v15 v15.3.8/go.mod h1:m7Y6m8soYUvS7MjN9eKlz1xrLCcmqfFadmu7GhWIrLY= +github.com/blevesearch/zapx/v15 v15.3.9 h1:/s9zqKxFaZKQTTcMO2b/Tup0ch5MSztlvw+frVDfIBk= +github.com/blevesearch/zapx/v15 v15.3.9/go.mod h1:m7Y6m8soYUvS7MjN9eKlz1xrLCcmqfFadmu7GhWIrLY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= +github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= @@ -339,8 +289,6 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -354,15 +302,11 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk= github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= -github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= @@ -390,7 +334,6 @@ github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= @@ -463,7 +406,6 @@ github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= @@ -480,11 +422,6 @@ github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+ github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU= -github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k= -github.com/couchbase/moss v0.1.0/go.mod h1:9MaHIaRuy9pvLPUJxB8sh8OrLfyDczECVL37grCIubs= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -493,10 +430,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= -github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= -github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= @@ -505,23 +439,17 @@ github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpT github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3 h1:AqeKSZIG/NIC75MNQlPy/LM3LxfpLwahICJBHwSMFNc= github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3/go.mod h1:hEfFauPHz7+NnjR/yHJGhrKo1Za+zStgwUETx3yzqgY= -github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dhui/dktest v0.3.3/go.mod h1:EML9sP4sqJELHn4jV7B0TY8oF6077nk83/tz7M56jcQ= github.com/dhui/dktest v0.3.10/go.mod h1:h5Enh0nG3Qbo9WjNFRrwmKUaePEBhXMOygbz3Ww7Sz0= -github.com/die-net/lrucache v0.0.0-20181227122439-19a39ef22a11/go.mod h1:ew0MSjCVDdtGMjF3kzLK9hwdgF5mOE8SbYVF3Rc7mkU= -github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= @@ -531,7 +459,6 @@ github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.13+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= @@ -543,22 +470,16 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvyukov/go-fuzz v0.0.0-20210429054444-fca39067bc72/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a h1:etIrTD8BQqzColk9nKRusM9um5+1q0iOEJLqfBMIK64= github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a/go.mod h1:emQhSYTXqB0xxjLITTw4EaWZ+8IIQYw+kx9GqNUKdLg= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= -github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -573,23 +494,16 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= -github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/set v0.2.1 h1:nn2CaJyknWE/6txyUDGwysr3G5QC6xWB/PtVjPBbeaA= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -598,10 +512,10 @@ github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzP github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -611,26 +525,17 @@ github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXt github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8= github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/getsentry/sentry-go v0.11.0/go.mod h1:KBQIxiZAetw62Cj8Ri964vAEWVdgfaUCn30Q3bCvANo= -github.com/getsentry/sentry-go v0.16.0 h1:owk+S+5XcgJLlGR/3+3s6N4d+uKwqYvh/eS0AIMjPWo= -github.com/getsentry/sentry-go v0.16.0/go.mod h1:ZXCloQLj0pG7mja5NK6NPf2V4A88YJ4pNlc2mOHwh6Y= +github.com/getsentry/sentry-go v0.20.0 h1:bwXW98iMRIWxn+4FgPW7vMrjmbym6HblXALmhjHmQaQ= +github.com/getsentry/sentry-go v0.20.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 h1:u8AQ9bPa9oC+8/A/jlWouakhIvkFfuxgIIRjiy8av7I= github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573/go.mod h1:eBvb3i++NHDH4Ugo9qCvMw8t0mTSctaEa5blJbWcNxs= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= -github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-asn1-ber/asn1-ber v1.3.2-0.20191121212151-29be175fc3a3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= -github.com/go-asn1-ber/asn1-ber v1.5.3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A= github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= -github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= @@ -644,12 +549,10 @@ github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= @@ -659,7 +562,6 @@ github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -674,13 +576,8 @@ github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dp github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-redis/redis/v8 v8.0.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo= -github.com/go-redis/redis/v8 v8.10.0/go.mod h1:vXLTvigok0VtUX0znvbcEW1SOt4OA9CU1ZfnOtKOaiM= -github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-resty/resty/v2 v2.0.0/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU= -github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q= github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY= github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -715,10 +612,6 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0= github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= @@ -731,7 +624,6 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= @@ -739,14 +631,13 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-migrate/migrate/v4 v4.14.1/go.mod h1:l7Ks0Au6fYHuUIxUhQ0rcVX1uLlJg54C/VvW7tvxSz0= github.com/golang-migrate/migrate/v4 v4.15.2 h1:vU+M05vs6jWHKDdmE1Ecwj0BznygFc4QsdRe2E/L7kc= github.com/golang-migrate/migrate/v4 v4.15.2/go.mod h1:f2toGLkYqD3JH+Todi4aZ2ZdbeUNx4sIwiOK96rE9Lw= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo= -github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= +github.com/golang/geo v0.0.0-20230404232722-c4acd7a044dc h1:WkAZHSmcnJhZyutVoVXe7lDSQBbISxITcm57tYf22PE= +github.com/golang/geo v0.0.0-20230404232722-c4acd7a044dc/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -782,22 +673,20 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -838,7 +727,6 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -861,18 +749,14 @@ github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2c github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20210621113107-84c6004145de/go.mod h1:MtKwTfDNYAP5EtbQSMYjTSqvj1aXJKQRASWq3bwaP+g= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -882,7 +766,6 @@ github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc= github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -893,54 +776,39 @@ github.com/graph-gophers/dataloader/v7 v7.1.0/go.mod h1:1bKE0Dm6OUcTB/OAuYVOZctg github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a h1:i0+Se9S+2zL5CBxJouqn2Ej6UQMwH1c57ZB6DVnqck4= github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a/go.mod h1:YtmJZDLbF1YYNrlNAuiO5zAStUWc3XZT07iGsVqe1Os= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c h1:fEE5/5VNnYUoBOj2I9TP8Jc+a7lge3QWn9DKE7NCwfc= github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c/go.mod h1:ObS/W+h8RYb1Y7fYivughjxojTmIu5iAIjSrSLCLeqE= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b/go.mod h1:VzxiSdG6j1pi7rwGm/xYI5RbtpBgM8sARDXlvEvxlu0= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I= -github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-plugin v1.4.2/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= -github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM= -github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU= +github.com/hashicorp/go-plugin v1.4.9/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -951,34 +819,22 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.2.4/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod h1:uhpZMVGznybq1itEKXj6RYw9I71qK4kH+OGMjRC4KEo= -github.com/ikawaha/kagome.ipadic v1.1.2/go.mod h1:DPSBbU0czaJhAb/5uKQZHMc9MTVRpDugJfX+HddPHHg= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= -github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= -github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= -github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= -github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= -github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= @@ -987,7 +843,6 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= -github.com/jackc/pgconn v1.3.2/go.mod h1:LvCquS3HbBKwgl7KbX9KyqEIumJAbm1UMcTvGaIf3bM= github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= @@ -1025,14 +880,12 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jamiealquiza/envy v1.1.0/go.mod h1:MP36BriGCLwEHhi1OU8E9569JNZrjWfCvzG7RsPnHus= github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= -github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg= -github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= +github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA= +github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -1042,22 +895,18 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= -github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -1074,11 +923,6 @@ github.com/k0kubun/pp v2.3.0+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3t github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= -github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE= -github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE= -github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro= -github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -1086,31 +930,22 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.14 h1:i7WCKDToww0wA+9qrUZ1xOjp218vfFo3nTU6UHp+gOc= -github.com/klauspost/compress v1.15.14/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU= +github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU= -github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= -github.com/kljensen/snowball v0.6.0/go.mod h1:27N7E8fVU5H68RlUmnWwZCfxgt4POBJfENGMvNRhldw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1118,8 +953,8 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -1130,13 +965,10 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94 h1:+AIlO01SKT9sfWU5CLWi0cfHc7dQwgGz3FhFRzXLoMg= github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94/go.mod h1:TcE3PIIkVWbP/HjhRAafgCjRKvDOi086iqp9VkNX/ng= github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4= -github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= -github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/ledongthuc/pdf v0.0.0-20210621053716-e28cb8259002/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo= github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 h1:W7p+m/AECTL3s/YR5RpQ4hz5SjNeKzZBl1q36ws12s0= @@ -1147,7 +979,6 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= @@ -1155,36 +986,26 @@ github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= -github.com/mattermost/go-i18n v1.11.0/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34= github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 h1:Khvh6waxG1cHc4Cz5ef9n3XVCxRWpAKUtqg9PJl5+y8= github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34= -github.com/mattermost/gorp v1.6.2-0.20210714143452-8b50f5209a7f/go.mod h1:QCQ3U0M9T/BlAdjKFJo0I1oe/YAgbyjNdhU8bpOLafk= -github.com/mattermost/gosaml2 v0.3.3/go.mod h1:Z429EIOiEi9kbq6yHoApfzlcXpa6dzRDc6pO+Vy2Ksk= github.com/mattermost/gziphandler v0.0.1 h1:uXHcXF5agnQ6bXabvpiwwwZOlCYoa7mKHH0lxns/o8w= github.com/mattermost/gziphandler v0.0.1/go.mod h1:CvvZR7sXqhj81V2swXuQY7T04Ccc89u7W7pHNPKev8g= github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d h1:/RJ/UV7M5c7L2TQ0KNm4yZxxFvC1nvRz/gY/Daa35aI= github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d/go.mod h1:HLbgMEI5K131jpxGazJ97AxfPDt31osq36YS1oxFQPQ= -github.com/mattermost/logr v1.0.13/go.mod h1:Mt4DPu1NXMe6JxPdwCC0XBoxXmN9eXOIRPoZarU2PXs= -github.com/mattermost/logr/v2 v2.0.10/go.mod h1:mpPp935r5dIkFDo2y9Q87cQWhFR/4xXpNh0k/y8Hmwg= github.com/mattermost/logr/v2 v2.0.16 h1:jnePX4cPskC3WDFvUardh/xZfxNdsFXbEERJQ1kUEDE= github.com/mattermost/logr/v2 v2.0.16/go.mod h1:1dm/YhTpozsqANXxo5Pi5zYLBsal2xY0pX+JZNbzYJY= -github.com/mattermost/mattermost-plugin-playbooks/client v0.7.0 h1:5TPlzBmrrl6/q6rupBzGvLgeJf/qsn1NoqQmuPDJvdw= -github.com/mattermost/mattermost-plugin-playbooks/client v0.7.0/go.mod h1:pIR9gutNcE4K726viIya01XT7+T9ziLF0jd5ho6kJlM= -github.com/mattermost/mattermost-server/v6 v6.0.0-20210825182941-ddfa6e2436d6/go.mod h1:+S8CsNEPv1FOl1usaPBQ6Gu9+Sm1Cc9YdU/Qh1YMGVI= github.com/mattermost/morph v1.0.5-0.20221115094356-4c18a75b1f5e h1:VfNz+fvJ3DxOlALM22Eea8ONp5jHrybKBCcCtDPVlss= github.com/mattermost/morph v1.0.5-0.20221115094356-4c18a75b1f5e/go.mod h1:xo0ljDknTpPxEdhhrUdwhLCexIsYyDKS6b41HqG8wGU= github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 h1:G9tL6JXRBMzjuD1kkBtcnd42kUiT6QDwxfFYu7adM6o= @@ -1194,7 +1015,6 @@ github.com/mattermost/squirrel v0.2.0/go.mod h1:NPPtk+CdpWre4GxMGoOpzEVFVc0ZoEFy github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -1208,75 +1028,60 @@ github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= -github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538 h1:6mFhRD89wtsxh7g8V6og9DR4y/UGlzzehc1c3O9tbMQ= github.com/mgdelacroix/foundation v0.0.0-20220812143423-0bfc18f73538/go.mod h1:ZwobEfNHde7sU2pGybCWEnSlQ2r+MGrHGOKLphHZ42g= -github.com/mholt/archiver/v3 v3.5.0/go.mod h1:qqTTPUK/HZPFgFQ/TJ3BzvTpF/dPtFVJXdQbCmeMxwc= github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo= github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= -github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= -github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg= -github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= +github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY= +github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.11/go.mod h1:WoyW+ySKAKjY98B9+7ZbI8z8S3jaxaisdcvj9TGlazA= -github.com/minio/minio-go/v7 v7.0.45 h1:g4IeM9M9pW/Lo8AGGNOjBZYlvmtlE1N5TQEYWXRWzIs= -github.com/minio/minio-go/v7 v7.0.45/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw= -github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= +github.com/minio/minio-go/v7 v7.0.51 h1:eSewrwc23TqUDEH8aw8Bwp4f+JDdozRrPWcKR7DZhmY= +github.com/minio/minio-go/v7 v7.0.51/go.mod h1:IbbodHyjUAguneyucUaahv+VMNs/EOTV9du7A7/Z3HU= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= -github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= @@ -1298,13 +1103,9 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= -github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= -github.com/muesli/smartcrop v0.2.1-0.20181030220600-548bbf0c0965/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI= -github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY= @@ -1312,25 +1113,16 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI= -github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= -github.com/ngdinhtoan/glide-cleanup v0.2.0/go.mod h1:UQzsmiDOb8YV3nOsCxK/c9zPpCZVNoHScRE3EO9pVMM= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -1339,11 +1131,9 @@ github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84/go.mod h1:v github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1352,28 +1142,16 @@ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/oov/psd v0.0.0-20210618170533-9fb823ddb631/go.mod h1:GHI1bnmAcbp96z6LNfBJvtrjxhaXGkbsk967utPlvL8= github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb h1:JF9kOhBBk4WPF7luXFu5yR+WgaFm9L/KiHJHhU9vDwA= github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb/go.mod h1:GHI1bnmAcbp96z6LNfBJvtrjxhaXGkbsk967utPlvL8= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1407,20 +1185,15 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/gosseract/v2 v2.2.4/go.mod h1:ahOp/kHojnOMGv1RaUnR0jwY5JVa6BYKhYAS8nbMLSo= -github.com/otiai10/gosseract/v2 v2.3.1/go.mod h1:2ZOGgdTIXQzCS5f+N1HkcXRgDX6K3ZoYe3Yvo++cpp4= github.com/otiai10/gosseract/v2 v2.4.0 h1:gYd3mx6FuMtIlxL4sYb9JLCFEDzg09VgNSZRNbqpiGM= github.com/otiai10/gosseract/v2 v2.4.0/go.mod h1:fhbIDRh29bj13vni6RT3gtWKjKCAeqDYI4C1dxeJuek= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/otiai10/mint v1.3.3 h1:7JgpsBaN0uMkyju4tbYHu0mnM55hNKVYLsXmwr15NQI= github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -1430,23 +1203,19 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/peterbourgon/diskv v0.0.0-20171120014656-2973218375c3/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= +github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.0.3/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= -github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1463,41 +1232,34 @@ github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prY github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.33.0 h1:rHgav/0a6+uYgGdNt3jwz8FNSesO/Hsang3O0T9A5SE= -github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -1507,17 +1269,18 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k= +github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= github.com/reflog/dateconstraints v0.2.1 h1:Hz1n2Q1vEm0Rj5gciDQcCN1iPBwfFjxUJy32NknGP/s= github.com/reflog/dateconstraints v0.2.1/go.mod h1:Ax8AxTBcJc3E/oVS2hd2j7RDM/5MDtuPwuR7lIHtPLo= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa h1:tEkEyxYeZ43TR55QU/hsIt9aRGBxbgGuz9CGykjvogY= -github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/richardlehane/mscfb v1.0.3/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk= github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM= github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk= @@ -1526,27 +1289,23 @@ github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= -github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481/go.mod h1:C9WhFzY47SzYBIvzFqSvHIR6ROgDo4TtdTuRaOMjF/s= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/rudderlabs/analytics-go v3.3.1+incompatible/go.mod h1:LF8/ty9kUX4PTY3l5c97K3nZZaX5Hwsvt+NBaRL/f30= github.com/rudderlabs/analytics-go v3.3.3+incompatible h1:OG0XlKoXfr539e2t1dXtTB+Gr89uFW+OUNQBVhHIIBY= github.com/rudderlabs/analytics-go v3.3.3+incompatible/go.mod h1:LF8/ty9kUX4PTY3l5c97K3nZZaX5Hwsvt+NBaRL/f30= -github.com/russellhaering/goxmldsig v1.1.0/go.mod h1:QK8GhXPB3+AfuCrfo0oRISa9NfzeCpWmxeGnqEpDF9o= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1554,24 +1313,20 @@ github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfF github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc= github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/satori/go.uuid v0.0.0-20180103174451-36e9d2ebbde5/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc= github.com/segmentio/backo-go v1.0.1 h1:68RQccglxZeyURy93ASB/2kc9QudzgIDexJ927N++y4= github.com/segmentio/backo-go v1.0.1/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= @@ -1579,7 +1334,6 @@ github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIl github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= @@ -1589,7 +1343,6 @@ github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9A github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= @@ -1599,7 +1352,6 @@ github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1l github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= @@ -1614,11 +1366,8 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snowflakedb/glog v0.0.0-20180824191149-f5055e6f21ce/go.mod h1:EB/w24pR5VKI60ecFnKqXzxX3dOorz1rnVicQTQrGM0= -github.com/snowflakedb/gosnowflake v1.3.5/go.mod h1:13Ky+lxzIm3VqNDZJdyvu9MCGy+WgRdYFdXp96UcLZU= github.com/snowflakedb/gosnowflake v1.6.3/go.mod h1:6hLajn6yxuJ4xUHZegMekpq9rnQbGJ7TMwXjgTmA6lg= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= @@ -1629,18 +1378,17 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1650,37 +1398,28 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= -github.com/splitio/go-client/v6 v6.1.0/go.mod h1:CEGAEFT99Fwb32ZIRcnZoXTMXddtB6IIpTmt3RP8mnM= -github.com/splitio/go-client/v6 v6.2.1 h1:EH3xYH7fr2c0I0ZtYvsyn7DjC9ZmoNAFLoKoT3BmQFU= -github.com/splitio/go-client/v6 v6.2.1/go.mod h1:+HnGMevmSUk56va2egs9W2s9mJ7LW9IXiDPB1ExOi+k= -github.com/splitio/go-split-commons/v3 v3.1.0/go.mod h1:29NCy20oAS4ZMy4qkwTd6277eieVDonx4V/aeDU/wUQ= -github.com/splitio/go-split-commons/v4 v4.2.0/go.mod h1:mzanM00PV8t1FL6IHc2UXepIH2z79d49ArZ2LoJHGrY= -github.com/splitio/go-split-commons/v4 v4.2.3 h1:/bQg8Z0eCkF9RHl7Dh1SJ8j7Ci024bgtkZEWwEKXywc= -github.com/splitio/go-split-commons/v4 v4.2.3/go.mod h1:mzanM00PV8t1FL6IHc2UXepIH2z79d49ArZ2LoJHGrY= -github.com/splitio/go-toolkit/v4 v4.2.0/go.mod h1:EdIHN0yzB1GTXDYQc0KdKvnjkO/jfUM2YqHVYfhD3Wo= -github.com/splitio/go-toolkit/v5 v5.2.2 h1:VHSJoIH9tsRt2cCzGKN4WG3BoGCr0tCPZIl8APtJ4bw= -github.com/splitio/go-toolkit/v5 v5.2.2/go.mod h1:SYi/svhhtEgdMSb5tNcDcMjOSUH/7XVkvjp5dPL+nBE= +github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= +github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/splitio/go-client/v6 v6.3.1 h1:HtIVILFZotiT2AE1gTElWehrdy71kh8kDux3M3IuKjA= +github.com/splitio/go-client/v6 v6.3.1/go.mod h1:B7mq//ds3MiYjbY1amIESSR8qKcSWjOJJBzVgSAqlLE= +github.com/splitio/go-split-commons/v4 v4.3.1 h1:+BaNoyuxOWopYN603Pbk1etiysHaEz8EghVx20CbwDk= +github.com/splitio/go-split-commons/v4 v4.3.1/go.mod h1:tjtSYwuIMDGTEifO1dMcKk9UYf0Q2gz0xypkT//cdLc= +github.com/splitio/go-toolkit/v5 v5.3.0 h1:NSUBIkyRwyMQ6ruPOiG1Kl1pni/pW3Gqiu7L+11mIMw= +github.com/splitio/go-toolkit/v5 v5.3.0/go.mod h1:yn9f3Bmka+97BNnNnnlM1V484jMqu7MNoM/RBZLbZZs= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= -github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc= -github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -1690,69 +1429,48 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tebeka/snowball v0.4.2/go.mod h1:4IfL14h1lvwZcp1sfXuuc7/7yCsvVffTWxWxCLfFpYg= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/throttled/throttled v2.2.5+incompatible h1:65UB52X0qNTYiT0Sohp8qLYVFwZQPDw85uSa65OljjQ= github.com/throttled/throttled v2.2.5+incompatible/go.mod h1:0BjlrEGQmvxps+HuXLsyRdqpSRvJpq0PNIsOtqP9Nos= -github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg= github.com/twmb/murmur3 v1.1.6/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= -github.com/tylerb/graceful v1.2.15/go.mod h1:LPYTbOYmUTdabwRt0TGhLllQ0MUNbs0Y5q1WXJOI9II= -github.com/uber/jaeger-client-go v2.29.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= @@ -1763,19 +1481,14 @@ github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmF github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vmihailenco/msgpack/v5 v5.3.4/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/wiggin77/cfg v1.0.2/go.mod h1:b3gotba2e5bXTqTW48DwIFoLc+4lWKP7WPi/CdvZ4aE= -github.com/wiggin77/merror v1.0.2/go.mod h1:uQTcIU0Z6jRK4OwqganPYerzQxSFJ4GSHM3aurxxQpg= -github.com/wiggin77/merror v1.0.3/go.mod h1:H2ETSu7/bPE0Ymf4bEwdUoo73OOEkdClnoRisfw0Nm0= github.com/wiggin77/merror v1.0.4 h1:XxFLEevmQQfgJW2AxhapuMG7C1fQqfbim/XyUmYv/ZM= github.com/wiggin77/merror v1.0.4/go.mod h1:H2ETSu7/bPE0Ymf4bEwdUoo73OOEkdClnoRisfw0Nm0= github.com/wiggin77/srslog v1.0.1 h1:gA2XjSMy3DrRdX9UqLuDtuVAAshb8bE1NhX1YK0Qe+8= github.com/wiggin77/srslog v1.0.1/go.mod h1:fehkyYDq1QfuYn60TDPu9YdY2bB85VUW2mvN1WynEls= -github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/writeas/go-strip-markdown v2.0.1+incompatible h1:IIqxTM5Jr7RzhigcL6FkrCNfXkvbR+Nbu1ls48pXYcw= @@ -1784,43 +1497,35 @@ github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVT github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g= github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM= -github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/goldmark v1.5.3 h1:3HUJmBFbQW9fhQOzMgseU134xfi6hU+mjWywx5Ty+/M= -github.com/yuin/goldmark v1.5.3/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU= +github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= @@ -1829,12 +1534,9 @@ go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lL go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.7.0/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= -go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A= -go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1846,9 +1548,7 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -1856,17 +1556,13 @@ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= -go.opentelemetry.io/otel/internal/metric v0.21.0/go.mod h1:iOfAaY2YycsXfYD4kaRSbLx2LKmfpKObWBEv9QK5zFo= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.21.0/go.mod h1:JWCt1bjivC4iCrz/aCrM1GSw+ZcvY44KCbaeeRhzHnc= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1875,7 +1571,6 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= @@ -1883,20 +1578,17 @@ go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= -golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1908,25 +1600,20 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= +golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1941,10 +1628,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1953,12 +1638,10 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20210622092929-e6eecd499c2c/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg= -golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A= +golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw= +golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -1978,17 +1661,16 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2001,12 +1683,10 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -2019,7 +1699,6 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -2034,15 +1713,11 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201029221708-28c70e62bb1d/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -2062,24 +1737,25 @@ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2094,8 +1770,8 @@ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2121,10 +1797,6 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2151,11 +1823,8 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2188,7 +1857,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2197,7 +1865,6 @@ golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2210,7 +1877,6 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2247,7 +1913,6 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2259,8 +1924,10 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2268,6 +1935,7 @@ golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2279,9 +1947,9 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2298,20 +1966,16 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -2325,7 +1989,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2360,15 +2023,9 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200806022845-90696ccdc692/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200814230902-9882f1d1823d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200818005847-188abfa75333/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20200928182047-19e03678916f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2385,8 +2042,9 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= +golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2402,9 +2060,7 @@ gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= -google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -2450,15 +2106,12 @@ google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= -google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190321212433-e79c0c59cdb5/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2490,13 +2143,9 @@ google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2536,15 +2185,13 @@ google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= -google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf h1:/JqRexUvugu6JURQ0O7RfV1EnvgrOxUV4tSjuAv0Sr0= -google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -2560,7 +2207,6 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= @@ -2578,8 +2224,8 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= -google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2595,8 +2241,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= @@ -2612,30 +2258,23 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= gopkg.in/guregu/null.v4 v4.0.0 h1:1Wm3S1WEA2I26Kq+6vcW+w0gcDo44YKYD7YIEJNHDjg= gopkg.in/guregu/null.v4 v4.0.0/go.mod h1:YoQhUrADuG3i9WqesrCmpNRwm1ypAgSHYqoOcTu/JrI= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk= gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/olivere/elastic.v6 v6.2.35/go.mod h1:2cTT8Z+/LcArSWpCgvZqBgt3VOqXiy7v00w12Lz8bd4= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -2648,7 +2287,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -2663,7 +2301,6 @@ gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2715,8 +2352,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= -lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= -lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo= +lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg= modernc.org/cc/v3 v3.32.4/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= @@ -2744,8 +2381,8 @@ modernc.org/libc v1.9.5/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU= modernc.org/libc v1.16.7/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= -modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0= -modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug= +modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY= +modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw= modernc.org/lldb v1.0.0/go.mod h1:jcRvJGWfCGodDZz8BPwiKMJxGJngQ/5DrRapkQnLob8= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= @@ -2764,15 +2401,15 @@ modernc.org/ql v1.0.0/go.mod h1:xGVyrLIatPcO2C1JvI/Co8c0sr6y91HKFNy4pt9JXEY= modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k= modernc.org/sqlite v1.10.6/go.mod h1:Z9FEjUtZP4qFEg6/SiADg9XCER7aYy9a/j7Pg9P7CPs= modernc.org/sqlite v1.18.0/go.mod h1:B9fRWZacNxJBHoCJZQr1R54zhVn3fjfl0aszflrTSxY= -modernc.org/sqlite v1.20.1 h1:z6qRLw72B0VfRrJjs3l6hWkzYDx1bo0WGVrBGP4ohhM= -modernc.org/sqlite v1.20.1/go.mod h1:fODt+bFmc/j8LcoCbMSkAuKuGmhxjG45KGc25N2705M= +modernc.org/sqlite v1.21.1 h1:GyDFqNnESLOhwwDRaHGdp2jKLDzpyT/rNLglX3ZkMSU= +modernc.org/sqlite v1.21.1/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI= modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY= modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= modernc.org/tcl v1.5.2/go.mod h1:pmJYOLgpiys3oI4AeAafkcUfE+TKKilminxNyU/+Zlo= modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= -modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34= +modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= @@ -2796,5 +2433,3 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= -willnorris.com/go/gifresize v1.0.0/go.mod h1:eBM8gogBGCcaH603vxSpnfjwXIpq6nmnj/jauBDKtAk= -willnorris.com/go/imageproxy v0.10.0/go.mod h1:2tWdKRneln3E9X/zwH1RINpQAQWPeUiNynZ7UQ9OROk= diff --git a/server/i18n/bg.json b/server/i18n/bg.json index f9fa12c015..00b110c3b1 100644 --- a/server/i18n/bg.json +++ b/server/i18n/bg.json @@ -1927,10 +1927,6 @@ "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Неуспешно създаване на групов процесор Elasticsearch." }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch вече е стартиран." - }, { "id": "ent.elasticsearch.search_users.unmarshall_user_failed", "translation": "Неуспешно декодиране на резултатите от търсенето" diff --git a/server/i18n/de.json b/server/i18n/de.json index 3e7aed88f5..f6d50b4ec2 100644 --- a/server/i18n/de.json +++ b/server/i18n/de.json @@ -3135,10 +3135,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Konnte Suchergebnisse nicht dekodieren" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch ist bereits gestartet." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Fehler beim Erstellen der Elasticsearch-Massenverarbeitung." diff --git a/server/i18n/en.json b/server/i18n/en.json index e91fbf2656..598462a448 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -2089,6 +2089,10 @@ "id": "api.license.true_up_review.create_error", "translation": "Could not create true up status record" }, + { + "id": "api.license.true_up_review.failed_to_submit", + "translation": "Failed to submit true up review profile to CWS." + }, { "id": "api.license.true_up_review.get_status_error", "translation": "Could not get true up status records" @@ -5931,6 +5935,10 @@ "id": "app.oauth.update_app.updating.app_error", "translation": "We encountered an error updating the app." }, + { + "id": "app.plugin.blocked.app_error", + "translation": "Plugin {{.Id}} is on the block list. Some plugins are blocked because they are built into this version of Mattermost." + }, { "id": "app.plugin.cluster.save_config.app_error", "translation": "The plugin configuration in your config.json file must be updated manually when using ReadOnlyConfig with clustering enabled." @@ -6063,6 +6071,10 @@ "id": "app.plugin.signature_decode.app_error", "translation": "Unable to decode base64 signature." }, + { + "id": "app.plugin.skip_installation.app_error", + "translation": "Skipping installation of plugin {{.Id}} since existing version is equal or newer." + }, { "id": "app.plugin.store_bundle.app_error", "translation": "Unable to store the plugin to the configured file store." @@ -7787,6 +7799,10 @@ "id": "ent.elasticsearch.indexer.index_batch.nothing_left_to_index.error", "translation": "Trying to index a new batch when all the entities are completed" }, + { + "id": "ent.elasticsearch.max_version.app_error", + "translation": "Elasticsearch version {{.Version}} is higher than max supported version of {{.MaxVersion}}" + }, { "id": "ent.elasticsearch.not_started.error", "translation": "Elasticsearch is not started" @@ -7855,10 +7871,6 @@ "id": "ent.elasticsearch.search_users.unmarshall_user_failed", "translation": "Failed to decode search results" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch is already started." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Failed to create Elasticsearch bulk processor." diff --git a/server/i18n/en_AU.json b/server/i18n/en_AU.json index 8a71e91c0d..bb53e81dcf 100644 --- a/server/i18n/en_AU.json +++ b/server/i18n/en_AU.json @@ -3291,10 +3291,6 @@ "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Failed to create Elasticsearch bulk processor." }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch is already started." - }, { "id": "ent.elasticsearch.search_users.unmarshall_user_failed", "translation": "Failed to decode search results" @@ -9837,5 +9833,337 @@ { "id": "api.templates.license_up_for_renewal_contact_sales", "translation": "Contact Sales" + }, + { + "id": "worktemplate.product_teams.sprint_planning.integration", + "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom. These will be downloaded for you." + }, + { + "id": "worktemplate.product_teams.sprint_planning.channel", + "translation": "Chat with your team in a channel that connects easily with your boards and integrations." + }, + { + "id": "worktemplate.product_teams.sprint_planning.board", + "translation": "Track your team's progress toward weekly goals with sprint breakdowns, prioritisation, owner assignment and comments." + }, + { + "id": "worktemplate.product_teams.product_roadmap.channel", + "translation": "Chat with your team about your customers' feedback, prioritisation and get aligned on progress together." + }, + { + "id": "worktemplate.product_teams.product_roadmap.board", + "translation": "Use the Product Roadmap board to manage user feedback, assign resources, view deliverables in a calendar view and prioritise issues." + }, + { + "id": "worktemplate.product_teams.goals_and_okrs.integration", + "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom to facilitate easy collaboration. These will be downloaded for you." + }, + { + "id": "worktemplate.product_teams.goals_and_okrs.channel", + "translation": "Chat about your goals and progress with your team, async or real-time and stay up to date with changes in a single channel." + }, + { + "id": "worktemplate.product_teams.goals_and_okrs.board", + "translation": "Track your team's progress toward organisational goals with the Goals and OKR board. Keep meetings on track with the Meeting Agenda board." + }, + { + "id": "worktemplate.product_teams.feature_release.description.board", + "translation": "Keep meetings on track with the Meeting Agenda board. Manage your workload with the Project Tasks board." + }, + { + "id": "worktemplate.product_teams.bug_bash.playbook", + "translation": "Use checklists to assign testing areas and automated tasks to run a comprehensive bug bash process. Use a retrospective to review your process and improve it for next time." + }, + { + "id": "worktemplate.product_teams.bug_bash.integration", + "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Jira to track your bug bash progress. These will be downloaded for you." + }, + { + "id": "worktemplate.product_teams.bug_bash.channel", + "translation": "Plan and manage bug reports and resolutions in a single channel that’s easily accessible to your team and organisation." + }, + { + "id": "worktemplate.leadership.goals_and_okrs.integration", + "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom to facilitate easy collaboration. These will be downloaded for you." + }, + { + "id": "worktemplate.leadership.goals_and_okrs.channel", + "translation": "Chat about your goals and progress with your team, async or real-time and stay up to date with changes in a single channel." + }, + { + "id": "worktemplate.leadership.goals_and_okrs.board", + "translation": "Track your team's progress toward organisational goals with the Goals and OKR board. Keep meetings on track with the Meeting Agenda board." + }, + { + "id": "worktemplate.devops.product_release.playbook", + "translation": "Create repeatable workflows that are easy to follow and implement so product releases are reliable and on time." + }, + { + "id": "worktemplate.devops.product_release.channel", + "translation": "Chat with your team about daily milestones, any blockers and changes to deliverables, easily and quickly." + }, + { + "id": "worktemplate.devops.product_release.board", + "translation": "Use the Product Release board to support your release timeframe and process, ensuring everyone knows which tasks are due." + }, + { + "id": "worktemplate.devops.incident_resolution.description.playbook", + "translation": "Use checklists and automation to bring in key team members and share how your incident is tracking toward resolution." + }, + { + "id": "worktemplate.devops.incident_resolution.description.channel", + "translation": "Chat with your team about priorities, add stakeholders, provide updates and work toward a resolution in a single channel." + }, + { + "id": "worktemplate.devops.incident_resolution.description.board", + "translation": "Use the Incident Resolution board to support repeatable processes and assign defined tasks across the team." + }, + { + "id": "worktemplate.companywide.goals_and_okrs.integration", + "translation": "Increase productivity in your channel by integrating your most commonly used tools such as Zoom to facilitate easy collaboration. These will be downloaded for you." + }, + { + "id": "worktemplate.companywide.goals_and_okrs.channel", + "translation": "Chat about your goals and progress with your team, async or real-time and stay up to date with changes in a single channel." + }, + { + "id": "worktemplate.companywide.goals_and_okrs.board", + "translation": "Track your team's progress toward organisational goals with the Goals and OKR board. Keep meetings on track with the Meeting Agenda board." + }, + { + "id": "worktemplate.companywide.create_project.integration", + "translation": "Increase productivity in your channel by integrating your most commonly used tools. These will be downloaded for you." + }, + { + "id": "worktemplate.companywide.create_project.channel", + "translation": "Chat with your team about your new project and decide how you’re going to structure it in a collaborative channel." + }, + { + "id": "worktemplate.companywide.create_project.board", + "translation": "Use a Kanban board to define and track your project tasks and progress." + }, + { + "id": "model.license_record.is_valid.bytes.app_error", + "translation": "Invalid value for bytes when uploading a licence." + }, + { + "id": "app.user.run.update_status.title", + "translation": "Status update" + }, + { + "id": "app.user.run.update_status.submit_label", + "translation": "Update status" + }, + { + "id": "app.user.run.update_status.reminder_for_next_update", + "translation": "Reminder for next update" + }, + { + "id": "app.user.run.update_status.num_channel", + "translation": { + "one": "Provide an update to the stakeholders. This post will be broadcasted to {{.Count}} channel.", + "other": "Provide an update to the stakeholders. This post will be broadcasted to {{.Count}} channels." + } + }, + { + "id": "app.user.run.update_status.finish_run.placeholder", + "translation": "Also mark the run as finished" + }, + { + "id": "app.user.run.update_status.finish_run", + "translation": "Finish run" + }, + { + "id": "app.user.run.update_status.change_since_last_update", + "translation": "Change since last update" + }, + { + "id": "app.user.run.status_enable", + "translation": "@{{.Username}} enabled the status updates for [{{.RunName}}]({{.RunURL}})" + }, + { + "id": "app.user.run.status_disable", + "translation": "@{{.Username}} disabled the status updates for [{{.RunName}}]({{.RunURL}})" + }, + { + "id": "app.user.run.request_update", + "translation": "@here — @{{.Name}} requested a status update for [{{.RunName}}]({{.RunURL}}). \n" + }, + { + "id": "app.user.run.request_join_channel", + "translation": "@{{.Name}} is a run participant and wants join this channel. Any member of the channel can invite them.\n" + }, + { + "id": "app.user.run.confirm_finish.title", + "translation": "Confirm finish run" + }, + { + "id": "app.user.run.confirm_finish.submit_label", + "translation": "Finish run" + }, + { + "id": "app.user.run.confirm_finish.num_outstanding", + "translation": { + "one": "There is **{{.Count}} outstanding task**. Are you sure you want to finish the run *{{.RunName}}* for all participants?", + "other": "There are **{{.Count}} outstanding tasks**. Are you sure you want to finish the run *{{.RunName}}* for all participants?" + } + }, + { + "id": "app.user.run.add_to_timeline.title", + "translation": "Add to run timeline" + }, + { + "id": "app.user.run.add_to_timeline.summary.placeholder", + "translation": "Short summary shown in the timeline" + }, + { + "id": "app.user.run.add_to_timeline.summary.help", + "translation": "Max 64 characters" + }, + { + "id": "app.user.run.add_to_timeline.summary", + "translation": "Summary" + }, + { + "id": "app.user.run.add_to_timeline.submit_label", + "translation": "Add to run timeline" + }, + { + "id": "app.user.run.add_to_timeline.playbook_run", + "translation": "Playbook Run" + }, + { + "id": "app.user.run.add_checklist_item.title", + "translation": "Add new task" + }, + { + "id": "app.user.run.add_checklist_item.submit_label", + "translation": "Add task" + }, + { + "id": "app.user.run.add_checklist_item.name", + "translation": "Name" + }, + { + "id": "app.user.run.add_checklist_item.description", + "translation": "Description" + }, + { + "id": "app.user.new_run.title", + "translation": "Run playbook" + }, + { + "id": "app.user.new_run.submit_label", + "translation": "Start run" + }, + { + "id": "app.user.new_run.run_name", + "translation": "Run name" + }, + { + "id": "app.user.new_run.playbook", + "translation": "Playbook" + }, + { + "id": "app.user.new_run.intro", + "translation": "**Owner** {{.Username}}" + }, + { + "id": "app.user.digest.tasks.zero_assigned", + "translation": "You have 0 assigned tasks." + }, + { + "id": "app.user.digest.tasks.num_assigned_due_until_today", + "translation": { + "one": "You have {{.Count}} assigned task that is now due:", + "other": "You have {{.Count}} assigned tasks that are now due:" + } + }, + { + "id": "app.user.digest.tasks.num_assigned", + "translation": { + "one": "You have {{.Count}} assigned task:", + "other": "You have {{.Count}} total assigned tasks:" + } + }, + { + "id": "app.user.digest.tasks.heading", + "translation": "Your assigned tasks" + }, + { + "id": "app.user.digest.tasks.due_yesterday", + "translation": "Due yesterday" + }, + { + "id": "app.user.digest.tasks.due_x_days_ago", + "translation": "Due {{.Count}} days ago" + }, + { + "id": "app.user.digest.tasks.due_today", + "translation": "Due today" + }, + { + "id": "app.user.digest.tasks.due_in_x_days", + "translation": { + "one": "Due in {{.Count}} day", + "other": "Due in {{.Count}} days" + } + }, + { + "id": "app.user.digest.tasks.due_after_today", + "translation": { + "one": "You have **{{.Count}} assigned task due after today**.", + "other": "You have **{{.Count}} assigned tasks due after today**." + } + }, + { + "id": "app.user.digest.tasks.all_tasks_command", + "translation": "Please use `/playbook todo` to see all your tasks." + }, + { + "id": "app.user.digest.runs_in_progress.zero_in_progress", + "translation": "You have 0 runs currently in progress." + }, + { + "id": "app.user.digest.runs_in_progress.num_in_progress", + "translation": { + "one": "You have {{.Count}} run currently in progress:", + "other": "You have {{.Count}} runs currently in progress:" + } + }, + { + "id": "app.user.digest.runs_in_progress.heading", + "translation": "Runs in Progress" + }, + { + "id": "app.user.digest.overdue_status_updates.zero_overdue", + "translation": "You have 0 runs overdue." + }, + { + "id": "app.user.digest.overdue_status_updates.num_overdue", + "translation": { + "one": "You have {{.Count}} run overdue for a status update:", + "other": "You have {{.Count}} runs overdue for a status update:" + } + }, + { + "id": "app.user.digest.overdue_status_updates.heading", + "translation": "Overdue Status Updates" + }, + { + "id": "app.oauth.remove_auth_data_by_client_id.app_error", + "translation": "Unable to remove OAuth data." + }, + { + "id": "app.command.execute.error", + "translation": "Unable to execute command." + }, + { + "id": "api.server.cws.subscribe_to_newsletter.app_error", + "translation": "CWS Server failed to subscribe to newsletter." + }, + { + "id": "api.license.request-trial.bad-request.business-email", + "translation": "Invalid business email for trial" } ] diff --git a/server/i18n/es.json b/server/i18n/es.json index 6a8f3c43ce..f919a013e4 100644 --- a/server/i18n/es.json +++ b/server/i18n/es.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "No pudo decodificar los resultados de búsqueda" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch ya fue iniciado." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "No se pudo crear el procesador a granel de Elasticsearch." diff --git a/server/i18n/fa.json b/server/i18n/fa.json index f9d6cb94df..529465d842 100644 --- a/server/i18n/fa.json +++ b/server/i18n/fa.json @@ -1959,10 +1959,6 @@ "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "پردازنده انبوه جستجوی الاستیک ایجاد نشد." }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "جستجوی الاستیک در حال حاضر آغاز شده است." - }, { "id": "ent.elasticsearch.search_users.unmarshall_user_failed", "translation": "رمزگشایی نتایج جستجو انجام نشد" diff --git a/server/i18n/fr.json b/server/i18n/fr.json index 77720df20d..5a15ff6ff4 100644 --- a/server/i18n/fr.json +++ b/server/i18n/fr.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Impossible de décoder les résultats de recherche" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch est déjà démarré" - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Impossible de créer le processeur d'opérations en masse d'Elasticsearch (Elasticsearch bulk processor)" diff --git a/server/i18n/hu.json b/server/i18n/hu.json index e66cb9ae7f..4f48f7723a 100644 --- a/server/i18n/hu.json +++ b/server/i18n/hu.json @@ -3331,10 +3331,6 @@ "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Nem sikerült létrehozni az Elasticsearch tömeges feldolgozót." }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Az Elasticsearch már elindult." - }, { "id": "ent.elasticsearch.search_users.unmarshall_user_failed", "translation": "Nem sikerült dekódolni a keresési eredményeket" diff --git a/server/i18n/it.json b/server/i18n/it.json index 0129b143eb..24c1fd89a4 100644 --- a/server/i18n/it.json +++ b/server/i18n/it.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Impossibile decodificare i risultati della ricerca" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch è già in esecuzione." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Impossibile creare il processore massivo Elasticsearch." diff --git a/server/i18n/ja.json b/server/i18n/ja.json index 58aa66d022..f7e6bf17db 100644 --- a/server/i18n/ja.json +++ b/server/i18n/ja.json @@ -3131,10 +3131,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "検索結果をデコードできませんでした" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearchは既に起動しています。" - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Elasticsearch Bulk Processorを生成することが出来ませんでした。" diff --git a/server/i18n/ko.json b/server/i18n/ko.json index ddd30b9753..97296dcbdb 100644 --- a/server/i18n/ko.json +++ b/server/i18n/ko.json @@ -3131,10 +3131,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "검색 결과를 디코딩하지 못했습니다" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch가 이미 시작되었습니다." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Failed to create Elasticsearch bulk processor" diff --git a/server/i18n/nl.json b/server/i18n/nl.json index 95097c7095..60e8a39a68 100644 --- a/server/i18n/nl.json +++ b/server/i18n/nl.json @@ -3135,10 +3135,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Fout bij decoderen van zoekresultaten" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch is reeds gestart." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Aanmaken van Elasticsearch-bulkprocessor is mislukt." @@ -9829,5 +9825,45 @@ { "id": "api.templates.license_up_for_renewal_contact_sales", "translation": "Contacteer de verkoopsafdeling" + }, + { + "id": "app.user.digest.tasks.due_today", + "translation": "Vandaag te voldoen" + }, + { + "id": "app.user.digest.tasks.all_tasks_command", + "translation": "Gebruik `/playbook todo` om al je taken te zien." + }, + { + "id": "app.user.digest.runs_in_progress.zero_in_progress", + "translation": "Je hebt momenteel 0 runs lopen." + }, + { + "id": "app.user.digest.runs_in_progress.heading", + "translation": "Runs in uitvoering" + }, + { + "id": "app.user.digest.overdue_status_updates.zero_overdue", + "translation": "Je hebt 0 runs achterstand." + }, + { + "id": "app.user.digest.overdue_status_updates.heading", + "translation": "Achterstallige statusupdates" + }, + { + "id": "app.command.execute.error", + "translation": "Kan commando niet uitvoeren." + }, + { + "id": "api.server.cws.subscribe_to_newsletter.app_error", + "translation": "CWS-server kan zich niet abonneren op nieuwsbrief." + }, + { + "id": "api.server.cws.needs_enterprise_edition", + "translation": "Dienst alleen beschikbaar in Mattermost Enterprise editie" + }, + { + "id": "api.license.request-trial.bad-request.business-email", + "translation": "Ongeldig zakelijk e-mailadres voor proefperiode" } ] diff --git a/server/i18n/pl.json b/server/i18n/pl.json index 339c00b48b..3904b4a334 100644 --- a/server/i18n/pl.json +++ b/server/i18n/pl.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Błąd w dekodowaniu wyników wyszukiwania" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch jest obecnie uruchomiony." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Nie udało się utworzyć procesora zbiorczego Elasticsearch." diff --git a/server/i18n/pt-BR.json b/server/i18n/pt-BR.json index 48f679a2be..157989b6af 100644 --- a/server/i18n/pt-BR.json +++ b/server/i18n/pt-BR.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Falha ao decodificar os resultados da pesquisa" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch já está iniciado." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Erro ao criar o bulk processor do Elastisearch." diff --git a/server/i18n/ro.json b/server/i18n/ro.json index a7ec824541..2b51862302 100644 --- a/server/i18n/ro.json +++ b/server/i18n/ro.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Nu a reuşit să decodeze rezultatele cautării" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch este deja pornit." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Nu s-a putut crea procesorul în bloc Elasticsearch." diff --git a/server/i18n/ru.json b/server/i18n/ru.json index 452811806c..9e0af91cc3 100644 --- a/server/i18n/ru.json +++ b/server/i18n/ru.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Не удалось декодировать результаты поиска" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch уже запущен." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Не удалось создать массовый обработчик Elasticsearch." diff --git a/server/i18n/sv.json b/server/i18n/sv.json index f63afba27a..c0dca8cf57 100644 --- a/server/i18n/sv.json +++ b/server/i18n/sv.json @@ -3079,10 +3079,6 @@ "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Misslyckades att skapa Elasticsearch bulk processor." }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch är redan startat." - }, { "id": "ent.elasticsearch.search_users.unmarshall_user_failed", "translation": "Kunde inte avkoda sökresultaten" diff --git a/server/i18n/tr.json b/server/i18n/tr.json index 218846ffc4..58af066bbd 100644 --- a/server/i18n/tr.json +++ b/server/i18n/tr.json @@ -1505,7 +1505,7 @@ }, { "id": "api.slackimport.slack_add_channels.added", - "translation": "\nKanallar eklendi:\n" + "translation": "\nEklenen kanallar:\n" }, { "id": "api.slackimport.slack_add_channels.failed_to_add_user", @@ -1521,7 +1521,7 @@ }, { "id": "api.slackimport.slack_add_users.created", - "translation": "\nKullanıcılar eklendi:\n" + "translation": "\nEklenen kullanıcılar:\n" }, { "id": "api.slackimport.slack_add_users.email_pwd", @@ -3135,10 +3135,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Arama sonuçlarının kodu çözülemedi" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch zaten başlatılmış." - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Elasticsearch toplu işlemi oluşturulamadı." @@ -9508,7 +9504,7 @@ }, { "id": "worktemplate.category.product_teams", - "translation": "Ürün takımları" + "translation": "Ürün" }, { "id": "model.draft.is_valid.user_id.app_error", @@ -9833,5 +9829,345 @@ { "id": "api.command_templates.desc", "translation": "Kalıptan oluştur penceresini aç" + }, + { + "id": "worktemplate.product_teams.sprint_planning.board", + "translation": "Acil sorunlar, önceliklendirme, sahip atama ve yorumlarla ekibinizin haftalık hedeflere doğru ilerlemesini izleyin." + }, + { + "id": "worktemplate.product_teams.sprint_planning.integration", + "translation": "Zoom gibi sık kullandığınız araçlar ile bütünleştirerek kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir." + }, + { + "id": "worktemplate.product_teams.sprint_planning.channel", + "translation": "Panolarınız ve bütünleştirmelerinizle kolayca bağlantı kuran bir kanalda ekibinizle sohbet edin." + }, + { + "id": "worktemplate.product_teams.product_roadmap.channel", + "translation": "Müşterilerinizin geri bildirimleri ve önceliklendirme hakkında ekibinizle sohbet ederek birlikte ilerleme kaydedin." + }, + { + "id": "worktemplate.product_teams.product_roadmap.board", + "translation": "Kullanıcı geri bildirimlerini yönetmek, kaynak atamak, çıktıları takvimde görüntülemek ve sorunları önceliklendirmek için ürün yol haritası panosunu kullanın." + }, + { + "id": "worktemplate.product_teams.goals_and_okrs.integration", + "translation": "İşbirliğini kolaylaştırmak için Zoom gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir." + }, + { + "id": "worktemplate.product_teams.goals_and_okrs.channel", + "translation": "Hedefleriniz ve ilerlemeniz hakkında ekibinizle farklı zamanlarda ya da gerçek zamanlı olarak sohbet edin ve değişiklikleri tek bir kanaldan izleyerek güncel kalın." + }, + { + "id": "worktemplate.product_teams.goals_and_okrs.board", + "translation": "Amaçlar ve anahtar sonuçlar (OKR) panosu ile ekibinizin kurumsal hedeflere doğru ilerlemesini izleyin. Toplantı gündemi panosu ile toplantıları izleyin." + }, + { + "id": "worktemplate.product_teams.feature_release.description.playbook", + "translation": "Özellik geliştirme sürecinizi destekleyen görev kontrol listeleri ve otomasyon ile işlevsel ekipler arasında işbirliğini artırın. İşiniz bittiğinde bir geçmiş değerlendirmesi yaparak ve süreci bir sonraki sürümünüz için iyileştirin." + }, + { + "id": "worktemplate.product_teams.feature_release.description.integration", + "translation": "Özellikleri yayınlamak için GitHub gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir." + }, + { + "id": "worktemplate.product_teams.feature_release.description.channel", + "translation": "Panolarınıza, senaryolarınıza ve diğer bütünleştirmelere kolayca bağlanan bir kanalda sürüm engelleyicileri ve değişiklikler hakkında ekibinizle sohbet edin." + }, + { + "id": "worktemplate.product_teams.feature_release.description.board", + "translation": "Toplantı gündemi panosu ile toplantıları izleyin. Proje görevleri panosu ile iş yükünüzü yönetin." + }, + { + "id": "worktemplate.product_teams.bug_bash.playbook", + "translation": "Kapsamlı bir hata ayıklama süreci yürütmek için deneme alanları ve otomatik görevler atamak üzere kontrol listeleri kullanın. Sürecinizi gözden geçirmek ve gelecek sefer daha iyi olmasını sağlamak için bir geçmiş değerlendirmesi yapın." + }, + { + "id": "worktemplate.product_teams.bug_bash.integration", + "translation": "Hata ayıklama işlerinizi kolaylaştırmak için Jira gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir." + }, + { + "id": "worktemplate.product_teams.bug_bash.channel", + "translation": "Hata raporlarını ve çözümlerini ekibinizin ve kuruluşunuzun kolayca erişebileceği tek bir kanalda planlayın ve yönetin." + }, + { + "id": "worktemplate.leadership.goals_and_okrs.integration", + "translation": "İşbirliğini kolaylaştırmak için Zoom gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir." + }, + { + "id": "worktemplate.leadership.goals_and_okrs.channel", + "translation": "Hedefleriniz ve ilerlemeniz hakkında ekibinizle farklı zamanlarda ya da gerçek zamanlı olarak sohbet edin ve değişiklikleri tek bir kanaldan izleyerek güncel kalın." + }, + { + "id": "worktemplate.leadership.goals_and_okrs.board", + "translation": "Amaçlar ve anahtar sonuçlar (OKR) panosu ile ekibinizin kurumsal hedeflere doğru ilerlemesini izleyin. Toplantı gündemi panosu ile toplantıları izleyin." + }, + { + "id": "worktemplate.devops.product_release.playbook", + "translation": "Ürün çıkışlarının güvenilir ve zamanında olması için izlenmesi ve uygulanması kolay, yinelenebilir iş akışları oluşturun." + }, + { + "id": "worktemplate.devops.product_release.channel", + "translation": "Ekibinizle günlük kilometre taşları, engeller ve çıktılardaki değişiklikler hakkında kolay ve hızlı bir şekilde sohbet edin." + }, + { + "id": "worktemplate.devops.product_release.board", + "translation": "Sürüm zaman çerçevenizi ve sürecinizi desteklemek için ürün çıkarma panosunu kullanın ve herkesin hangi görevlerin bitiş zamanının geldiğini bilmesini sağlayın." + }, + { + "id": "worktemplate.devops.incident_resolution.description.playbook", + "translation": "Kilit ekip üyelerini bir araya getirmek için kontrol listeleri ve otomasyon kullanarak olayın çözüme doğru ilerlemesini paylaşın." + }, + { + "id": "worktemplate.devops.incident_resolution.description.channel", + "translation": "Ekibinizle tek bir kanal kullanarak öncelikler hakkında sohbet edin, paydaşlar ekleyin, güncellemeler yayınlayın ve çözüm için çalışın." + }, + { + "id": "worktemplate.devops.incident_resolution.description.board", + "translation": "Yinelenebilen süreçleri desteklemek ve ekip genelinde tanımlanmış görevler atamak için olay çözümleme panosunu kullanın." + }, + { + "id": "worktemplate.companywide.goals_and_okrs.integration", + "translation": "İşbirliğini kolaylaştırmak için Zoom gibi sık kullandığınız araçları bütünleştirin ve kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir." + }, + { + "id": "worktemplate.companywide.goals_and_okrs.channel", + "translation": "Hedefleriniz ve ilerlemeniz hakkında ekibinizle farklı zamanlarda ya da gerçek zamanlı olarak sohbet edin ve değişiklikleri tek bir kanaldan izleyerek güncel kalın." + }, + { + "id": "worktemplate.companywide.goals_and_okrs.board", + "translation": "Amaçlar ve anahtar sonuçlar (OKR) panosu ile ekibinizin kurumsal hedeflere doğru ilerlemesini izleyin. Toplantı gündemi panosu ile toplantıları izleyin." + }, + { + "id": "model.license_record.is_valid.bytes.app_error", + "translation": "Bir lisans yüklenirken bayt değeri geçersiz." + }, + { + "id": "worktemplate.companywide.create_project.integration", + "translation": "Sık kullandığınız araçlar ile bütünleştirerek kanalınızdaki üretkenliği artırın. Bunlar sizin için indirilir." + }, + { + "id": "worktemplate.companywide.create_project.channel", + "translation": "Ekibinizle yeni projeniz üzerine sohbet edin ve işbirlikli bir kanalda projeyi nasıl yapılandıracağınıza karar verin." + }, + { + "id": "worktemplate.companywide.create_project.board", + "translation": "Proje görevlerinizi ve ilerlemenizi tanımlamak ve izlemek için bir Kanban panosu kullanın." + }, + { + "id": "app.user.run.update_status.title", + "translation": "Durum güncellemesi" + }, + { + "id": "app.user.run.update_status.submit_label", + "translation": "Durumu güncelle" + }, + { + "id": "app.user.run.update_status.reminder_for_next_update", + "translation": "Sonraki güncelleme anımsatıcısı" + }, + { + "id": "app.user.run.update_status.num_channel", + "translation": { + "one": "Paydaşlara bir güncelleme duyurun. Bu gönderi {{.Count}} kanalında yayınlanacak.", + "other": "Paydaşlara bir güncelleme duyurun. Bu gönderi {{.Count}} kanalında yayınlanacak." + } + }, + { + "id": "app.user.run.update_status.finish_run.placeholder", + "translation": "Ayrıca oyunu da tamamlanmış olarak işaretle" + }, + { + "id": "app.user.run.update_status.finish_run", + "translation": "Oyunu tamamla" + }, + { + "id": "app.user.run.update_status.change_since_last_update", + "translation": "Son güncellemeden sonraki değişiklik" + }, + { + "id": "app.user.run.status_enable", + "translation": "@{{.Username}}, [{{.RunName}}]({{.RunURL}}) için durum güncellemelerini etkinleştirdi" + }, + { + "id": "app.user.run.status_disable", + "translation": "@{{.Username}}, [{{.RunName}}]({{.RunURL}}) için durum güncellemelerini devre dışı bıraktı" + }, + { + "id": "app.user.run.request_update", + "translation": "@here — @{{.Name}}, [{{.RunName}}]({{.RunURL}}) için bir durum güncellemesi istedi. \n" + }, + { + "id": "app.user.run.request_join_channel", + "translation": "@{{.Name}} bir oyun katılımcısı ve bu kanala katılmak istiyor. Kanalın herhangi bir üyesi onu çağırabilir.\n" + }, + { + "id": "app.user.run.confirm_finish.title", + "translation": "Oyunu tamamlamayı onayla" + }, + { + "id": "app.user.run.confirm_finish.submit_label", + "translation": "Oyunu tamamla" + }, + { + "id": "app.user.run.confirm_finish.num_outstanding", + "translation": { + "one": "Bekleyen **{{.Count}} görev** var. *{{.RunName}}* oyununu tüm katılımcılar için tamamlamak istediğinize emin misiniz?", + "other": "Bekleyen **{{.Count}} görev** var. *{{.RunName}}* oyununu tüm katılımcılar için tamamlamak istediğinize emin misiniz?" + } + }, + { + "id": "app.user.run.add_to_timeline.title", + "translation": "Oyun zaman akışına ekle" + }, + { + "id": "app.user.run.add_to_timeline.summary.placeholder", + "translation": "Zaman akışında görüntülenecek kısa açıklama" + }, + { + "id": "app.user.run.add_to_timeline.summary.help", + "translation": "En fazla 64 karakter" + }, + { + "id": "app.user.run.add_to_timeline.summary", + "translation": "Özet" + }, + { + "id": "app.user.run.add_to_timeline.submit_label", + "translation": "Oyun zaman akışına ekle" + }, + { + "id": "app.user.run.add_to_timeline.playbook_run", + "translation": "Senaryo oyunu" + }, + { + "id": "app.user.run.add_checklist_item.title", + "translation": "Yeni görev ekle" + }, + { + "id": "app.user.run.add_checklist_item.submit_label", + "translation": "Görev ekle" + }, + { + "id": "app.user.run.add_checklist_item.name", + "translation": "Ad" + }, + { + "id": "app.user.run.add_checklist_item.description", + "translation": "Açıklama" + }, + { + "id": "app.user.new_run.title", + "translation": "Senaryoyu oyna" + }, + { + "id": "app.user.new_run.submit_label", + "translation": "Oyunu başlat" + }, + { + "id": "app.user.new_run.run_name", + "translation": "Oyun adı" + }, + { + "id": "app.user.new_run.playbook", + "translation": "Senaryo" + }, + { + "id": "app.user.new_run.intro", + "translation": "**Sahibi** {{.Username}}" + }, + { + "id": "app.user.digest.tasks.zero_assigned", + "translation": "Size atanmış bir görev yok." + }, + { + "id": "app.user.digest.tasks.num_assigned_due_until_today", + "translation": { + "one": "Süresi dolmuş {{.Count}} atanmış göreviniz var:", + "other": "Süresi dolmuş {{.Count}} atanmış göreviniz var:" + } + }, + { + "id": "app.user.digest.tasks.num_assigned", + "translation": { + "one": "{{.Count}} atanmış göreviniz var:", + "other": "{{.Count}} atanmış göreviniz var:" + } + }, + { + "id": "app.user.digest.tasks.heading", + "translation": "Atanmış görevleriniz" + }, + { + "id": "app.user.digest.tasks.due_yesterday", + "translation": "Süresi dün doldu" + }, + { + "id": "app.user.digest.tasks.due_x_days_ago", + "translation": "Süresi {{.Count}} gün önce doldu" + }, + { + "id": "app.user.digest.tasks.due_today", + "translation": "Süresi bugün dolacak" + }, + { + "id": "app.user.digest.tasks.due_in_x_days", + "translation": { + "one": "{{.Count}} gün içinde süresi dolacak", + "other": "{{.Count}} gün içinde süresi dolacak" + } + }, + { + "id": "app.user.digest.tasks.due_after_today", + "translation": { + "one": "Bugünden sonra süresi dolacak **{{.Count}} göreviniz var**.", + "other": "Bugünden sonra süresi dolacak **{{.Count}} göreviniz var**." + } + }, + { + "id": "app.user.digest.tasks.all_tasks_command", + "translation": "Tüm görevlerinizi görüntülemek için `/playbook todo` kullanın." + }, + { + "id": "app.user.digest.runs_in_progress.zero_in_progress", + "translation": "Süren bir oyununuz yok." + }, + { + "id": "app.user.digest.runs_in_progress.num_in_progress", + "translation": { + "one": "Süren {{.Count}} oyununuz var:", + "other": "Süren {{.Count}} oyununuz var:" + } + }, + { + "id": "app.user.digest.runs_in_progress.heading", + "translation": "Süren oyunlar" + }, + { + "id": "app.user.digest.overdue_status_updates.zero_overdue", + "translation": "Gecikmiş bir oyununuz yok." + }, + { + "id": "app.user.digest.overdue_status_updates.num_overdue", + "translation": { + "one": "Bir durum güncellemesi için {{.Count}} oyun gecikmeniz var:", + "other": "Bir durum güncellemesi için {{.Count}} oyun gecikmeniz var:" + } + }, + { + "id": "app.user.digest.overdue_status_updates.heading", + "translation": "Gecikmiş durum güncellemeleri" + }, + { + "id": "app.command.execute.error", + "translation": "Komut yürütülemedi." + }, + { + "id": "api.server.cws.subscribe_to_newsletter.app_error", + "translation": "CWS sunucusu duyurulara abone olamadı." + }, + { + "id": "api.license.request-trial.bad-request.business-email", + "translation": "Deneme için iş e-postası geçersiz" } ] diff --git a/server/i18n/uk.json b/server/i18n/uk.json index b63779f26f..de5501e1a6 100644 --- a/server/i18n/uk.json +++ b/server/i18n/uk.json @@ -3139,10 +3139,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "Не вдається розшифрувати результати пошуку" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Еластичний пошук не запускається" - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "Не вдалося створити масовий процесор Elasticsearch" diff --git a/server/i18n/zh-CN.json b/server/i18n/zh-CN.json index bbf95c2889..314e3c6bb6 100644 --- a/server/i18n/zh-CN.json +++ b/server/i18n/zh-CN.json @@ -3131,10 +3131,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "解码搜索结果失败" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "ElasticSearch 已启动。" - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "创建 Elasticsearch 批量处理器失败。" diff --git a/server/i18n/zh-TW.json b/server/i18n/zh-TW.json index e677cec709..4f759a4290 100644 --- a/server/i18n/zh-TW.json +++ b/server/i18n/zh-TW.json @@ -3131,10 +3131,6 @@ "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", "translation": "無法解碼搜尋結果" }, - { - "id": "ent.elasticsearch.start.already_started.app_error", - "translation": "Elasticsearch 已啟動" - }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", "translation": "建立 Elasticsearch 批次處理器時失敗" 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 99% rename from model/client4.go rename to server/model/client4.go index d6cc62ba0f..74b65948b0 100644 --- a/model/client4.go +++ b/server/model/client4.go @@ -8803,3 +8803,17 @@ func (c *Client4) GetWorkTemplatesByCategory(category string) ([]*WorkTemplate, err = json.NewDecoder(r.Body).Decode(&templates) return templates, BuildResponse(r), err } + +func (c *Client4) SubmitTrueUpReview(req map[string]any) (*Response, error) { + reqBytes, err := json.Marshal(req) + if err != nil { + return nil, NewAppError("SubmitTrueUpReview", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err) + } + r, err := c.DoAPIPostBytes(c.licenseRoute()+"/review", reqBytes) + if err != nil { + return BuildResponse(r), nil + } + defer closeBody(r) + + return BuildResponse(r), nil +} 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 91% rename from model/command_args.go rename to server/model/command_args.go index 9d09656e38..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 { @@ -19,9 +19,6 @@ type CommandArgs struct { T i18n.TranslateFunc `json:"-"` UserMentions UserMentionMap `json:"-"` ChannelMentions ChannelMentionMap `json:"-"` - - // DO NOT USE Session field is deprecated. MM-26398 - Session Session `json:"-"` } func (o *CommandArgs) Auditable() map[string]interface{} { 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 a91ac29c40..9d29ee48a4 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 ( @@ -239,10 +239,10 @@ const ( Office365SettingsDefaultTokenEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/token" Office365SettingsDefaultUserAPIEndpoint = "https://graph.microsoft.com/v1.0/me" - CloudSettingsDefaultCwsURL = "https://customers.cloud.mattermost.com" + CloudSettingsDefaultCwsURL = "https://customers.mattermost.com" CloudSettingsDefaultCwsAPIURL = "https://portal.internal.prod.cloud.mattermost.com" // TODO: update to "https://portal.test.cloud.mattermost.com" when ready to use test license key - CloudSettingsDefaultCwsURLTest = "https://customers.cloud.mattermost.com" + CloudSettingsDefaultCwsURLTest = "https://customers.mattermost.com" // TODO: update to // "https://api.internal.test.cloud.mattermost.com" when ready to use test license key CloudSettingsDefaultCwsAPIURLTest = "https://portal.internal.prod.cloud.mattermost.com" @@ -390,7 +390,6 @@ type ServiceSettings struct { EnableCustomGroups *bool `access:"site_users_and_teams"` SelfHostedPurchase *bool `access:"write_restrictable,cloud_restrictable"` AllowSyncedDrafts *bool `access:"site_posts"` - SelfHostedExpansion *bool `access:"write_restrictable,cloud_restrictable"` } func (s *ServiceSettings) SetDefaults(isUpdate bool) { @@ -863,10 +862,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { if s.SelfHostedPurchase == nil { s.SelfHostedPurchase = NewBool(true) } - - if s.SelfHostedExpansion == nil { - s.SelfHostedExpansion = NewBool(false) - } } type ClusterSettings struct { 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 97% rename from model/feature_flags.go rename to server/model/feature_flags.go index 792ae834e9..07bfe6762a 100644 --- a/model/feature_flags.go +++ b/server/model/feature_flags.go @@ -75,7 +75,11 @@ type FeatureFlags struct { OnboardingTourTips bool + DeprecateCloudFree bool + AppsSidebarCategory bool + + CloudReverseTrial bool } func (f *FeatureFlags) SetDefaults() { @@ -101,10 +105,12 @@ func (f *FeatureFlags) SetDefaults() { f.ReduceOnBoardingTaskList = false f.ThreadsEverywhere = false f.GlobalDrafts = true + f.DeprecateCloudFree = false f.WysiwygEditor = false f.OnboardingAutoShowLinkedBoard = false f.OnboardingTourTips = true f.AppsSidebarCategory = false + f.CloudReverseTrial = false } func (f *FeatureFlags) Plugins() map[string]string { 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 55948e98e8..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 { @@ -45,8 +45,19 @@ func (seb *Broker) GetActiveEngines() []SearchEngineInterface { if seb.ElasticsearchEngine != nil && seb.ElasticsearchEngine.IsActive() { engines = append(engines, seb.ElasticsearchEngine) } - if seb.BleveEngine != nil && seb.BleveEngine.IsActive() { + if seb.BleveEngine != nil && seb.BleveEngine.IsActive() && seb.BleveEngine.IsIndexingEnabled() { engines = append(engines, seb.BleveEngine) } return engines } + +func (seb *Broker) ActiveEngine() string { + activeEngines := seb.GetActiveEngines() + if len(activeEngines) > 0 { + return activeEngines[0].GetName() + } + if *seb.cfg.SqlSettings.DisableDatabaseSearch { + return "none" + } + return "database" +} diff --git a/server/platform/services/searchengine/searchengine_test.go b/server/platform/services/searchengine/searchengine_test.go new file mode 100644 index 0000000000..6672b7c575 --- /dev/null +++ b/server/platform/services/searchengine/searchengine_test.go @@ -0,0 +1,42 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +package searchengine + +import ( + "testing" + + "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" + "github.com/stretchr/testify/assert" +) + +func TestActiveEngine(t *testing.T) { + cfg := &model.Config{} + cfg.SetDefaults() + + b := NewBroker(cfg) + + esMock := &mocks.SearchEngineInterface{} + esMock.On("IsActive").Return(true) + esMock.On("GetName").Return("elasticsearch") + + bleveMock := &mocks.SearchEngineInterface{} + bleveMock.On("IsActive").Return(true) + bleveMock.On("IsIndexingEnabled").Return(true) + bleveMock.On("GetName").Return("bleve") + + assert.Equal(t, "database", b.ActiveEngine()) + + b.ElasticsearchEngine = esMock + assert.Equal(t, "elasticsearch", b.ActiveEngine()) + + b.ElasticsearchEngine = nil + b.BleveEngine = bleveMock + assert.Equal(t, "bleve", b.ActiveEngine()) + + b.BleveEngine = nil + *b.cfg.SqlSettings.DisableDatabaseSearch = true + + assert.Equal(t, "none", b.ActiveEngine()) +} 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..4e642f3300 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 ( @@ -476,7 +476,6 @@ func (ts *TelemetryService) trackConfig() { "post_priority": *cfg.ServiceSettings.PostPriority, "self_hosted_purchase": *cfg.ServiceSettings.SelfHostedPurchase, "allow_synced_drafts": *cfg.ServiceSettings.AllowSyncedDrafts, - "self_hosted_expansion": *cfg.ServiceSettings.SelfHostedExpansion, }) ts.SendTelemetry(TrackConfigTeam, map[string]any{ 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/api.yaml b/server/playbooks/server/api/api.yaml index 7541ae930d..538c03ca79 100644 --- a/server/playbooks/server/api/api.yaml +++ b/server/playbooks/server/api/api.yaml @@ -1249,7 +1249,7 @@ paths: 500: $ref: "#/components/responses/500" - /runs/{id}/timeline/{event-id}/: + /runs/{id}/timeline/{event_id}/: delete: summary: Remove a timeline event from the playbook run operationId: removeTimelineEvent @@ -1265,7 +1265,7 @@ paths: example: zjy2q2iy2jafl0lo2oddos5xn7 schema: type: string - - name: event-id + - name: event_id in: path required: true description: ID of the timeline event to be deleted @@ -1405,6 +1405,10 @@ paths: type: boolean description: A boolean indicating whether the playbook runs created from this playbook should be public or private. example: true + public: + type: boolean + description: A boolean indicating whether the playbook is licensed as public or private. Required 'true' for free tier. + example: true checklists: type: array description: The stages defined by this playbook. 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 a084188c62..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/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 { 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 6093048d54..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/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 { 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 diff --git a/webapp/.npmrc b/webapp/.npmrc index 7f56c3b1a7..1b78f1c6f2 100644 --- a/webapp/.npmrc +++ b/webapp/.npmrc @@ -1,3 +1,2 @@ save-exact=true legacy-peer-deps=true -global-style=true diff --git a/webapp/README.md b/webapp/README.md new file mode 100644 index 0000000000..dfb7d47a09 --- /dev/null +++ b/webapp/README.md @@ -0,0 +1,28 @@ +# Mattermost Web App + +This folder contains the client code for the Mattermost web app. It's broken up into multiple packages each of which either contains an area of the app (such as `playbooks` or `boards`) or shared logic used across other packages (such as the packages located in the `platform` directory). For anyone who's used to working in [the mattermost/mattermost-webapp repo](https://github.com/mattermost/mattermost-webapp), most of that is now located in `channels`. + +## npm Workspaces + +To interact with a workspace using npm, such as to add a dependency or run a script, use the `--workspace` (or `--workspaces`) flag. This can be done when using built-in npm commands such as `npm add` or when running scripts. Those commands should be run from this directory. + +```sh +# Add a dependency to a single package +npm add react --workspace=boards + +# Build multiple packages +npm run build --workspace=packages/client --workspace=packages/components + +# Test all workspaces +npm test --workspaces + +# Clean all workspaces that have a clean script defined +npm run clean --workspaces --if-present +``` + +To install dependencies for a workspace, simply run `npm install` from this folder as you would do normally. Most packages' dependencies will be included in the root `node_modules`, and all packages' dependencies will appear in the `package-lock.json`. A `node_modules` will only be created inside a package if one of its dependencies conflicts with that of another package. + +## Useful Links + +- [Developer setup](https://developers.mattermost.com/contribute/developer-setup/), now included with the Mattermost server developer setup +- [Web app developer documentation](https://developers.mattermost.com/contribute/more-info/webapp/) \ No newline at end of file diff --git a/webapp/boards/.eslintrc.json b/webapp/boards/.eslintrc.json index 38051b75e8..f31eeaf6c1 100644 --- a/webapp/boards/.eslintrc.json +++ b/webapp/boards/.eslintrc.json @@ -91,9 +91,6 @@ "error", { "allowSameFolder": true, "rootDir": "webapp/boards"} ], - /* "no-restricted-imports": ["error", { - "patterns": ["..*"] - }], */ "import-newlines/enforce": [ 2, 3 @@ -101,7 +98,8 @@ "object-curly-spacing": [ 2, "never" - ] + ], + "formatjs/no-multiple-whitespaces": 2 }, "overrides": [ { diff --git a/webapp/boards/NOTICE.txt b/webapp/boards/NOTICE.txt index 1fe6975ff0..acebeb67ec 100644 --- a/webapp/boards/NOTICE.txt +++ b/webapp/boards/NOTICE.txt @@ -2982,32 +2982,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----- -The following software may be included in this product: mini-create-react-context. A copy of the source code may be downloaded from https://github.com/StringEpsilon/mini-create-react-context. This software contains the following license and notice below: - -Copyright (c) 2019-present StringEpsilon - -Copyright (c) 2017-2019 James Kyle - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ------ - The following software may be included in this product: mkdirp. A copy of the source code may be downloaded from https://github.com/substack/node-mkdirp.git. This software contains the following license and notice below: Copyright 2010 James Halliday (mail@substack.net) diff --git a/webapp/boards/i18n/en.json b/webapp/boards/i18n/en.json index a913658a73..2fe9b2c5fa 100644 --- a/webapp/boards/i18n/en.json +++ b/webapp/boards/i18n/en.json @@ -453,4 +453,4 @@ "tutorial_tip.ok": "Next", "tutorial_tip.out": "Opt out of these tips.", "tutorial_tip.seen": "Seen this before?" -} \ No newline at end of file +} diff --git a/webapp/boards/i18n/fa.json b/webapp/boards/i18n/fa.json index d49f74c6b2..c875c9456a 100644 --- a/webapp/boards/i18n/fa.json +++ b/webapp/boards/i18n/fa.json @@ -1,5 +1,5 @@ { - "AppBar.Tooltip": "تغییر وضعیت تخته‌های مرتبط", + "AppBar.Tooltip": "تغییر وضعیت تابلوهای مرتبط", "Attachment.Attachment-title": "ضمیمه", "AttachmentBlock.DeleteAction": "حذف", "AttachmentBlock.addElement": "افزودن {type}", diff --git a/webapp/boards/i18n/fr.json b/webapp/boards/i18n/fr.json index ad55293a0d..a94f4529f5 100644 --- a/webapp/boards/i18n/fr.json +++ b/webapp/boards/i18n/fr.json @@ -1,5 +1,14 @@ { + "AdminBadge.SystemAdmin": "Administrateur", + "AdminBadge.TeamAdmin": "Administrateur d'équipe", "AppBar.Tooltip": "Activer les panneaux liés", + "Attachment.Attachment-title": "Pièce jointe", + "AttachmentBlock.DeleteAction": "supprimer", + "AttachmentBlock.addElement": "ajouter {type}", + "AttachmentBlock.delete": "Pièce jointe supprimée.", + "AttachmentBlock.failed": "Impossible de télécharger le fichier. Limite de taille de fichier atteinte.", + "AttachmentElement.delete-confirmation-dialog-button-text": "Supprimer", + "AttachmentElement.download": "Télécharger", "BoardComponent.add-a-group": "+ Ajouter un groupe", "BoardComponent.delete": "Supprimer", "BoardComponent.hidden-columns": "Colonnes cachées", @@ -71,6 +80,7 @@ "CardBadges.title-checkboxes": "Cases à cocher", "CardBadges.title-comments": "Commentaires", "CardBadges.title-description": "Cette carte a une description", + "CardDetail.Attach": "Joindre", "CardDetail.Follow": "Suivre", "CardDetail.Following": "Suivi", "CardDetail.add-content": "Ajouter du contenu", @@ -92,6 +102,7 @@ "CardDetailProperty.property-deleted": "{propertyName} supprimé avec succès !", "CardDetailProperty.property-name-change-subtext": "de \"{oldPropType}\" à \"{newPropType}\"", "CardDetial.limited-link": "En savoir plus sur nos offres.", + "CardDialog.delete-confirmation-dialog-attachment": "Confirmer la suppression de la pièce jointe", "CardDialog.delete-confirmation-dialog-button-text": "Supprimer", "CardDialog.delete-confirmation-dialog-heading": "Confirmer la suppression de la carte !", "CardDialog.editing-template": "Vous éditez un modèle.", @@ -102,9 +113,12 @@ "Categories.CreateCategoryDialog.UpdateText": "Mettre à jour", "CenterPanel.Login": "Connexion", "CenterPanel.Share": "Partager", + "ChannelIntro.CreateBoard": "Créer un tableau", "ColorOption.selectColor": "Choisir la couleur {color}", "Comment.delete": "Supprimer", "CommentsList.send": "Envoyer", + "ConfirmPerson.empty": "Vide", + "ConfirmPerson.search": "Recherche en cours…", "ConfirmationDialog.cancel-action": "Annuler", "ConfirmationDialog.confirm-action": "Confirmer", "ContentBlock.Delete": "Supprimer", @@ -118,9 +132,11 @@ "ContentBlock.editText": "Éditer le texte...", "ContentBlock.image": "image", "ContentBlock.insertAbove": "Insérer au-dessus", + "ContentBlock.moveBlock": "Déplacer le contenu de la carte", "ContentBlock.moveDown": "Déplacer vers le bas", "ContentBlock.moveUp": "Déplacer vers le haut", "ContentBlock.text": "texte", + "DateFilter.empty": "Vide", "DateRange.clear": "Supprimer", "DateRange.empty": "Vide", "DateRange.endDate": "Date de fin", @@ -139,10 +155,14 @@ "Filter.ends-with": "se termine par", "Filter.includes": "inclus", "Filter.is": "est", + "Filter.is-after": "est après", + "Filter.is-before": "est avant", "Filter.is-empty": "est vide", "Filter.is-not-empty": "n'est pas vide", "Filter.is-not-set": "n'est pas renseigné", "Filter.is-set": "est renseigné", + "Filter.isafter": "est après", + "Filter.isbefore": "est avant", "Filter.not-contains": "ne contient pas", "Filter.not-ends-with": "ne se termine pas par", "Filter.not-includes": "n'inclut pas", @@ -151,6 +171,7 @@ "FilterByText.placeholder": "filtre de texte", "FilterComponent.add-filter": "+ Ajouter un filtre", "FilterComponent.delete": "Supprimer", + "FilterValue.empty": "(vide)", "FindBoardsDialog.IntroText": "Rechercher des tableaux", "FindBoardsDialog.NoResultsFor": "Pas de résultats pour \"{searchQuery}\"", "FindBoardsDialog.NoResultsSubtext": "Vérifiez l'orthographe ou essayez une autre recherche.", @@ -161,6 +182,7 @@ "GroupBy.ungroup": "Dégrouper", "HideBoard.MenuOption": "Cacher le tableau", "KanbanCard.untitled": "Sans titre", + "MentionSuggestion.is-not-board-member": "(non membre du tableau)", "Mutator.new-board-from-template": "nouveau tableau à partir du modèle", "Mutator.new-card-from-template": "nouvelle carte depuis un modèle", "Mutator.new-template-from-card": "nouveau modèle depuis une carte", @@ -178,6 +200,9 @@ "OnboardingTour.OpenACard.Title": "Ouvrir une carte", "OnboardingTour.ShareBoard.Body": "Vous pouvez partager votre tableau en interne, au sein de votre équipe ou le publier publiquement pour une visibilité en dehors de votre organisation.", "OnboardingTour.ShareBoard.Title": "Partager un tableau", + "PersonProperty.board-members": "Membres du tableau", + "PersonProperty.me": "Moi", + "PersonProperty.non-board-members": "Non membres du tableau", "PropertyMenu.Delete": "Supprimer", "PropertyMenu.changeType": "Changer le type de la propriété", "PropertyMenu.selectType": "Sélectionner le type de propriété", @@ -187,6 +212,7 @@ "PropertyType.CreatedTime": "Date de création", "PropertyType.Date": "Date", "PropertyType.Email": "Adresse e-mail", + "PropertyType.MultiPerson": "Personne multiple", "PropertyType.MultiSelect": "Sélection multiple", "PropertyType.Number": "Nombre", "PropertyType.Person": "Personne", @@ -230,6 +256,8 @@ "Sidebar.import-archive": "Importer une archive", "Sidebar.invite-users": "Inviter des utilisateurs", "Sidebar.logout": "Se déconnecter", + "Sidebar.new-category.badge": "Nouveau", + "Sidebar.new-category.drag-boards-cta": "Déplacer les tableaux ici...", "Sidebar.no-boards-in-category": "Aucun tableaux", "Sidebar.product-tour": "Visite guidée", "Sidebar.random-icons": "Icônes aléatoires", @@ -252,6 +280,8 @@ "SidebarTour.SidebarCategories.Body": "Tous vos tableaux sont maintenant organisés sous votre nouvelle barre latérale. Plus besoin de basculer entre les espaces de travail. Des catégories personnalisées uniques basées sur vos espaces de travail précédents peuvent avoir été automatiquement créées pour vous dans le cadre de la mise à jour 7.2. Ceux-ci peuvent être supprimés ou modifiés selon vos préférences.", "SidebarTour.SidebarCategories.Link": "En savoir plus", "SidebarTour.SidebarCategories.Title": "Catégories de la barre latérale", + "SiteStats.total_boards": "Total des tableaux", + "SiteStats.total_cards": "Total des cartes", "TableComponent.add-icon": "Ajouter une icône", "TableComponent.name": "Nom", "TableComponent.plus-new": "+ Nouveau", @@ -262,6 +292,8 @@ "TableHeaderMenu.insert-right": "Insérer à droite", "TableHeaderMenu.sort-ascending": "Tri ascendant", "TableHeaderMenu.sort-descending": "Tri descendant", + "TableRow.DuplicateCard": "Dupliquer une carte", + "TableRow.MoreOption": "Plus d'actions", "TableRow.open": "Ouvrir", "TopBar.give-feedback": "Donner un avis", "URLProperty.copiedLink": "Copié !", @@ -277,6 +309,7 @@ "ValueSelector.valueSelector": "Sélecteur de value", "ValueSelectorLabel.openMenu": "Ouvrir le menu", "VersionMessage.help": "Découvrez les nouveautés de cette version.", + "VersionMessage.learn-more": "En savoir plus", "View.AddView": "Ajouter une vue", "View.Board": "Tableau", "View.DeleteView": "Supprimer la vue", @@ -331,6 +364,9 @@ "WelcomePage.StartUsingIt.Text": "Commencez à l'utiliser", "Workspace.editing-board-template": "Vous éditez un modèle de tableau.", "badge.guest": "Invité", + "boardPage.confirm-join-button": "Rejoindre", + "boardPage.confirm-join-text": "Vous êtes sur le point de rejoindre un forum privé sans avoir été explicitement ajouté par l'administrateur du forum. Êtes-vous sûr de vouloir rejoindre ce forum privé ?", + "boardPage.confirm-join-title": "Rejoindre un tableau privé", "boardSelector.confirm-link-board": "Lier la carte au canal", "boardSelector.confirm-link-board-button": "Oui, lier ce tableau", "boardSelector.confirm-link-board-subtext": "Lorsque vous liez \"{boardName}\" au canal, tous les membres du canal (existants et nouveaux) pourront le modifier. Vous pouvez dissocier un tableau d'un canal à tout moment.", @@ -343,6 +379,8 @@ "calendar.month": "Mois", "calendar.today": "AUJOURD'HUI", "calendar.week": "Semaine", + "centerPanel.undefined": "Pas de {propertyName}", + "centerPanel.unknown-user": "Utilisateur inconnu", "cloudMessage.learn-more": "En savoir plus", "createImageBlock.failed": "Impossible de télécharger le fichier. Limite de taille de fichier atteinte.", "default-properties.badges": "Commentaires et description", @@ -364,6 +402,10 @@ "login.log-in-button": "Connexion", "login.log-in-title": "Connexion", "login.register-button": "ou créez un compte si vous n'en avez pas", + "new_channel_modal.create_board.empty_board_description": "Créer un nouveau tableau vide", + "new_channel_modal.create_board.empty_board_title": "Tableau vide", + "new_channel_modal.create_board.select_template_placeholder": "Sélectionner un modèle", + "new_channel_modal.create_board.title": "Créer un tableau pour ce canal", "notification-box-card-limit-reached.close-tooltip": "Oublier pendant 10 jours", "notification-box-card-limit-reached.contact-link": "informez votre administrateur", "notification-box-card-limit-reached.link": "Passer à une offre payante", diff --git a/webapp/boards/i18n/ja.json b/webapp/boards/i18n/ja.json index a4eae6f694..9d5b6fc20e 100644 --- a/webapp/boards/i18n/ja.json +++ b/webapp/boards/i18n/ja.json @@ -1,5 +1,7 @@ { - "AppBar.Tooltip": "リンク先Boardの切替え", + "AdminBadge.SystemAdmin": "管理者", + "AdminBadge.TeamAdmin": "チーム管理者", + "AppBar.Tooltip": "リンク先Boardsの切替え", "Attachment.Attachment-title": "添付する", "AttachmentBlock.DeleteAction": "削除", "AttachmentBlock.addElement": "{type} を追加", @@ -137,6 +139,7 @@ "ContentBlock.moveDown": "下へ移動する", "ContentBlock.moveUp": "上へ移動する", "ContentBlock.text": "テキスト", + "DateFilter.empty": "空", "DateRange.clear": "クリア", "DateRange.empty": "空", "DateRange.endDate": "終了日", @@ -155,10 +158,14 @@ "Filter.ends-with": "で終わる", "Filter.includes": "を含む", "Filter.is": "と一致する", + "Filter.is-after": "が次の日付以降", + "Filter.is-before": "が次の日付以前", "Filter.is-empty": "が空である", "Filter.is-not-empty": "が空でない", "Filter.is-not-set": "が未設定", "Filter.is-set": "が設定済み", + "Filter.isafter": "が次の日付以降", + "Filter.isbefore": "が次の日付以前", "Filter.not-contains": "を含まない", "Filter.not-ends-with": "で終わらない", "Filter.not-includes": "を含まない", @@ -305,6 +312,7 @@ "ValueSelector.valueSelector": "値選択", "ValueSelectorLabel.openMenu": "メニューを開く", "VersionMessage.help": "このバージョンの新機能を確認する。", + "VersionMessage.learn-more": "詳しく", "View.AddView": "ビューを追加", "View.Board": "Board", "View.DeleteView": "ビューを削除", @@ -359,6 +367,9 @@ "WelcomePage.StartUsingIt.Text": "利用を開始する", "Workspace.editing-board-template": "Boardのテンプレートを編集しています。", "badge.guest": "ゲスト", + "boardPage.confirm-join-button": "参加", + "boardPage.confirm-join-text": "あなたは、ボード管理者によって明示的に追加されることなく、非公開のボードに参加しようとしています。本当にこの非公開ボードに参加しますか?", + "boardPage.confirm-join-title": "非公開ボードに参加", "boardSelector.confirm-link-board": "Boardをチャンネルへリンク", "boardSelector.confirm-link-board-button": "はい、Boardをリンクします", "boardSelector.confirm-link-board-subtext": "\"{boardName}\" をチャンネルにリンクすると、チャンネルの(既存/新規)メンバー全員がBoardを編集できるようになります。ただし、ゲストユーザーは除外されます。Boardとチャンネルのリンク解除はいつでも可能です。", diff --git a/webapp/boards/i18n/ka.json b/webapp/boards/i18n/ka.json index 5623cbd56e..9d3b5d3553 100644 --- a/webapp/boards/i18n/ka.json +++ b/webapp/boards/i18n/ka.json @@ -5,7 +5,7 @@ "BoardComponent.hidden-columns": "დამალული სვეტები", "BoardComponent.hide": "დამალვა", "BoardComponent.new": "+ ახალი", - "BoardComponent.no-property": "არ არის {Property}", + "BoardComponent.no-property": "არ არის {property}", "BoardComponent.no-property-title": "ცარიელი {property} საკუთრების მქონე ელემენტები აქ წავა. ამ სვეტის წაშლა შეუძლებელია.", "BoardComponent.show": "ჩვენება", "BoardMember.schemeAdmin": "ადმინისტრატორი", diff --git a/webapp/boards/i18n/lt.json b/webapp/boards/i18n/lt.json index 0967ef424b..27c6f80214 100644 --- a/webapp/boards/i18n/lt.json +++ b/webapp/boards/i18n/lt.json @@ -1 +1,456 @@ -{} +{ + "AdminBadge.SystemAdmin": "Administratorius", + "AdminBadge.TeamAdmin": "Komandos administratorius", + "AppBar.Tooltip": "Perjungti susietas lentas", + "Attachment.Attachment-title": "Priedas", + "AttachmentBlock.DeleteAction": "Ištrinti", + "AttachmentBlock.addElement": "pridėti {type}", + "AttachmentBlock.delete": "Priedas ištrintas.", + "AttachmentBlock.failed": "Šio failo nepavyko įkelti, nes pasiektas failo dydžio limitas.", + "AttachmentBlock.upload": "Priedo įkėlimas.", + "AttachmentBlock.uploadSuccess": "Priedas įkeltas.", + "AttachmentElement.delete-confirmation-dialog-button-text": "Ištrinti", + "AttachmentElement.download": "Parsisiųsti", + "AttachmentElement.upload-percentage": "Įkeliama...({uploadPercent}%)", + "BoardComponent.add-a-group": "+ Pridėti grupę", + "BoardComponent.delete": "Ištrinti", + "BoardComponent.hidden-columns": "Paslėpti stulpeliai", + "BoardComponent.hide": "Slėpti", + "BoardComponent.new": "+ Naujas", + "BoardComponent.no-property": "Nėra {property}", + "BoardComponent.no-property-title": "Elementai su tuščia nuosavybe {property} pateks čia. Šio stulpelio pašalinti negalima.", + "BoardComponent.show": "Rodyti", + "BoardMember.schemeAdmin": "Administratorius", + "BoardMember.schemeCommenter": "Komentuotojas", + "BoardMember.schemeEditor": "Redaktorius", + "BoardMember.schemeNone": "Joks", + "BoardMember.schemeViewer": "Žiūriklis", + "BoardMember.unlinkChannel": "Atsieti", + "BoardPage.newVersion": "Yra nauja Boards versija. Spustelėkite čia, kad įkeltumėte iš naujo.", + "BoardPage.syncFailed": "Lenta gali būti ištrinta arba jos prieiga gali būti atšaukta.", + "BoardTemplateSelector.add-template": "Sukurti naują šabloną", + "BoardTemplateSelector.create-empty-board": "Sukurti tuščią lentą", + "BoardTemplateSelector.delete-template": "Ištrinti", + "BoardTemplateSelector.description": "Pridėkite lentą prie šoninės juostos naudodami bet kurį iš toliau nurodytų šablonų arba pradėkite nuo nulio.", + "BoardTemplateSelector.edit-template": "Redaguoti", + "BoardTemplateSelector.plugin.no-content-description": "Pridėkite lentą prie šoninės juostos naudodami bet kurį iš toliau nurodytų šablonų arba pradėkite nuo nulio.", + "BoardTemplateSelector.plugin.no-content-title": "Sukurti lentą", + "BoardTemplateSelector.title": "Sukurti lentą", + "BoardTemplateSelector.use-this-template": "Naudoti šį šabloną", + "BoardsSwitcher.Title": "Rasti lentas", + "BoardsUnfurl.Limited": "Papildoma informacija yra paslėpta, nes kortelė yra archyvuojama", + "BoardsUnfurl.Remainder": "+{remainder} dar", + "BoardsUnfurl.Updated": "Atnaujinta {time}", + "Calculations.Options.average.displayName": "Vidutinis", + "Calculations.Options.average.label": "Vidutinis", + "Calculations.Options.count.displayName": "Skaičius", + "Calculations.Options.count.label": "Skaičius", + "Calculations.Options.countChecked.displayName": "Pažymėta", + "Calculations.Options.countChecked.label": "Skaičius patikrintas", + "Calculations.Options.countUnchecked.displayName": "Nepažymėta", + "Calculations.Options.countUnchecked.label": "Skaičiaus žymėjimas panaikintas", + "Calculations.Options.countUniqueValue.displayName": "Unikalus", + "Calculations.Options.countUniqueValue.label": "Suskaičiuoti unikalias reikšmes", + "Calculations.Options.countValue.displayName": "Reikšmės", + "Calculations.Options.countValue.label": "Skaičius", + "Calculations.Options.dateRange.displayName": "Diapazonas", + "Calculations.Options.dateRange.label": "Diapazonas", + "Calculations.Options.earliest.displayName": "Anksčiausiai", + "Calculations.Options.earliest.label": "Anksčiausiai", + "Calculations.Options.latest.displayName": "Naujausias", + "Calculations.Options.latest.label": "Naujausias", + "Calculations.Options.max.displayName": "Maks.", + "Calculations.Options.max.label": "Maks.", + "Calculations.Options.median.displayName": "Mediana", + "Calculations.Options.median.label": "Mediana", + "Calculations.Options.min.displayName": "Min.", + "Calculations.Options.min.label": "Min.", + "Calculations.Options.none.displayName": "Apskaičiuoti", + "Calculations.Options.none.label": "Joks", + "Calculations.Options.percentChecked.displayName": "Pažymėta", + "Calculations.Options.percentChecked.label": "Patikrinta procentais", + "Calculations.Options.percentUnchecked.displayName": "Nepažymėta", + "Calculations.Options.percentUnchecked.label": "Nepažymėtas procentas", + "Calculations.Options.range.displayName": "Diapazonas", + "Calculations.Options.range.label": "Diapazonas", + "Calculations.Options.sum.displayName": "Iš viso", + "Calculations.Options.sum.label": "Iš viso", + "CalendarCard.untitled": "Be pavadinimo", + "CardActionsMenu.copiedLink": "Nukopijuota!", + "CardActionsMenu.copyLink": "Kopijuoti nuorodą", + "CardActionsMenu.delete": "Ištrinti", + "CardActionsMenu.duplicate": "Pasikartojantis", + "CardBadges.title-checkboxes": "Žymimieji langeliai", + "CardBadges.title-comments": "Komentarai", + "CardBadges.title-description": "Ši kortelė turi aprašymą", + "CardDetail.Attach": "Prisegti", + "CardDetail.Follow": "Sekti", + "CardDetail.Following": "Sekama", + "CardDetail.add-content": "Pridėti turinį", + "CardDetail.add-icon": "Pridėti piktogramą", + "CardDetail.add-property": "+ Pridėti savybę", + "CardDetail.addCardText": "pridėti kortelės tekstą", + "CardDetail.limited-body": "Naujovinkite į mūsų Professional arba Enterprise planą.", + "CardDetail.limited-button": "Patobulinti", + "CardDetail.limited-title": "Ši kortelė paslėpta", + "CardDetail.moveContent": "Perkelti kortelės turinį", + "CardDetail.new-comment-placeholder": "Pridėti komentarą...", + "CardDetailProperty.confirm-delete-heading": "Patvirtinkite nuosavybės ištrynimą", + "CardDetailProperty.confirm-delete-subtext": "Ar tikrai norite ištrinti savybę „{propertyName}“? Ją ištrynus, savybė bus ištrinta iš visų šios lentos kortelių.", + "CardDetailProperty.confirm-property-name-change-subtext": "Ar tikrai norite pakeisti savybę „{propertyName}“ {customText}? Tai turės įtakos {numOfCards} kortelės reikšmei (-ėms) šioje lentoje ir duomenys gali būti prarasti.", + "CardDetailProperty.confirm-property-type-change": "Patvirtinkite nuosavybės tipo pakeitimą", + "CardDetailProperty.delete-action-button": "Ištrinti", + "CardDetailProperty.property-change-action-button": "Keisti savybę", + "CardDetailProperty.property-changed": "Savybė sėkmingai pakeista!", + "CardDetailProperty.property-deleted": "{propertyName} sėkmingai ištrinta!", + "CardDetailProperty.property-name-change-subtext": "įveskite iš „{oldPropType}“ į „{newPropType}“", + "CardDetial.limited-link": "Sužinokite daugiau apie mūsų planus.", + "CardDialog.delete-confirmation-dialog-attachment": "Patvirtinkite priedo ištrynimą", + "CardDialog.delete-confirmation-dialog-button-text": "Ištrinti", + "CardDialog.delete-confirmation-dialog-heading": "Patvirtinkite kortelės ištrynimą", + "CardDialog.editing-template": "Jūs redaguojate šabloną.", + "CardDialog.nocard": "Šios kortelės nėra arba ji nepasiekiama.", + "Categories.CreateCategoryDialog.CancelText": "Atšaukti", + "Categories.CreateCategoryDialog.CreateText": "Sukurti", + "Categories.CreateCategoryDialog.Placeholder": "Pavadinkite savo kategoriją", + "Categories.CreateCategoryDialog.UpdateText": "Atnaujinti", + "CenterPanel.Login": "Prisijungti", + "CenterPanel.Share": "Bendrinti", + "ChannelIntro.CreateBoard": "Sukurti lentą", + "ColorOption.selectColor": "Pasirinkti {color} spalvą", + "Comment.delete": "Ištrinti", + "CommentsList.send": "Siųsti", + "ConfirmPerson.empty": "Tuščias", + "ConfirmPerson.search": "Ieškoti...", + "ConfirmationDialog.cancel-action": "Atšaukti", + "ConfirmationDialog.confirm-action": "Patvirtinti", + "ContentBlock.Delete": "Ištrinti", + "ContentBlock.DeleteAction": "Ištrinti", + "ContentBlock.addElement": "pridėti {type}", + "ContentBlock.checkbox": "žymimasis langelis", + "ContentBlock.divider": "skirtukas", + "ContentBlock.editCardCheckbox": "perjungtas žymimasis laukelis", + "ContentBlock.editCardCheckboxText": "redaguoti kortelės tekstą", + "ContentBlock.editCardText": "redaguoti kortelės tekstą", + "ContentBlock.editText": "Keisti tekstą...", + "ContentBlock.image": "Paveikslėlis", + "ContentBlock.insertAbove": "Įdėti aukščiau", + "ContentBlock.moveBlock": "perkelti kortelės turinį", + "ContentBlock.moveDown": "Perkelti žemyn", + "ContentBlock.moveUp": "Perkelti aukštyn", + "ContentBlock.text": "tekstas", + "DateFilter.empty": "Tuščias", + "DateRange.clear": "Išvalyti", + "DateRange.empty": "Tuščias", + "DateRange.endDate": "Pabaigos data", + "DateRange.today": "Šiandien", + "DeleteBoardDialog.confirm-cancel": "Atšaukti", + "DeleteBoardDialog.confirm-delete": "Ištrinti", + "DeleteBoardDialog.confirm-info": "Ar tikrai norite ištrinti lentą „{boardTitle}“? Ją ištrynus, bus ištrintos visos lentos kortelės.", + "DeleteBoardDialog.confirm-info-template": "Ar tikrai norite ištrinti lentos šabloną „{boardTitle}“?", + "DeleteBoardDialog.confirm-tite": "Patvirtinkite lentos ištrynimą", + "DeleteBoardDialog.confirm-tite-template": "Patvirtinkite lentos šablono ištrynimą", + "Dialog.closeDialog": "Uždaryti dialogo langą", + "EditableDayPicker.today": "Šiandien", + "Error.mobileweb": "Mobiliojo žiniatinklio palaikymas šiuo metu yra ankstyvoje beta versijoje. Gali būti ne visos funkcijos.", + "Error.websocket-closed": "Interneto lizdo ryšys uždarytas, ryšys nutrauktas. Jei tai išlieka, patikrinkite savo serverio arba žiniatinklio tarpinio serverio konfigūraciją.", + "Filter.contains": "turi", + "Filter.ends-with": "baigiasi", + "Filter.includes": "apima", + "Filter.is": "yra", + "Filter.is-after": "yra po", + "Filter.is-before": "yra prieš", + "Filter.is-empty": "yra tuščias", + "Filter.is-not-empty": "nėra tuščias", + "Filter.is-not-set": "nėra nustatytas", + "Filter.is-set": "yra nustatytas", + "Filter.isafter": "yra po", + "Filter.isbefore": "yra prieš", + "Filter.not-contains": "nėra", + "Filter.not-ends-with": "nesibaigia", + "Filter.not-includes": "neapima", + "Filter.not-starts-with": "neprasideda", + "Filter.starts-with": "prasideda", + "FilterByText.placeholder": "filtruoti tekstą", + "FilterComponent.add-filter": "+ Pridėti filtrą", + "FilterComponent.delete": "Ištrinti", + "FilterValue.empty": "(tuščia)", + "FindBoardsDialog.IntroText": "Ieškoti lentų", + "FindBoardsDialog.NoResultsFor": "Nėra rezultatų pagal „{searchQuery}“", + "FindBoardsDialog.NoResultsSubtext": "Patikrinkite rašybą arba pabandykite atlikti kitą paiešką.", + "FindBoardsDialog.SubTitle": "Įveskite, kad rastumėte lentą. Norėdami naršyti, naudokite AUKŠTYN / ŽEMYN. ENTER , kad pasirinktumėte, ESC , kad atsisakytumėte", + "FindBoardsDialog.Title": "Raskite lentas", + "GroupBy.hideEmptyGroups": "Slėpti {count} tuščias grupes", + "GroupBy.showHiddenGroups": "Rodyti paslėptas grupes: {count}", + "GroupBy.ungroup": "Išgrupuoti", + "HideBoard.MenuOption": "Paslėpti lentą", + "KanbanCard.untitled": "Be pavadinimo", + "MentionSuggestion.is-not-board-member": "(ne lentos narys)", + "Mutator.new-board-from-template": "nauja lenta pagal šabloną", + "Mutator.new-card-from-template": "nauja kortelė pagal šabloną", + "Mutator.new-template-from-card": "naujas šablonas pagal kortelę", + "OnboardingTour.AddComments.Body": "Galite komentuoti problemas ir net @paminėti kitus Mattermost naudotojus, kad atkreiptumėte jų dėmesį.", + "OnboardingTour.AddComments.Title": "Pridėti komentarų", + "OnboardingTour.AddDescription.Body": "Pridėkite aprašymą prie savo kortelės, kad komandos draugai žinotų, kam ji skirta.", + "OnboardingTour.AddDescription.Title": "Pridėti aprašymą", + "OnboardingTour.AddProperties.Body": "Pridėkite prie kortelių įvairių savybių, kad jos būtų dar galingesnės.", + "OnboardingTour.AddProperties.Title": "Pridėti savybių", + "OnboardingTour.AddView.Body": "Eikite čia, kad sukurtumėte naują rodinį ir galėtumėte tvarkyti lentą naudodami skirtingus išdėstymus.", + "OnboardingTour.AddView.Title": "Pridėti naują rodinį", + "OnboardingTour.CopyLink.Body": "Galite bendrinti savo korteles su komandos draugais nukopijuodami nuorodą ir įklijuodami ją į kanalą, tiesioginį pranešimą ar grupės pranešimą.", + "OnboardingTour.CopyLink.Title": "Kopijuoti nuorodą", + "OnboardingTour.OpenACard.Body": "Atidarykite kortelę, kad sužinotumėte, kokiais galingais būdais Boards gali padėti organizuoti darbą.", + "OnboardingTour.OpenACard.Title": "Atidaryti kortelę", + "OnboardingTour.ShareBoard.Body": "Galite bendrinti lentą viduje, savo komandoje arba paskelbti ją viešai, kad būtų matoma už organizacijos ribų.", + "OnboardingTour.ShareBoard.Title": "Bendrinti lentą", + "PersonProperty.board-members": "Lentos nariai", + "PersonProperty.me": "aš", + "PersonProperty.non-board-members": "Ne lentos nariai", + "PropertyMenu.Delete": "Ištrinti", + "PropertyMenu.changeType": "Pakeisti savybės tipą", + "PropertyMenu.selectType": "Pasirinkti savybės tipą", + "PropertyMenu.typeTitle": "Tipas", + "PropertyType.Checkbox": "Žymimasis langelis", + "PropertyType.CreatedBy": "Sukurta", + "PropertyType.CreatedTime": "Sukūrimo laikas", + "PropertyType.Date": "Data", + "PropertyType.Email": "El. paštas", + "PropertyType.MultiPerson": "Daugelio žmonių", + "PropertyType.MultiSelect": "Keletas pasirinkimų", + "PropertyType.Number": "Skaičius", + "PropertyType.Person": "Asmuo", + "PropertyType.Phone": "Telefonas", + "PropertyType.Select": "Pasirinkite", + "PropertyType.Text": "Tekstas", + "PropertyType.Unknown": "Nežinoma", + "PropertyType.UpdatedBy": "Paskutinį kartą atnaujino", + "PropertyType.UpdatedTime": "Paskutinio atnaujinimo laikas", + "PropertyType.Url": "URL", + "PropertyValueElement.empty": "Tuščias", + "RegistrationLink.confirmRegenerateToken": "Tai panaikins anksčiau bendrintas nuorodas. Tęsti?", + "RegistrationLink.copiedLink": "Nukopijuota!", + "RegistrationLink.copyLink": "Kopijuoti nuorodą", + "RegistrationLink.description": "Pasidalykite šia nuoroda, kad kiti galėtų susikurti paskyras:", + "RegistrationLink.regenerateToken": "Atkurti prieigos raktą", + "RegistrationLink.tokenRegenerated": "Registracijos nuoroda sugeneruota iš naujo", + "ShareBoard.PublishDescription": "Paskelbti ir bendrinti tik skaitomą nuorodą su visais žiniatinklio naudotojais.", + "ShareBoard.PublishTitle": "Paskelbti žiniatinklyje", + "ShareBoard.ShareInternal": "Bendrinti viduje", + "ShareBoard.ShareInternalDescription": "Leidimus turintys naudotojai galės naudotis šia nuoroda.", + "ShareBoard.Title": "Bendrinti lentą", + "ShareBoard.confirmRegenerateToken": "Tai panaikins anksčiau bendrintas nuorodas. Tęsti?", + "ShareBoard.copiedLink": "Nukopijuota!", + "ShareBoard.copyLink": "Kopijuoti nuorodą", + "ShareBoard.regenerate": "Atkurti prieigos raktą", + "ShareBoard.searchPlaceholder": "Ieškoti žmonių ir kanalų", + "ShareBoard.teamPermissionsText": "Visi {teamName} komandos nariai", + "ShareBoard.tokenRegenrated": "Prieigos raktas atkurtas", + "ShareBoard.userPermissionsRemoveMemberText": "Pašalinti narį", + "ShareBoard.userPermissionsYouText": "(Jūs)", + "ShareTemplate.Title": "Bendrinti šabloną", + "ShareTemplate.searchPlaceholder": "Ieškoti žmonių", + "Sidebar.delete-board": "Ištrinti lentą", + "Sidebar.duplicate-board": "Pasikartojanti lenta", + "Sidebar.export-archive": "Eksportuoti archyvą", + "Sidebar.import": "Importuoti", + "Sidebar.import-archive": "Importuoti archyvą", + "Sidebar.new-category.badge": "Naujas", + "Sidebar.new-category.drag-boards-cta": "Vilkite lentas čia...", + "Sidebar.no-boards-in-category": "Viduje nėra lentų", + "Sidebar.product-tour": "Produkto apžvalga", + "Sidebar.random-icons": "Atsitiktinės piktogramos", + "Sidebar.set-language": "Nustatyti kalbą", + "Sidebar.set-theme": "Nustatyti temą", + "Sidebar.settings": "Nustatymai", + "Sidebar.template-from-board": "Naujas šablonas pagal lentą", + "Sidebar.untitled-board": "(Lenta be pavadinimo)", + "Sidebar.untitled-view": "(Rodinys be pavadinimo)", + "SidebarCategories.BlocksMenu.Move": "Perkelti į...", + "SidebarCategories.CategoryMenu.CreateNew": "Sukurti naują kategoriją", + "SidebarCategories.CategoryMenu.Delete": "Ištrinti kategoriją", + "SidebarCategories.CategoryMenu.DeleteModal.Body": "{categoryName} lentos bus perkeltos atgal į lentų kategorijas. Jūs nesate pašalintas iš jokių lentų.", + "SidebarCategories.CategoryMenu.DeleteModal.Title": "Ištrinti šią kategoriją?", + "SidebarCategories.CategoryMenu.Update": "Pervadinti kategoriją", + "SidebarTour.ManageCategories.Body": "Kurkite ir tvarkykite pasirinktines kategorijas. Kategorijos priklauso nuo naudotojo, todėl lentos perkėlimas į kategoriją neturės įtakos kitiems nariams, naudojantiems tą pačią lentą.", + "SidebarTour.ManageCategories.Title": "Tvarkyti kategorijas", + "SidebarTour.SearchForBoards.Body": "Atidarykite lentos perjungiklį (Cmd / Ctrl + K), kad galėtumėte greitai ieškoti ir pridėti lentų šoninėje juostoje.", + "SidebarTour.SearchForBoards.Title": "Ieškoti lentų", + "SidebarTour.SidebarCategories.Body": "Visos Jūsų lentos dabar sutvarkytos naujoje šoninėje juostoje. Nebereikia perjungti darbo erdvių. Vienkartinės pasirinktinės kategorijos, pagrįstos ankstesnėmis darbo sritimis, gali būti automatiškai sukurtos Jums atnaujinant į 7.2 versiją. Jas galima pašalinti arba redaguoti pagal savo pageidavimus.", + "SidebarTour.SidebarCategories.Link": "Sužinoti daugiau", + "SidebarTour.SidebarCategories.Title": "Šoninės juostos kategorijos", + "SiteStats.total_boards": "Iš viso lentų", + "SiteStats.total_cards": "Iš viso kortelių", + "TableComponent.add-icon": "Pridėti piktogramą", + "TableComponent.name": "Pavadinimas", + "TableComponent.plus-new": "+ Naujas", + "TableHeaderMenu.delete": "Ištrinti", + "TableHeaderMenu.duplicate": "Pasikartojantis", + "TableHeaderMenu.hide": "Slėpti", + "TableHeaderMenu.insert-left": "Įdėkite kairėje", + "TableHeaderMenu.insert-right": "Įdėkite dešinėje", + "TableHeaderMenu.sort-ascending": "Rūšiuoti didėjančia tvarka", + "TableHeaderMenu.sort-descending": "Rūšiuoti mažėjančia tvarka", + "TableRow.DuplicateCard": "kortelės dublikatas", + "TableRow.MoreOption": "Daugiau veiksmų", + "TableRow.open": "Atverti", + "TopBar.give-feedback": "Palikti atsiliepimą", + "URLProperty.copiedLink": "Nukopijuota!", + "URLProperty.copy": "Kopijuoti", + "URLProperty.edit": "Redaguoti", + "UndoRedoHotKeys.canRedo": "Grąžinti", + "UndoRedoHotKeys.canRedo-with-description": "Perdaryti {description}", + "UndoRedoHotKeys.canUndo": "Anuliuoti", + "UndoRedoHotKeys.canUndo-with-description": "Anuliuoti {description}", + "UndoRedoHotKeys.cannotRedo": "Nėra ką perdaryti", + "UndoRedoHotKeys.cannotUndo": "Nėra ką anuliuoti", + "ValueSelector.noOptions": "Jokių parinkčių. Pradėkite rašyti, kad pridėtumėte pirmąją!", + "ValueSelector.valueSelector": "Reikšmės parinkiklis", + "ValueSelectorLabel.openMenu": "Atidaryti meniu", + "VersionMessage.help": "Patikrinkite, kas naujo šioje versijoje.", + "VersionMessage.learn-more": "Sužinoti daugiau", + "View.AddView": "Pridėti rodinį", + "View.Board": "Lenta", + "View.DeleteView": "Ištrinti rodinį", + "View.DuplicateView": "Pasikartojantis rodinys", + "View.Gallery": "Galerija", + "View.NewBoardTitle": "Lentos rodinys", + "View.NewCalendarTitle": "Kalendoriaus rodinys", + "View.NewGalleryTitle": "Galerijos vaizdas", + "View.NewTableTitle": "Lentelės rodinys", + "View.NewTemplateDefaultTitle": "Šablonas be pavadinimo", + "View.NewTemplateTitle": "Be pavadinimo", + "View.Table": "Lentelė", + "ViewHeader.add-template": "Naujas šablonas", + "ViewHeader.delete-template": "Ištrinti", + "ViewHeader.display-by": "Pateikė: {property}", + "ViewHeader.edit-template": "Redaguoti", + "ViewHeader.empty-card": "Tuščia kortelė", + "ViewHeader.export-board-archive": "Eksportuoti lentos archyvą", + "ViewHeader.export-complete": "Eksportas baigtas!", + "ViewHeader.export-csv": "Eksportuoti į CSV", + "ViewHeader.export-failed": "Eksportuoti nepavyko!", + "ViewHeader.filter": "Filtras", + "ViewHeader.group-by": "Grupuoti pagal: {property}", + "ViewHeader.new": "Naujas", + "ViewHeader.properties": "Savybės", + "ViewHeader.properties-menu": "Savybių meniu", + "ViewHeader.search-text": "Ieškoti kortelių", + "ViewHeader.select-a-template": "Pasirinkti šabloną", + "ViewHeader.set-default-template": "Nustatyti kaip numatytąjį", + "ViewHeader.sort": "Rūšiuoti", + "ViewHeader.untitled": "Be pavadinimo", + "ViewHeader.view-header-menu": "Žiūrėti antraštės meniu", + "ViewHeader.view-menu": "Žiūrėti meniu", + "ViewLimitDialog.Heading": "Pasiektas peržiūrų skaičius vienoje lentoje", + "ViewLimitDialog.PrimaryButton.Title.Admin": "Patobulinti", + "ViewLimitDialog.PrimaryButton.Title.RegularUser": "Pranešti administratoriui", + "ViewLimitDialog.Subtext.Admin": "Naujovinkite į mūsų Professional arba Enterprise planą.", + "ViewLimitDialog.Subtext.Admin.PricingPageLink": "Sužinokite daugiau apie mūsų planus.", + "ViewLimitDialog.Subtext.RegularUser": "Praneškite savo administratoriui, kad jis naujovintų į mūsų Professional arba Enterprise planą.", + "ViewLimitDialog.UpgradeImg.AltText": "atnaujinti vaizdą", + "ViewLimitDialog.notifyAdmin.Success": "Jūsų administratoriui buvo pranešta", + "ViewTitle.hide-description": "slėpti aprašymą", + "ViewTitle.pick-icon": "Pasirinkti piktogramą", + "ViewTitle.random-icon": "Atsitiktinis", + "ViewTitle.remove-icon": "Pašalinti piktogramą", + "ViewTitle.show-description": "rodyti aprašymą", + "ViewTitle.untitled-board": "Lenta be pavadinimo", + "WelcomePage.Description": "„Boards“ yra projektų valdymo įrankis, padedantis apibrėžti, organizuoti, sekti ir valdyti darbą įvairiose komandose, naudojant pažįstamą Kanban lentos vaizdą.", + "WelcomePage.Explore.Button": "Apžiūrėti", + "WelcomePage.Heading": "Sveiki atvykę į Boards", + "WelcomePage.NoThanks.Text": "Ne, ačiū, išsiaiškinsiu pats", + "WelcomePage.StartUsingIt.Text": "Pradėkite jį naudoti", + "Workspace.editing-board-template": "Redaguojate lentos šabloną.", + "badge.guest": "Svečias", + "boardPage.confirm-join-button": "Prisijungti", + "boardPage.confirm-join-text": "Jūs ketinate prisijungti prie privačios lentos, tačiau lentos administratorius Jūsų nepridėjo. Ar tikrai norite prisijungti prie šios privačios lentos?", + "boardPage.confirm-join-title": "Prisijunti prie privačios lentos", + "boardSelector.confirm-link-board": "Susieti lentą su kanalu", + "boardSelector.confirm-link-board-button": "Taip, susieti lentą", + "boardSelector.confirm-link-board-subtext": "Kai susiesite „{boardName}“ su kanalu, visi kanalo nariai (esami ir nauji) galės ją redaguoti. Tai neįtraukia narių, kurie yra svečiai. Galite bet kada atsieti lentą nuo kanalo.", + "boardSelector.confirm-link-board-subtext-with-other-channel": "Kai susiesite „{boardName}“ su kanalu, visi kanalo nariai (esami ir nauji) galės ją redaguoti. Tai neįtraukia narių, kurie yra svečiai.{lineBreak} Ši lenta šiuo metu susieta su kitu kanalu. Jis bus atsietas, jei pasirinksite susieti jį čia.", + "boardSelector.create-a-board": "Sukurti lentą", + "boardSelector.link": "nuoroda", + "boardSelector.search-for-boards": "Ieškoti lentų", + "boardSelector.title": "Susieti lentas", + "boardSelector.unlink": "Atsieti", + "calendar.month": "Mėnuo", + "calendar.today": "Šiandien", + "calendar.week": "Savaitė", + "centerPanel.undefined": "Nėra {propertyName}", + "centerPanel.unknown-user": "Nežinomas naudotojas", + "createImageBlock.failed": "Šio failo nepavyko įkelti, nes pasiektas failo dydžio limitas.", + "default-properties.badges": "Komentarai ir aprašymas", + "default-properties.title": "Pavadinimas", + "error.back-to-home": "Grįžti namo", + "error.back-to-team": "Atgal į komandą", + "error.board-not-found": "Lenta nerasta.", + "error.go-login": "Prisijungti", + "error.invalid-read-only-board": "Neturite prieigos prie šios lentos. Prisijunkite, kad pasiektumėte lentas.", + "error.not-logged-in": "Jūsų sesija gali būti pasibaigusi arba nesate prisijungę. Prisijunkite dar kartą, kad pasiektumėte lentas.", + "error.page.title": "Atsiprašome, kažkas nutiko", + "error.team-undefined": "Netinkama komanda.", + "error.unknown": "Įvyko klaida.", + "generic.previous": "Ankstesnis", + "guest-no-board.subtitle": "Dar neturite prieigos prie jokios šios komandos lentos, palaukite, kol kas nors jus įtrauks į bet kurią lentą.", + "guest-no-board.title": "Dar nėra jokių lentų", + "imagePaste.upload-failed": "Kai kurie failai nebuvo įkelti, nes pasiektas failo dydžio limitas.", + "limitedCard.title": "Paslėptos kortelės", + "login.log-in-button": "Prisijungti", + "login.log-in-title": "Prisijungti", + "login.register-button": "arba susikurkite paskyrą, jei jos neturite", + "new_channel_modal.create_board.empty_board_description": "Sukurti naują tuščią lentą", + "new_channel_modal.create_board.empty_board_title": "Tuščia lenta", + "new_channel_modal.create_board.select_template_placeholder": "Pasirinkti šabloną", + "new_channel_modal.create_board.title": "Sukurti šio kanalo lentą", + "notification-box-card-limit-reached.close-tooltip": "Snausti 10 dienų", + "notification-box-card-limit-reached.contact-link": "praneškite savo administratoriui", + "notification-box-card-limit-reached.link": "Atnaujinti į mokamą planą", + "notification-box-card-limit-reached.title": "{cards} kortelės paslėptos", + "notification-box-cards-hidden.title": "Šis veiksmas paslėpė kitą kortelę", + "notification-box.card-limit-reached.not-admin.text": "Norėdami pasiekti archyvuotas korteles, galite {contactLink} naujovinti į mokamą planą.", + "notification-box.card-limit-reached.text": "Pasiektas kortelių limitas, jei norite peržiūrėti senesnes korteles, {link}", + "person.add-user-to-board": "Pridėti {username} prie lentos", + "person.add-user-to-board-confirm-button": "Pridėti prie lentos", + "person.add-user-to-board-permissions": "Leidimai", + "person.add-user-to-board-question": "Ar norite pridėti {username} prie lentos?", + "person.add-user-to-board-warning": "{username} nėra lentos narys ir negaus apie tai jokių pranešimų.", + "register.login-button": "arba prisijunkite, jei jau turite paskyrą", + "register.signup-title": "Prisiregistruokite prie paskyros", + "rhs-board-non-admin-msg": "Jūs nesate lentos administratorius", + "rhs-boards.add": "Pridėti", + "rhs-boards.dm": "AŽ", + "rhs-boards.gm": "GŽ", + "rhs-boards.header.dm": "ši tiesioginė žinutė", + "rhs-boards.header.gm": "ši grupės žinutė", + "rhs-boards.last-update-at": "Paskutinį kartą atnaujinta: {datetime}", + "rhs-boards.link-boards-to-channel": "Susieti lentas su {channelName}", + "rhs-boards.linked-boards": "Susietos lentos", + "rhs-boards.no-boards-linked-to-channel": "Su {channelName} dar nėra susietų lentų", + "rhs-boards.no-boards-linked-to-channel-description": "„Boards“ yra projektų valdymo įrankis, padedantis apibrėžti, organizuoti, sekti ir valdyti darbą įvairiose komandose, naudojant pažįstamą Kanban lentos vaizdą.", + "rhs-boards.unlink-board": "Atsieti lentą", + "rhs-boards.unlink-board1": "Atsieti lentą", + "rhs-channel-boards-header.title": "Boards", + "share-board.publish": "Paskelbti", + "share-board.share": "Bendrinti", + "shareBoard.channels-select-group": "Kanalai", + "shareBoard.confirm-change-team-role.body": "Visi šioje lentoje esantys asmenys, turintys žemesnį nei „{role}“ vaidmenį , dabar bus paaukštinti į {role} . Ar tikrai norite pakeisti minimalų lentos vaidmenį?", + "shareBoard.confirm-change-team-role.confirmBtnText": "Pakeiskite minimalų lentos vaidmenį", + "shareBoard.confirm-change-team-role.title": "Pakeiskite minimalų lentos vaidmenį", + "shareBoard.confirm-link-channel": "Susieti lentą su kanalu", + "shareBoard.confirm-link-channel-button": "Susieti kanalą", + "shareBoard.confirm-link-channel-button-with-other-channel": "Atsieti ir susieti čia", + "shareBoard.confirm-link-channel-subtext": "Kai susiesite kanalą su lenta, visi kanalo nariai (esami ir nauji) galės ją redaguoti. Tai neįtraukia narių, kurie yra svečiai.", + "shareBoard.confirm-link-channel-subtext-with-other-channel": "Kai susiesite kanalą su lenta, visi kanalo nariai (esami ir nauji) galės jį redaguoti. Tai neįtraukia narių, kurie yra svečiai.{lineBreak}Ši lenta šiuo metu susieta su kitu kanalu. Jis bus atsietas, jei pasirinksite susieti jį čia.", + "shareBoard.confirm-unlink.body": "Kai atsiesite kanalą nuo lentos, visi kanalo nariai (esami ir nauji) praras prieigą prie jo, nebent jiems bus suteiktas atskiras leidimas.", + "shareBoard.confirm-unlink.confirmBtnText": "Atsieti kanalą", + "shareBoard.confirm-unlink.title": "Atsieti kanalą nuo lentos", + "shareBoard.lastAdmin": "Lentose turi būti bent vienas administratorius", + "shareBoard.members-select-group": "Nariai", + "shareBoard.unknown-channel-display-name": "Nežinomas kanalas", + "tutorial_tip.finish_tour": "Atlikta", + "tutorial_tip.got_it": "Supratau", + "tutorial_tip.ok": "Kitas", + "tutorial_tip.out": "Atsisakyti šių patarimų.", + "tutorial_tip.seen": "Matėte tai anksčiau?" +} diff --git a/webapp/boards/i18n/nl.json b/webapp/boards/i18n/nl.json index d0d735c948..67c60a9a46 100644 --- a/webapp/boards/i18n/nl.json +++ b/webapp/boards/i18n/nl.json @@ -1,4 +1,6 @@ { + "AdminBadge.SystemAdmin": "Beheerder", + "AdminBadge.TeamAdmin": "Teambeheerder", "AppBar.Tooltip": "Gekoppelde borden weergeven", "Attachment.Attachment-title": "Bijlage", "AttachmentBlock.DeleteAction": "verwijderen", @@ -137,6 +139,7 @@ "ContentBlock.moveDown": "Naar beneden verplaatsen", "ContentBlock.moveUp": "Naar boven verplaatsen", "ContentBlock.text": "tekst", + "DateFilter.empty": "Leeg", "DateRange.clear": "Wissen", "DateRange.empty": "Leeg", "DateRange.endDate": "Einddatum", @@ -155,10 +158,14 @@ "Filter.ends-with": "eindigt met", "Filter.includes": "bevat", "Filter.is": "is", + "Filter.is-after": "is na", + "Filter.is-before": "is voor", "Filter.is-empty": "is leeg", "Filter.is-not-empty": "is niet leeg", "Filter.is-not-set": "is niet ingesteld", "Filter.is-set": "is ingesteld", + "Filter.isafter": "is na", + "Filter.isbefore": "is voor", "Filter.not-contains": "bevat niet", "Filter.not-ends-with": "eindigt niet met", "Filter.not-includes": "bevat niet", @@ -305,6 +312,7 @@ "ValueSelector.valueSelector": "Waardekiezer", "ValueSelectorLabel.openMenu": "Menu openen", "VersionMessage.help": "Bekijk eens wat nieuw is in deze versie.", + "VersionMessage.learn-more": "Meer info", "View.AddView": "Weergave toevoegen", "View.Board": "Bord", "View.DeleteView": "Weergave verwijderen", @@ -359,6 +367,9 @@ "WelcomePage.StartUsingIt.Text": "Ga het gebruiken", "Workspace.editing-board-template": "Je bent een bordsjabloon aan het bewerken.", "badge.guest": "Gast", + "boardPage.confirm-join-button": "Word lid", + "boardPage.confirm-join-text": "Je staat op het punt lid te worden van een privé-bord zonder dat je expliciet bent toegevoegd door de bordbeheerder. Weet je zeker dat je lid wilt worden van dit privé-bord?", + "boardPage.confirm-join-title": "Word lid van het privé-bord", "boardSelector.confirm-link-board": "Koppel bord aan kanaal", "boardSelector.confirm-link-board-button": "Ja, koppel het bord", "boardSelector.confirm-link-board-subtext": "Wanneer je \"{boardName}\" aan het kanaal koppelt, kunnen alle leden van het kanaal (bestaande en nieuwe) het bewerken. Dit sluit leden die gast zijn uit. Je kan de koppeling van een bord naar een kanaal op elk moment ongedaan maken.", diff --git a/webapp/boards/i18n/pt.json b/webapp/boards/i18n/pt.json index 6f70f2608e..654733b2f1 100644 --- a/webapp/boards/i18n/pt.json +++ b/webapp/boards/i18n/pt.json @@ -63,12 +63,15 @@ "CardDetail.limited-button": "Atualizar", "CardDetail.new-comment-placeholder": "Adicionar um comentário...", "CardDetailProperty.delete-action-button": "Apagar", + "CardDetailProperty.property-change-action-button": "Alterar propriedade", + "CardDetailProperty.property-changed": "Propriedade alterada com sucesso!", "CardDialog.delete-confirmation-dialog-button-text": "Apagar", "Categories.CreateCategoryDialog.CancelText": "Cancelar", "Categories.CreateCategoryDialog.CreateText": "Criar", "Categories.CreateCategoryDialog.UpdateText": "Atualizar", "CenterPanel.Login": "Entrar", "CenterPanel.Share": "Compartilhar", + "ChannelIntro.CreateBoard": "Criar um quadro", "Comment.delete": "Apagar", "CommentsList.send": "Enviar", "ConfirmPerson.empty": "Vazio", diff --git a/webapp/boards/i18n/ru.json b/webapp/boards/i18n/ru.json index bcbcbdf899..382943683c 100644 --- a/webapp/boards/i18n/ru.json +++ b/webapp/boards/i18n/ru.json @@ -1,4 +1,6 @@ { + "AdminBadge.SystemAdmin": "Администратор", + "AdminBadge.TeamAdmin": "Администратор Команды", "AppBar.Tooltip": "Переключить связанные доски", "Attachment.Attachment-title": "Вложение", "AttachmentBlock.DeleteAction": "Удалить", @@ -137,6 +139,7 @@ "ContentBlock.moveDown": "Опустить", "ContentBlock.moveUp": "Поднять", "ContentBlock.text": "текст", + "DateFilter.empty": "Пусто", "DateRange.clear": "Очистить", "DateRange.empty": "Пусто", "DateRange.endDate": "Дата окончания", @@ -155,10 +158,14 @@ "Filter.ends-with": "заканчивается", "Filter.includes": "содержит", "Filter.is": "является", + "Filter.is-after": "после", + "Filter.is-before": "раньше", "Filter.is-empty": "пусто", "Filter.is-not-empty": "не пусто", "Filter.is-not-set": "не установлен", "Filter.is-set": "установлен", + "Filter.isafter": "после", + "Filter.isbefore": "раньше", "Filter.not-contains": "не содержит", "Filter.not-ends-with": "не заканчивается", "Filter.not-includes": "не содержит", @@ -197,6 +204,7 @@ "OnboardingTour.ShareBoard.Body": "Вы можете поделиться своей доской внутри своей команды или опубликовать ее для общего доступа за пределами Вашей организации.", "OnboardingTour.ShareBoard.Title": "Поделиться доской", "PersonProperty.board-members": "Совет директоров", + "PersonProperty.me": "Я", "PersonProperty.non-board-members": "Не члены правления", "PropertyMenu.Delete": "Удалить", "PropertyMenu.changeType": "Изменить тип свойства", @@ -304,6 +312,7 @@ "ValueSelector.valueSelector": "Выбор значения", "ValueSelectorLabel.openMenu": "Открыть меню", "VersionMessage.help": "Узнайте, что нового в этой версии.", + "VersionMessage.learn-more": "Узнать больше", "View.AddView": "Добавить вид", "View.Board": "Доска", "View.DeleteView": "Удалить вид", @@ -358,6 +367,9 @@ "WelcomePage.StartUsingIt.Text": "Начать пользоваться", "Workspace.editing-board-template": "Вы редактируете шаблон доски.", "badge.guest": "Гость", + "boardPage.confirm-join-button": "Присоединиться", + "boardPage.confirm-join-text": "Вы собираетесь присоединиться к закрытой доске без явного добавления администратором доски. Вы уверены, что хотите присоединиться к этой закрытой доске?", + "boardPage.confirm-join-title": "Присоединиться к приватной доске", "boardSelector.confirm-link-board": "Привязать доску к каналу", "boardSelector.confirm-link-board-button": "Да, ссылка доски", "boardSelector.confirm-link-board-subtext": "Связывание доски \"{boardName}\" с каналом даст всем участникам канала доступ на редактирование доски. Вы можете в любое время отвязать доску о канала.", @@ -386,6 +398,8 @@ "error.team-undefined": "Не корректная команда.", "error.unknown": "Произошла ошибка.", "generic.previous": "Предыдущий", + "guest-no-board.subtitle": "У вас пока нет доступа ни к одной доске в этой команде, пожалуйста, подождите, пока кто-нибудь не добавит вас к любой из досок.", + "guest-no-board.title": "Пока нет досок", "imagePaste.upload-failed": "Некоторые файлы не загружены из-за превышения квоты на размер файла.", "limitedCard.title": "Карточки скрыты", "login.log-in-button": "Вход в систему", @@ -406,22 +420,40 @@ "person.add-user-to-board-confirm-button": "Добавить доску", "person.add-user-to-board-permissions": "Разрешения", "person.add-user-to-board-question": "Вы хотите добавить {username} на доску?", + "person.add-user-to-board-warning": "{username} не является участником доски и не получает никаких уведомлений о ней.", "register.login-button": "или войти в систему, если у вас уже есть аккаунт", "register.signup-title": "Зарегистрируйте свой аккаунт", "rhs-board-non-admin-msg": "Вы не являетесь администратором этой доски", "rhs-boards.add": "Добавить", + "rhs-boards.dm": "ЛС", + "rhs-boards.gm": "GM", + "rhs-boards.header.dm": "это личное сообщение", + "rhs-boards.header.gm": "это групповое сообщение", "rhs-boards.last-update-at": "Последнее обновление: {datetime}", "rhs-boards.link-boards-to-channel": "Связать доски с {channelName}", "rhs-boards.linked-boards": "Связанные доски", "rhs-boards.no-boards-linked-to-channel": "К каналу {channelName} пока не подключены доски", "rhs-boards.no-boards-linked-to-channel-description": "Доски — это инструмент управления проектами, который помогает определять, организовывать, отслеживать и управлять работой между командами, используя знакомое представление доски Канбан.", "rhs-boards.unlink-board": "Отвязать доску", + "rhs-boards.unlink-board1": "Отвязать доску", "rhs-channel-boards-header.title": "Доски", "share-board.publish": "Опубликовать", "share-board.share": "Поделиться", "shareBoard.channels-select-group": "Каналы", + "shareBoard.confirm-change-team-role.body": "Все на этой доске с правами ниже, чем роль \"{role}\" теперь будут повышены до {role}. Вы уверены, что хотите изменить минимальную роль для доски?", + "shareBoard.confirm-change-team-role.confirmBtnText": "Изменение минимальной роли доски", + "shareBoard.confirm-change-team-role.title": "Изменение минимальной роли доски", + "shareBoard.confirm-link-channel": "Привязать доску к каналу", + "shareBoard.confirm-link-channel-button": "Привязать канал", + "shareBoard.confirm-link-channel-button-with-other-channel": "Отвязать и привязать это", + "shareBoard.confirm-link-channel-subtext": "Когда вы связываете канал с доской, все участники канала (существующие и новые) смогут редактировать его. За исключением пользователей, которые являются гостями.", + "shareBoard.confirm-link-channel-subtext-with-other-channel": "Когда вы связываете канал с доской, все участники канала (существующие и новые) смогут редактировать его. За исключением пользователей, которые являются гостями.{lineBreak}Эта доска в настоящее время связана с другим каналом. Она будет удалена, если вы решите связать ее здесь.", + "shareBoard.confirm-unlink.body": "Когда вы отвязываете канал от доски, все участники канала (как существующие, так и новые) теряют к нему доступ, если им не дано отдельное разрешение.", + "shareBoard.confirm-unlink.confirmBtnText": "Отвязать канал", + "shareBoard.confirm-unlink.title": "Отвязать канал от доски", "shareBoard.lastAdmin": "Доски должны иметь хотя бы одного администратора", "shareBoard.members-select-group": "Участники", + "shareBoard.unknown-channel-display-name": "Неизвестный канал", "tutorial_tip.finish_tour": "Готово", "tutorial_tip.got_it": "Понятно", "tutorial_tip.ok": "Следующий", diff --git a/webapp/boards/i18n/zh_Hans.json b/webapp/boards/i18n/zh_Hans.json index 56dfdd2824..f3c7fb7bfc 100644 --- a/webapp/boards/i18n/zh_Hans.json +++ b/webapp/boards/i18n/zh_Hans.json @@ -1,5 +1,5 @@ { - "AppBar.Tooltip": "切换链接的板块", + "AppBar.Tooltip": "切换已链接的板块", "Attachment.Attachment-title": "附件", "AttachmentBlock.DeleteAction": "删除", "AttachmentBlock.addElement": "添加 {type}", @@ -137,6 +137,7 @@ "ContentBlock.moveDown": "下移", "ContentBlock.moveUp": "上移", "ContentBlock.text": "文字", + "DateFilter.empty": "空", "DateRange.clear": "清除", "DateRange.empty": "空的", "DateRange.endDate": "结束日期", @@ -305,6 +306,7 @@ "ValueSelector.valueSelector": "值选择器", "ValueSelectorLabel.openMenu": "打开菜单", "VersionMessage.help": "了解查看新版本有什么新特性。", + "VersionMessage.learn-more": "了解更多", "View.AddView": "添加视图", "View.Board": "板块", "View.DeleteView": "删除视图", @@ -359,6 +361,7 @@ "WelcomePage.StartUsingIt.Text": "开始使用", "Workspace.editing-board-template": "您正在编辑版面模板。", "badge.guest": "访客", + "boardPage.confirm-join-button": "加入", "boardSelector.confirm-link-board": "连接板块到频道", "boardSelector.confirm-link-board-button": "是的，连接板块", "boardSelector.confirm-link-board-subtext": "当你连接“{boardName}”到频道时，所有频道的成员（现有的或新的）都可以编辑。这并不包括访客。你随时都可以取消板块与频道的连接。", diff --git a/webapp/boards/jest.config.js b/webapp/boards/jest.config.js index 05b4cd53e9..85b8e69719 100644 --- a/webapp/boards/jest.config.js +++ b/webapp/boards/jest.config.js @@ -7,7 +7,7 @@ const config = { transform: { "^.+\\.(t|j)sx?$": ["@swc/jest"] }, - moduleFileExtensions: [ + moduleFileExtensions: [ "ts", "tsx", "js", @@ -20,7 +20,6 @@ const config = { "/nanoevents/", "node_modules/(?!react-native|react-router|react-day-picker)" ], - maxWorkers: "80%", testEnvironment: "jsdom", collectCoverage: true, collectCoverageFrom: [ diff --git a/webapp/boards/package.json b/webapp/boards/package.json index bf2a0f36e2..6a16614cd5 100644 --- a/webapp/boards/package.json +++ b/webapp/boards/package.json @@ -1,10 +1,9 @@ { "name": "boards", - "version": "7.10.0", + "version": "7.9.1", "private": true, "description": "", "scripts": { - "i18n-extract": "formatjs extract \"src/**/*.{ts,tsx}\" --ignore \"**/*.d.ts\" \"../**/*.d.ts\" --out-file i18n/tmp.json && formatjs compile i18n/tmp.json --out-file i18n/en.json && npx rimraf i18n/tmp.json", "build": "webpack --mode=production", "build:watch": "webpack --mode=production --watch", "start:product": "webpack serve --mode=development", @@ -18,6 +17,7 @@ "check-types": "tsc -b", "check-types:fix": "npm run check-types -- --noEmit --fix", "check": "npm run check-lint && npm run check-style", + "i18n-extract": "formatjs extract \"src/**/*.{ts,tsx}\" --ignore \"**/*.d.ts\" --id-interpolation-pattern '[sha512:contenthash:base64:6]' --format simple --out-file i18n/en.json", "fix": "npm run check-lint:fix && npm run check-style:fix", "test": "cross-env TZ=Etc/UTC jest", "test:watch": "cross-env TZ=Etc/UTC jest --watch", @@ -46,7 +46,6 @@ "glob-parent": "6.0.2", "lodash": "^4.17.21", "marked": "4.0.17", - "mini-create-react-context": "^0.4.1", "moment": "^2.29.1", "nanoevents": "^5.1.13", "react": "17.0.2", @@ -59,7 +58,7 @@ "react-dom": "17.0.2", "react-hot-keys": "^2.7.1", "react-hotkeys-hook": "^3.4.4", - "react-intl": "^5.20.0", + "react-intl": "*", "react-redux": "^7.2.1", "react-router-dom": "^5.2.0", "react-select": "5.5.9", @@ -96,7 +95,6 @@ "@types/node": "16.11.7", "@types/react": "17.0.53", "@types/react-beautiful-dnd": "^13.1.2", - "@types/react-day-picker": "5.3.0", "@types/react-dom": "17.0.19", "@types/react-redux": "^7.1.23", "@types/react-router-dom": "^5.3.3", @@ -105,11 +103,9 @@ "@typescript-eslint/eslint-plugin": "5.57.1", "@typescript-eslint/parser": "5.57.1", "babel-eslint": "10.1.0", - "cross-env": "^7.0.3", "css-loader": "6.7.1", "eslint-import-resolver-webpack": "0.13.2", "eslint-plugin-babel": "^5.3.1", - "eslint-plugin-formatjs": "4.9.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-import": "2.25.4", "eslint-plugin-import-newlines": "1.3.1", diff --git a/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx b/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx index f0325bf586..c45d87e5d0 100644 --- a/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx +++ b/webapp/boards/src/components/boardsSwitcherDialog/boardSwitcherDialog.tsx @@ -39,7 +39,7 @@ const BoardSwitcherDialog = (props: Props): JSX.Element => { const team = useAppSelector(getCurrentTeam) const me = useAppSelector(getMe) const title = intl.formatMessage({id: 'FindBoardsDialog.Title', defaultMessage: 'Find Boards'}) - const subTitle = intl.formatMessage( + const subTitle = intl.formatMessage( { id: 'FindBoardsDialog.SubTitle', defaultMessage: 'Type to find a board. Use UP/DOWN to browse. ENTER to select, ESC to dismiss', diff --git a/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx b/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx index 1f7c1a5822..25a5a8a6c0 100644 --- a/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx +++ b/webapp/boards/src/components/shareBoard/teamPermissionsRow.tsx @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React, {useState} from 'react' +import React, {ReactNode, useState} from 'react' import {useIntl} from 'react-intl' import MenuWrapper from 'src/widgets/menuWrapper' @@ -77,7 +77,7 @@ const TeamPermissionsRow = (): JSX.Element => { id: 'shareBoard.confirm-change-team-role.title', defaultMessage: 'Change minimum board role', }), - subText: intl.formatMessage({ + subText: intl.formatMessage({ id: 'shareBoard.confirm-change-team-role.body', defaultMessage: 'Everyone on this board with a lower permission than the "{role}" role will now be promoted to {role}. Are you sure you want to change the minimum role for the board?', }, { diff --git a/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx b/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx index 5b97525b25..ec233123dc 100644 --- a/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx +++ b/webapp/boards/src/components/sidebar/sidebarCategory.test.tsx @@ -193,7 +193,10 @@ describe('components/sidebarCategory', () => { expect(mockTemplateClose).toBeCalled() }) - test('sidebar template close other', async () => { + // TODO: Remove when fetch is mocked correctly + // https://mattermost.atlassian.net/browse/MM-52212 + // eslint-disable-next-line no-only-tests/no-only-tests + test.skip('sidebar template close other', async () => { const mockStore = configureStore([]) const store = mockStore(state) diff --git a/webapp/boards/src/components/sidebar/sidebarCategory.tsx b/webapp/boards/src/components/sidebar/sidebarCategory.tsx index dc036fc180..5b54c8c7a9 100644 --- a/webapp/boards/src/components/sidebar/sidebarCategory.tsx +++ b/webapp/boards/src/components/sidebar/sidebarCategory.tsx @@ -1,6 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. import React, { + ReactNode, useCallback, useEffect, useMemo, @@ -167,7 +168,7 @@ const SidebarCategory = (props: Props) => { id: 'SidebarCategories.CategoryMenu.DeleteModal.Title', defaultMessage: 'Delete this category?', }), - subText: intl.formatMessage( + subText: intl.formatMessage( { id: 'SidebarCategories.CategoryMenu.DeleteModal.Body', defaultMessage: 'Boards in {categoryName} will move back to the Boards categories. You\'re not removed from any boards.', diff --git a/webapp/channels/.eslintrc.json b/webapp/channels/.eslintrc.json index cdc3b7bf18..644947847a 100644 --- a/webapp/channels/.eslintrc.json +++ b/webapp/channels/.eslintrc.json @@ -97,7 +97,7 @@ } ], "max-lines": ["warn", {"max": 800, "skipBlankLines": true, "skipComments": true}], - "formatjs/no-multiple-whitespaces": ["error"] + "formatjs/no-multiple-whitespaces": 2 }, "overrides": [ { diff --git a/webapp/channels/README.md b/webapp/channels/README.md deleted file mode 100644 index 48fcadb720..0000000000 --- a/webapp/channels/README.md +++ /dev/null @@ -1,56 +0,0 @@ -# Mattermost Web App -# [![Mattermost](https://user-images.githubusercontent.com/7205829/137170381-fe86eef0-bccc-4fdd-8e92-b258884ebdd7.png)](https://mattermost.com) - -[Mattermost](https://mattermost.com) is an open source platform for secure collaboration across the entire software development lifecycle. This repo is the primary source for core development on the Mattermost platform; it's written in Golang and React, and runs as a single Linux binary with MySQL or PostgreSQL. A new compiled version is released under an MIT license every month on the 16th. - -mattermost-hero - -This repo hosts the webapp client code. If you'd like to report an issue with Mattermost, please create an issue on [mattermost-server](https://github.com/mattermost/mattermost-server), which hosts the server code. You can also look at the [Get Help With Mattermost](https://docs.mattermost.com/guides/get-help.html) guide to find the resources available to our community. - -- [Product documentation](https://docs.mattermost.com/) -- [Developer documentation](https://developers.mattermost.com/) -- [Download compiled version](https://mattermost.com/download) - -## Try out Mattermost - -- [Join the Mattermost Contributor's server](https://community.mattermost.com/signup_user_complete/?id=codoy5s743rq5mk18i7u5ksz7e) to join community discussions about contributions, development and more -- [Get started with Mattermost Cloud](https://customers.mattermost.com/cloud/signup) to try out Mattermost - -[![Deploy a Preview](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/mattermost/mattermost-heroku) - -_Note: Heroku preview does not include email or persistent storage._ - -## Install Mattermost - -- [Deploy Guide](https://docs.mattermost.com/guides/deployment.html) - Deploy Mattermost in minutes via Docker, Ubuntu, or tar. -- [Developer Machine Setup](https://developers.mattermost.com/contribute/server/developer-setup) - Follow this guide if you want to write code for Mattermost - -Other Install Guides: -- [Deploy Mattermost on Docker](https://docs.mattermost.com/install/install-docker.html) -- [Mattermost Omnibus](https://docs.mattermost.com/install/installing-mattermost-omnibus.html) -- [Install Mattermost from Tar](https://docs.mattermost.com/install/install-tar.html) -- [Ubuntu 20.04 LTS](https://docs.mattermost.com/install/installing-ubuntu-2004-LTS.html) -- [Kubernetes](https://docs.mattermost.com/install/install-kubernetes.html) -- [Helm](https://docs.mattermost.com/install/install-kubernetes.html#installing-the-operators-via-helm) -- [Debian Buster](https://docs.mattermost.com/install/install-debian.html) -- [RHEL 8](https://docs.mattermost.com/install/install-rhel-8.html) -- [More server install guides](https://docs.mattermost.com/guides/deployment.html) - -## Get Involved - -- [Contribute to Mattermost](https://handbook.mattermost.com/contributors/contributors/ways-to-contribute) -- [Find "Help Wanted" projects](https://github.com/mattermost/mattermost-server/issues?page=1&q=is%3Aissue+is%3Aopen+%22Help+Wanted%22&utf8=%E2%9C%93) -- [Join Developer Discussion on a Mattermost Server for contributors](https://docs.mattermost.com/guides/community-chat.html) -- [Get Help With Mattermost](https://docs.mattermost.com/guides/get-help.html) - -## Learn More - -- [API Options - webhooks, slash commands, drivers and web service](https://api.mattermost.com/) -- [Localization Guide](https://handbook.mattermost.com/contributors/contributors/localization) - -## Get the Latest News - -- **Twitter** - Follow [Mattermost](https://twitter.com/Mattermost) -- **Email** - Subscribe to our [newsletter](https://mattermost.com/community-newsletter/) - -Any other questions, mail us at [info@mattermost.com](mailto:info@mattermost.com). We'd love to meet you! diff --git a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml index 66b2cef95e..9d9bb1c246 100644 --- a/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml +++ b/webapp/channels/build/contrib/gitlab/.gitlab-ci.yml @@ -13,4 +13,4 @@ test: before_script: - npm ci --ignore-scripts script: - - npm run test:speed + - npm run test diff --git a/webapp/channels/package.json b/webapp/channels/package.json index 090f9bc96a..c2f702aa9b 100644 --- a/webapp/channels/package.json +++ b/webapp/channels/package.json @@ -3,7 +3,7 @@ "browser": { "./client/web_client.jsx": "./client/browser_web_client.jsx" }, - "version": "7.9.0", + "version": "7.9.1", "private": true, "dependencies": { "@floating-ui/react-dom": "1.0.0", @@ -51,7 +51,7 @@ "localforage": "1.10.0", "localforage-observable": "2.1.1", "lodash": "4.17.21", - "luxon": "3.0.4", + "luxon": "3.3.0", "mark.js": "8.11.1", "marked": "github:mattermost/marked#2ef7f28cc7718e3f551c4ce9ea75fdd7580c2008", "memoize-one": "6.0.0", @@ -70,7 +70,7 @@ "react-day-picker": "8.3.6", "react-dom": "17.0.2", "react-hot-loader": "4.13.0", - "react-intl": "5.20.10", + "react-intl": "*", "react-is": "17.0.2", "react-overlays": "0.9.3", "react-popper": "2.3.0", @@ -116,6 +116,7 @@ "@redux-devtools/extension": "3.2.3", "@testing-library/jest-dom": "5.16.4", "@testing-library/react": "12.1.4", + "@testing-library/user-event": "12.1.4", "@types/bootstrap": "4.5.0", "@types/country-list": "2.1.0", "@types/enzyme": "3.10.11", @@ -155,14 +156,12 @@ "babel-plugin-typescript-to-proptypes": "1.4.2", "bundle-loader": "0.2.0", "copy-webpack-plugin": "11.0.0", - "cross-env": "7.0.3", "css-loader": "5.2.6", "dotenv-webpack": "8.0.1", "enzyme": "3.11.0", "enzyme-adapter-react-17-updated": "1.0.2", "enzyme-to-json": "3.6.2", "eslint-import-resolver-webpack": "0.13.2", - "eslint-plugin-formatjs": "4.9.1", "eslint-plugin-header": "3.1.1", "eslint-plugin-import": "2.27.5", "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#5b0c972eacf19286e4c66221b39113bf8728a99e", @@ -215,15 +214,13 @@ "build": "cross-env NODE_ENV=production webpack", "run": "webpack --progress --watch", "dev-server": "webpack serve --mode development", - "test": "cross-env TZ=Etc/UTC jest --maxWorkers=50%", + "test": "cross-env TZ=Etc/UTC jest", + "test:watch": "cross-env TZ=Etc/UTC jest --watch", + "test:updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot", + "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles --verbose", "test-ci": "cross-env TZ=Etc/UTC jest --ci --maxWorkers=100%", "clean": "rm -rf dist node_modules .eslintcache .stylelintcache tsconfig.tsbuildinfo", "stats": "cross-env NODE_ENV=production webpack --profile --json > webpack_stats.json", - "updatesnapshot": "cross-env TZ=Etc/UTC jest --updateSnapshot", - "test:debug": "cross-env TZ=Etc/UTC jest --forceExit --detectOpenHandles", - "test:speed": "cross-env TZ=Etc/UTC jest", - "test:watch": "cross-env TZ=Etc/UTC jest --watch", - "test:coverage": "cross-env TZ=Etc/UTC jest --coverage", "mmjstool": "mmjstool", "i18n-extract": "npm run mmjstool -- i18n extract-webapp --webapp-dir ./src", "i18n-clean-empty": "npm run mmjstool -- i18n clean-empty --webapp-dir ./src", diff --git a/webapp/channels/src/actions/command.ts b/webapp/channels/src/actions/command.ts index 62195ac6dc..8b86ec2f43 100644 --- a/webapp/channels/src/actions/command.ts +++ b/webapp/channels/src/actions/command.ts @@ -175,7 +175,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFunc { const errorResponse = res.error; return createErrorMessage(errorResponse.text || intlShim.formatMessage({ id: 'apps.error.unknown', - defaultMessage: 'Unknown error.', + defaultMessage: 'Unknown error occurred.', })); } @@ -201,7 +201,7 @@ export function executeCommand(message: string, args: CommandArgs): ActionFunc { )); } } catch (err: any) { - return createErrorMessage(err.message || localizeMessage('apps.error.unknown', 'Unknown error.')); + return createErrorMessage(err.message || localizeMessage('apps.error.unknown', 'Unknown error occurred.')); } } } diff --git a/webapp/channels/src/actions/notification_actions.jsx b/webapp/channels/src/actions/notification_actions.jsx index 95e3d450e2..088cf1aedb 100644 --- a/webapp/channels/src/actions/notification_actions.jsx +++ b/webapp/channels/src/actions/notification_actions.jsx @@ -14,9 +14,11 @@ import {isSystemMessage, isUserAddedInChannel} from 'mattermost-redux/utils/post import {displayUsername} from 'mattermost-redux/utils/user_utils'; import {isThreadOpen} from 'selectors/views/threads'; +import {getChannelURL, getPermalinkURL} from 'selectors/urls'; import {getHistory} from 'utils/browser_history'; import Constants, {NotificationLevels, UserStatuses} from 'utils/constants'; +import * as NotificationSounds from 'utils/notification_sounds'; import {showNotification} from 'utils/notifications'; import {isDesktopApp, isMobileApp, isWindowsApp} from 'utils/user_agent'; import * as Utils from 'utils/utils'; @@ -178,17 +180,17 @@ export function sendDesktopNotification(post, msgProps) { if (notify) { const updatedState = getState(); - let url = Utils.getChannelURL(updatedState, channel, teamId); + let url = getChannelURL(updatedState, channel, teamId); if (isCrtReply) { - url = Utils.getPermalinkURL(updatedState, teamId, post.id); + url = getPermalinkURL(updatedState, teamId, post.id); } dispatch(notifyMe(title, body, channel, teamId, !sound, soundName, url)); //Don't add extra sounds on native desktop clients if (sound && !isDesktopApp() && !isMobileApp()) { - Utils.ding(soundName); + NotificationSounds.ding(soundName); } } }; diff --git a/webapp/channels/src/actions/notification_actions.test.js b/webapp/channels/src/actions/notification_actions.test.js index 56fbca06db..c8b5a70599 100644 --- a/webapp/channels/src/actions/notification_actions.test.js +++ b/webapp/channels/src/actions/notification_actions.test.js @@ -5,8 +5,8 @@ import testConfigureStore from 'tests/test_store'; import {getHistory} from 'utils/browser_history'; import Constants, {NotificationLevels, UserStatuses} from 'utils/constants'; +import * as NotificationSounds from 'utils/notification_sounds'; import * as utils from 'utils/notifications'; -import * as baseUtils from 'utils/utils'; import {sendDesktopNotification} from './notification_actions'; @@ -22,7 +22,7 @@ describe('notification_actions', () => { beforeEach(() => { spy = jest.spyOn(utils, 'showNotification'); - baseUtils.ding = jest.fn(); + NotificationSounds.ding = jest.fn(); crt = { user_id: 'current_user_id', @@ -315,7 +315,7 @@ describe('notification_actions', () => { }); test('should default sound when no sound is specified', () => { - const dingSpy = jest.spyOn(baseUtils, 'ding'); + const dingSpy = jest.spyOn(NotificationSounds, 'ding'); baseState.entities.users.profiles.current_user_id.notify_props.desktop_sound = 'true'; const store = testConfigureStore(baseState); return store.dispatch(sendDesktopNotification(post, msgProps)).then(() => { @@ -324,7 +324,7 @@ describe('notification_actions', () => { }); test('should use specified sound when specified', () => { - const dingSpy = jest.spyOn(baseUtils, 'ding'); + const dingSpy = jest.spyOn(NotificationSounds, 'ding'); baseState.entities.users.profiles.current_user_id.notify_props.desktop_sound = 'true'; baseState.entities.users.profiles.current_user_id.notify_props.desktop_notification_sound = 'Crackle'; const store = testConfigureStore(baseState); diff --git a/webapp/channels/src/actions/views/create_comment.test.jsx b/webapp/channels/src/actions/views/create_comment.test.jsx index 54b587902f..1f4ee9cc43 100644 --- a/webapp/channels/src/actions/views/create_comment.test.jsx +++ b/webapp/channels/src/actions/views/create_comment.test.jsx @@ -18,7 +18,7 @@ import { makeOnSubmit, makeOnEditLatestPost, } from 'actions/views/create_comment'; -import {removeDraft} from 'actions/views/drafts'; +import {removeDraft, setGlobalDraftSource} from 'actions/views/drafts'; import {setGlobalItem, actionOnGlobalItemsWithPrefix} from 'actions/storage'; import * as PostActions from 'actions/post_actions'; import {executeCommand} from 'actions/command'; @@ -205,12 +205,13 @@ describe('rhs view actions', () => { const testStore = mockStore(initialState); - testStore.dispatch(setGlobalItem(`${StoragePrefixes.COMMENT_DRAFT}${rootId}`, { + const expectedKey = `${StoragePrefixes.COMMENT_DRAFT}${rootId}`; + testStore.dispatch(setGlobalItem(expectedKey, { ...draft, createAt: 42, updateAt: 42, - remote: false, })); + testStore.dispatch(setGlobalDraftSource(expectedKey, false)); expect(store.getActions()).toEqual(testStore.getActions()); jest.useRealTimers(); diff --git a/webapp/channels/src/actions/views/drafts.test.ts b/webapp/channels/src/actions/views/drafts.test.ts index 946dc560fa..7a95882237 100644 --- a/webapp/channels/src/actions/views/drafts.test.ts +++ b/webapp/channels/src/actions/views/drafts.test.ts @@ -13,7 +13,7 @@ import {getPreferenceKey} from 'mattermost-redux/utils/preference_utils'; import {Client4} from 'mattermost-redux/client'; -import {removeDraft, updateDraft} from './drafts'; +import {removeDraft, setGlobalDraftSource, updateDraft} from './drafts'; jest.mock('mattermost-redux/client', () => { const original = jest.requireActual('mattermost-redux/client'); @@ -146,12 +146,13 @@ describe('draft actions', () => { const testStore = mockStore(initialState); - testStore.dispatch(setGlobalItem(StoragePrefixes.DRAFT + channelId, { + const expectedKey = StoragePrefixes.DRAFT + channelId; + testStore.dispatch(setGlobalItem(expectedKey, { ...draft, createAt: 42, updateAt: 42, - remote: false, })); + testStore.dispatch(setGlobalDraftSource(expectedKey, false)); expect(store.getActions()).toEqual(testStore.getActions()); jest.useRealTimers(); diff --git a/webapp/channels/src/actions/views/drafts.ts b/webapp/channels/src/actions/views/drafts.ts index d883072137..8dc03cf1f7 100644 --- a/webapp/channels/src/actions/views/drafts.ts +++ b/webapp/channels/src/actions/views/drafts.ts @@ -15,7 +15,7 @@ import {PostDraft} from 'types/store/draft'; import {getGlobalItem} from 'selectors/storage'; import {makeGetDrafts} from 'selectors/drafts'; -import {StoragePrefixes} from 'utils/constants'; +import {ActionTypes, StoragePrefixes} from 'utils/constants'; import type {Draft as ServerDraft} from '@mattermost/types/drafts'; import type {UserProfile} from '@mattermost/types/users'; @@ -101,11 +101,10 @@ export function updateDraft(key: string, value: PostDraft|null, rootId = '', sav ...value, createAt: data.createAt || timestamp, updateAt: timestamp, - remote: false, }; } - dispatch(setGlobalItem(key, updatedValue)); + dispatch(setGlobalDraft(key, updatedValue, false)); if (syncedDraftsAreAllowedAndEnabled(state) && save && updatedValue) { const connectionId = getConnectionId(state); @@ -153,6 +152,24 @@ export function setDraftsTourTipPreference(initializationState: Record { + dispatch(setGlobalItem(key, value)); + dispatch(setGlobalDraftSource(key, isRemote)); + return {data: true}; + }; +} + +export function setGlobalDraftSource(key: string, isRemote: boolean) { + return { + type: ActionTypes.SET_DRAFT_SOURCE, + data: { + key, + isRemote, + }, + }; +} + export function transformServerDraft(draft: ServerDraft): Draft { let key: Draft['key'] = `${StoragePrefixes.DRAFT}${draft.channel_id}`; diff --git a/webapp/channels/src/actions/websocket_actions.jsx b/webapp/channels/src/actions/websocket_actions.jsx index 93069871bd..adb05f4215 100644 --- a/webapp/channels/src/actions/websocket_actions.jsx +++ b/webapp/channels/src/actions/websocket_actions.jsx @@ -68,7 +68,7 @@ import { } from 'mattermost-redux/actions/users'; import {removeNotVisibleUsers} from 'mattermost-redux/actions/websocket'; import {setGlobalItem} from 'actions/storage'; -import {transformServerDraft} from 'actions/views/drafts'; +import {setGlobalDraft, transformServerDraft} from 'actions/views/drafts'; import {Client4} from 'mattermost-redux/client'; import {getCurrentUser, getCurrentUserId, getUser, getIsManualStatusForUserId, isCurrentUserSystemAdmin} from 'mattermost-redux/selectors/entities/users'; @@ -89,7 +89,6 @@ import {getStandardAnalytics} from 'mattermost-redux/actions/admin'; import {fetchAppBindings, fetchRHSAppsBindings} from 'mattermost-redux/actions/apps'; -import {getConnectionId} from 'selectors/general'; import {getSelectedChannelId, getSelectedPost} from 'selectors/rhs'; import {isThreadOpen, isThreadManuallyUnread} from 'selectors/views/threads'; @@ -1700,20 +1699,12 @@ function handlePostAcknowledgementRemoved(msg) { } function handleUpsertDraftEvent(msg) { - return async (doDispatch, doGetState) => { - const state = doGetState(); - const connectionId = getConnectionId(state); - + return async (doDispatch) => { const draft = JSON.parse(msg.data.draft); const {key, value} = transformServerDraft(draft); value.show = true; - value.remote = false; - if (msg.broadcast.omit_connection_id !== connectionId) { - value.remote = true; - } - - doDispatch(setGlobalItem(key, value)); + doDispatch(setGlobalDraft(key, value, true)); }; } @@ -1722,7 +1713,11 @@ function handleDeleteDraftEvent(msg) { const draft = JSON.parse(msg.data.draft); const {key} = transformServerDraft(draft); - doDispatch(setGlobalItem(key, {message: '', fileInfos: [], uploadsInProgress: [], remote: true})); + doDispatch(setGlobalItem(key, { + message: '', + fileInfos: [], + uploadsInProgress: [], + })); }; } diff --git a/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap b/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap index 4c65f52555..07a4830b20 100644 --- a/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap +++ b/webapp/channels/src/components/__snapshots__/formatted_markdown_message.test.tsx.snap @@ -4,6 +4,7 @@ exports[`components/FormattedMarkdownMessage should allow to disable links 1`] = - - -`; - -exports[`components/AboutBuildModal should match snapshot for enterprise edition 1`] = ` - - - - - - - -
-
- -
-
-

- - Mattermost - - - -

-

- -

-
-
- - -  3.6.2 - -
-
- - -  77 - -
-
- -  Postgres -
-
-
- - - Mattermost Inc -
-
-
-
-
- - - mattermost.com - -
-
-
- -
-
- - - - - - - - -
-
-
-
-

- -

-
-
-

- - - abcdef1234567890 -
- - - 0123456789abcdef -

-

- - - 21 January 2017 -

-
- - -`; - -exports[`components/AboutBuildModal should match snapshot for team edition 1`] = ` - - - - - - - -
-
- -
-
-

- - Mattermost - - - -

-

- -

-
-
- - -  3.6.2 - -
-
- - -  77 - -
-
- -  Postgres -
-
-
-
-
-
- - - mattermost.com/community/ - -
-
-
- -
-
- - - - - - - - -
-
-
-
-

- -

-
-
-

- - - abcdef1234567890 -
- - -

-

- - - 21 January 2017 -

-
- - -`; - -exports[`components/AboutBuildModal should show ci if a ci build 1`] = ` - - - - - - - -
-
- -
-
-

- - Mattermost - - - -

-

- -

-
-
- - -  ci - -
-
- - -  77 - -
-
- - -  123 - -
-
- -  Postgres -
-
-
-
-
-
- - - mattermost.com/community/ - -
-
-
- -
-
- - - - - - - - -
-
-
-
-

- -

-
-
-

- - - abcdef1234567890 -
- - -

-

- - - 21 January 2017 -

-
- - -`; - -exports[`components/AboutBuildModal should show dev if this is a dev build 1`] = ` - - - - - - - -
-
- -
-
-

- - Mattermost - - - -

-

- -

-
-
- - -  dev - -
-
- - -  77 - -
-
- -  Postgres -
-
-
-
-
-
- - - mattermost.com/community/ - -
-
-
- -
-
- - - - - - - - -
-
-
-
-

- -

-
-
-

- - - abcdef1234567890 -
- - -

-

- - - 21 January 2017 -

-
- - -`; diff --git a/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx b/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx index 33241a3b7b..bff5e106b5 100644 --- a/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx +++ b/webapp/channels/src/components/about_build_modal/about_build_modal.test.tsx @@ -2,8 +2,6 @@ // See LICENSE.txt for license information. import React from 'react'; -import {Modal} from 'react-bootstrap'; -import {shallow} from 'enzyme'; import {Provider} from 'react-redux'; import mockStore from 'tests/test_store'; @@ -12,11 +10,13 @@ import {ClientConfig, ClientLicense} from '@mattermost/types/config'; import AboutBuildModal from 'components/about_build_modal/about_build_modal'; -import {mountWithIntl} from 'tests/helpers/intl-test-helper'; - import {AboutLinks} from 'utils/constants'; import AboutBuildModalCloud from './about_build_modal_cloud/about_build_modal_cloud'; +import {screen} from '@testing-library/react'; +import {renderWithIntl} from 'tests/react_testing_utils'; +import store from 'stores/redux_store'; +import userEvent from '@testing-library/user-event'; describe('components/AboutBuildModal', () => { const RealDate: DateConstructor = Date; @@ -60,10 +60,17 @@ describe('components/AboutBuildModal', () => { }); test('should match snapshot for enterprise edition', () => { - const wrapper = shallowAboutBuildModal({config, license}); - expect(wrapper.find('#versionString').text()).toBe('\u00a03.6.2'); - expect(wrapper.find('#dbversionString').text()).toBe('\u00a077'); - expect(wrapper).toMatchSnapshot(); + renderAboutBuildModal({config, license}); + expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: 3.6.2'); + expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77'); + expect(screen.getByText('Mattermost Enterprise Edition')).toBeInTheDocument(); + expect(screen.getByText('Modern communication from behind your firewall.')).toBeInTheDocument(); + expect(screen.getByRole('link', {name: 'mattermost.com'})).toHaveAttribute('href', 'https://mattermost.com/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid='); + expect(screen.getByText('EE Build Hash: 0123456789abcdef', {exact: false})).toBeInTheDocument(); + + expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt'); }); test('should match snapshot for team edition', () => { @@ -73,19 +80,25 @@ describe('components/AboutBuildModal', () => { BuildHashEnterprise: '', }; - const wrapper = shallowAboutBuildModal({config: teamConfig, license: {}}); - expect(wrapper.find('#versionString').text()).toBe('\u00a03.6.2'); - expect(wrapper.find('#dbversionString').text()).toBe('\u00a077'); - expect(wrapper).toMatchSnapshot(); + renderAboutBuildModal({config: teamConfig, license: {}}); + expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: 3.6.2'); + expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77'); + expect(screen.getByText('Mattermost Team Edition')).toBeInTheDocument(); + expect(screen.getByText('All your team communication in one place, instantly searchable and accessible anywhere.')).toBeInTheDocument(); + expect(screen.getByRole('link', {name: 'mattermost.com/community/'})).toHaveAttribute('href', 'https://mattermost.com/community/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid='); + expect(screen.queryByText('EE Build Hash: 0123456789abcdef')).not.toBeInTheDocument(); + + expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt'); }); test('should match snapshot for cloud edition', () => { if (license !== null) { license.Cloud = 'true'; } - const store = mockStore(); - const wrapper = shallow( + renderWithIntl( { /> , ); - expect(wrapper).toMatchSnapshot(); + + expect(screen.getByText('Mattermost Cloud')).toBeInTheDocument(); + expect(screen.getByText('High trust messaging for the enterprise')).toBeInTheDocument(); + + expect(screen.getByText('0123456789abcdef', {exact: false})).toBeInTheDocument(); + expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt'); }); test('should show dev if this is a dev build', () => { @@ -109,10 +129,18 @@ describe('components/AboutBuildModal', () => { BuildNumber: 'dev', }; - const wrapper = shallowAboutBuildModal({config: sameBuildConfig, license: {}}); - expect(wrapper).toMatchSnapshot(); - expect(wrapper.find('#versionString').text()).toBe('\u00a0dev'); - expect(wrapper.find('#dbversionString').text()).toBe('\u00a077'); + renderAboutBuildModal({config: sameBuildConfig, license: {}}); + + expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: dev'); + expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77'); + expect(screen.getByText('Mattermost Team Edition')).toBeInTheDocument(); + expect(screen.getByText('All your team communication in one place, instantly searchable and accessible anywhere.')).toBeInTheDocument(); + expect(screen.getByRole('link', {name: 'mattermost.com/community/'})).toHaveAttribute('href', 'https://mattermost.com/community/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid='); + expect(screen.queryByText('EE Build Hash: 0123456789abcdef')).not.toBeInTheDocument(); + + expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt'); }); test('should show ci if a ci build', () => { @@ -125,11 +153,19 @@ describe('components/AboutBuildModal', () => { BuildNumber: '123', }; - const wrapper = shallowAboutBuildModal({config: differentBuildConfig, license: {}}); - expect(wrapper).toMatchSnapshot(); - expect(wrapper.find('#versionString').text()).toBe('\u00a0ci'); - expect(wrapper.find('#dbversionString').text()).toBe('\u00a077'); - expect(wrapper.find('#buildnumberString').text()).toBe('\u00a0123'); + renderAboutBuildModal({config: differentBuildConfig, license: {}}); + + expect(screen.getByTestId('aboutModalVersion')).toHaveTextContent('Mattermost Version: ci'); + expect(screen.getByTestId('aboutModalDBVersionString')).toHaveTextContent('Database Schema Version: 77'); + expect(screen.getByTestId('aboutModalBuildNumber')).toHaveTextContent('Build Number: 123'); + expect(screen.getByText('Mattermost Team Edition')).toBeInTheDocument(); + expect(screen.getByText('All your team communication in one place, instantly searchable and accessible anywhere.')).toBeInTheDocument(); + expect(screen.getByRole('link', {name: 'mattermost.com/community/'})).toHaveAttribute('href', 'https://mattermost.com/community/?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=&sid='); + expect(screen.queryByText('EE Build Hash: 0123456789abcdef')).not.toBeInTheDocument(); + + expect(screen.getByRole('link', {name: 'server'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'desktop'})).toHaveAttribute('href', 'https://github.com/mattermost/desktop/blob/master/NOTICE.txt'); + expect(screen.getByRole('link', {name: 'mobile'})).toHaveAttribute('href', 'https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt'); }); test('should call onExited callback when the modal is hidden', () => { @@ -148,7 +184,7 @@ describe('components/AboutBuildModal', () => { }, }); - const wrapper = mountWithIntl( + renderWithIntl( { , ); - wrapper.find(Modal).first().props().onExited?.(document.createElement('div')); + userEvent.click(screen.getByText('Close')); expect(onExited).toHaveBeenCalledTimes(1); }); @@ -176,7 +212,7 @@ describe('components/AboutBuildModal', () => { }, }, }); - const wrapper = mountWithIntl( + renderWithIntl( { , ); - expect( - wrapper.find(AboutBuildModal).find('a#tosLink').props().href, - ).toBe( - AboutLinks.TERMS_OF_SERVICE + - '?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=', - ); - expect( - wrapper.find(AboutBuildModal).find('a#privacyLink').props().href, - ).toBe( - AboutLinks.PRIVACY_POLICY + - '?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=', - ); + expect(screen.getByRole('link', {name: 'Terms of Use'})).toHaveAttribute('href', `${AboutLinks.TERMS_OF_SERVICE}?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=`); - expect(wrapper.find(AboutBuildModal).find('a#tosLink').props().href).not.toBe(config?.TermsOfServiceLink); - expect(wrapper.find(AboutBuildModal).find('a#privacyLink').props().href).not.toBe(config?.PrivacyPolicyLink); + expect(screen.getByRole('link', {name: 'Privacy Policy'})).toHaveAttribute('href', `${AboutLinks.PRIVACY_POLICY}?utm_source=mattermost&utm_medium=in-product&utm_content=about_build_modal&uid=currentUserId&sid=`); + + expect(screen.getByRole('link', {name: 'Terms of Use'})).not.toHaveAttribute('href', config?.TermsOfServiceLink); + expect(screen.getByRole('link', {name: 'Privacy Policy'})).not.toHaveAttribute('href', config?.PrivacyPolicyLink); }); - function shallowAboutBuildModal(props = {}) { + function renderAboutBuildModal(props = {}) { const onExited = jest.fn(); const show = true; @@ -215,6 +242,6 @@ describe('components/AboutBuildModal', () => { ...props, }; - return shallow(); + return renderWithIntl(); } }); diff --git a/webapp/channels/src/components/about_build_modal/about_build_modal.tsx b/webapp/channels/src/components/about_build_modal/about_build_modal.tsx index ff7c7bd6ab..69ef4a84ea 100644 --- a/webapp/channels/src/components/about_build_modal/about_build_modal.tsx +++ b/webapp/channels/src/components/about_build_modal/about_build_modal.tsx @@ -49,6 +49,7 @@ export default class AboutBuildModal extends React.PureComponent { doHide = () => { this.setState({show: false}); + this.props.onExited(); }; render() { @@ -172,7 +173,7 @@ export default class AboutBuildModal extends React.PureComponent { // Only show build number if it's a number (so only builds from Jenkins) let buildnumber: JSX.Element | null = ( -
+
{ {subTitle}

-
+
{ {'\u00a0' + mmversion}
-
+
{ tabIndex={0} > - +
diff --git a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap index 84b74087f6..7ece176a46 100644 --- a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap +++ b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/__snapshots__/top_channels_line_chart.test.tsx.snap @@ -222,7 +222,7 @@ exports[`components/activity_and_insights/insights/top_channels should match sna title={ } > @@ -237,7 +237,7 @@ exports[`components/activity_and_insights/insights/top_channels should match sna > Top Channels diff --git a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx index 8acab322b3..aa2d3d5bb4 100644 --- a/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx +++ b/webapp/channels/src/components/activity_and_insights/insights/top_channels/top_channels_line_chart/top_channels_line_chart.tsx @@ -115,7 +115,7 @@ const TopChannelsLineChart = ({topChannels, timeFrame, channelLineChartData, tim } diff --git a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap index 5685b6f279..ded545ccf4 100644 --- a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap +++ b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.jsx.snap @@ -353,6 +353,36 @@ exports[`components/DatabaseSettings should match snapshot 1`] = `
+
+ +
+ +
+ +
+
+
- - -`; diff --git a/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx b/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx index 424eb55c2b..34bb1d2a07 100644 --- a/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx +++ b/webapp/channels/src/components/admin_console/billing/billing_history.test.tsx @@ -5,11 +5,9 @@ import React from 'react'; import {Provider} from 'react-redux'; -import {shallow} from 'enzyme'; import {screen} from '@testing-library/react'; -import {renderWithIntlAndStore} from 'tests/react_testing_utils'; -import {mountWithIntl} from 'tests/helpers/intl-test-helper'; +import {renderWithIntl, renderWithIntlAndStore} from 'tests/react_testing_utils'; import mockStore from 'tests/test_store'; import {CloudLinks, HostedCustomerLinks} from 'utils/constants'; @@ -35,7 +33,7 @@ const invoiceA = { quantity: 1, price_per_unit: 1000, description: - '1 × Cloud Professional (at $10.00 / month)', + '1 × Cloud Professional (at $10.00 / month)', type: 'onpremise', metadata: {}, }, @@ -59,7 +57,7 @@ const invoiceB = { quantity: 1, price_per_unit: 1000, description: - 'Trial period for Cloud Professional', + 'Trial period for Cloud Professional', type: 'onpremise', metadata: {}, }, @@ -98,13 +96,21 @@ describe('components/admin_console/billing/billing_history', () => { const store = mockStore(state); - test('should match snapshot', () => { - const wrapper = shallow( + test('should match the default state of the component with given props', () => { + renderWithIntl( , ); - expect(wrapper).toMatchSnapshot(); + + expect(screen.queryByText('Billing History')).toBeInTheDocument(); + expect(screen.queryByText('Transactions')).toBeInTheDocument(); + expect(screen.queryByText('All of your invoices will be shown here')).toBeInTheDocument(); + expect(screen.getByTestId(invoiceA.number)).toHaveTextContent((invoiceA.total / 100.0).toString()); + expect(screen.getByTestId(invoiceB.number)).toHaveTextContent((invoiceB.total / 100.0).toString()); + + expect(screen.getByTestId(invoiceA.id)).toHaveTextContent('Pending'); + expect(screen.getByTestId(invoiceB.id)).toHaveTextContent('Paid'); }); test('Billing history section shows template when no invoices have been emitted yet', () => { @@ -113,42 +119,54 @@ describe('components/admin_console/billing/billing_history', () => { entities: {...state.entities, cloud: {invoices: {}, errors: {}}}, }; const storeNoBillingHistory = mockStore(noBillingHistoryState); - const wrapper = mountWithIntl( + renderWithIntl( , ); - const legend = wrapper.find( - '.BillingHistory__cardHeaderText-bottom span', - ); - expect(legend.text()).toBe(NO_INVOICES_LEGEND); + expect(screen.queryByText('Date')).not.toBeInTheDocument(); + expect(screen.queryByText('Description')).not.toBeInTheDocument(); + expect(screen.queryByText('Total')).not.toBeInTheDocument(); + expect(screen.queryByText('Status')).not.toBeInTheDocument(); + + expect(screen.queryByTestId(invoiceA.number)).not.toBeInTheDocument(); + expect(screen.queryByTestId(invoiceB.number)).not.toBeInTheDocument(); + + expect(screen.queryByTestId(invoiceA.id)).not.toBeInTheDocument(); + expect(screen.queryByTestId(invoiceB.id)).not.toBeInTheDocument(); + + expect(screen.getByRole('link')).toHaveAttribute('href', 'https://docs.mattermost.com/cloud/cloud-billing/cloud-billing.html?utm_source=mattermost&utm_medium=in-product-cloud&utm_content=billing_history&uid=current_user_id&sid='); + expect(screen.getByRole('link')).toHaveTextContent('See how billing works'); + expect(screen.getByTestId('no-invoices')).toHaveTextContent(NO_INVOICES_LEGEND); }); test('Billing history section shows two invoices to download', () => { - const wrapper = mountWithIntl( + renderWithIntl( , ); - const invoiceTableRows = wrapper.find('table.BillingHistory__table tr.BillingHistory__table-row'); + expect(screen.queryByText('Date')).toBeInTheDocument(); + expect(screen.queryByText('Description')).toBeInTheDocument(); + expect(screen.queryByText('Total')).toBeInTheDocument(); + expect(screen.queryByText('Status')).toBeInTheDocument(); - expect(invoiceTableRows.length).toBe(2); + expect(screen.getAllByTestId('billingHistoryTableRow')).toHaveLength(2); }); test('Billing history section download button has the target property set as _self so it works well in desktop app', () => { - const wrapper = mountWithIntl( + renderWithIntl( , ); - const invoiceTableRow = wrapper.find('table.BillingHistory__table tr.BillingHistory__table-row').at(0); - - const downloadLink = invoiceTableRow.find('td.BillingHistory__table-invoice a'); - - expect(downloadLink.prop('target')).toBe('_self'); + expect(screen.getByTestId(`billingHistoryLink-${invoiceA.id}`)).toHaveAttribute('target', '_self'); + expect(screen.getByTestId(`billingHistoryLink-${invoiceB.id}`)).toHaveAttribute('target', '_self'); + expect(screen.getByTestId(`billingHistoryLink-${invoiceA.id}`)).toHaveAttribute('href', '/api/v4/cloud/subscription/invoices/in_1KNb3DI67GP2qpb4ueaJYBt8/pdf'); + expect(screen.getByTestId(`billingHistoryLink-${invoiceB.id}`)).toHaveAttribute('href', '/api/v4/cloud/subscription/invoices/in_1KIWNTI67GP2qpb4KjGj1KAy/pdf'); }); }); @@ -191,30 +209,42 @@ describe('BillingHistory -- self-hosted', () => { entities: {...state.entities, hostedCustomer: {invoices: {invoices: {}, invoicesLoaded: true}, errors: {}}}, }; const storeNoBillingHistory = mockStore(noBillingHistoryState); - const wrapper = mountWithIntl( + renderWithIntl( , ); - const legend = wrapper.find( - '.BillingHistory__cardHeaderText-bottom span', - ); - expect(legend.text()).toBe(NO_INVOICES_LEGEND); + expect(screen.queryByText('Date')).not.toBeInTheDocument(); + expect(screen.queryByText('Description')).not.toBeInTheDocument(); + expect(screen.queryByText('Total')).not.toBeInTheDocument(); + expect(screen.queryByText('Status')).not.toBeInTheDocument(); + + expect(screen.queryByTestId(invoiceA.number)).not.toBeInTheDocument(); + expect(screen.queryByTestId(invoiceB.number)).not.toBeInTheDocument(); + + expect(screen.queryByTestId(invoiceA.id)).not.toBeInTheDocument(); + expect(screen.queryByTestId(invoiceB.id)).not.toBeInTheDocument(); + + expect(screen.getByRole('link')).toHaveAttribute('href', 'https://docs.mattermost.com/manage/self-hosted-billing.html?utm_source=mattermost&utm_medium=in-product&utm_content=billing_history&uid=current_user_id&sid='); + expect(screen.getByRole('link')).toHaveTextContent('See how billing works'); + expect(screen.getByTestId('no-invoices')).toHaveTextContent(NO_INVOICES_LEGEND); }); test('Billing history section shows two invoices to download', () => { const store = mockStore(state); - const wrapper = mountWithIntl( + renderWithIntl( , ); - const invoiceTableRows = wrapper.find('table.BillingHistory__table tr.BillingHistory__table-row'); - - expect(invoiceTableRows.length).toBe(2); + expect(screen.queryByText('Date')).toBeInTheDocument(); + expect(screen.queryByText('Description')).toBeInTheDocument(); + expect(screen.queryByText('Total')).toBeInTheDocument(); + expect(screen.queryByText('Status')).toBeInTheDocument(); + expect(screen.getAllByTestId('billingHistoryTableRow')).toHaveLength(2); }); }); diff --git a/webapp/channels/src/components/admin_console/billing/billing_history.tsx b/webapp/channels/src/components/admin_console/billing/billing_history.tsx index 512cea1e9e..f89bf195c6 100644 --- a/webapp/channels/src/components/admin_console/billing/billing_history.tsx +++ b/webapp/channels/src/components/admin_console/billing/billing_history.tsx @@ -39,6 +39,7 @@ export const NoBillingHistorySection = (props: NoBillingHistorySectionProps) => />
{ defaultMessage='Transactions' />
-
+
- +
- + - {getPaymentStatus(invoice.status)} + {getPaymentStatus(invoice.status)} e.stopPropagation()} diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx index ac6bdb6ef1..2f46aeb588 100644 --- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx +++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/index.tsx @@ -48,6 +48,7 @@ import { import LimitReachedBanner from './limit_reached_banner'; import CancelSubscription from './cancel_subscription'; import {ToYearlyNudgeBanner} from './to_yearly_nudge_banner'; +import {ToPaidNudgeBanner} from './to_paid_plan_nudge_banner'; import './billing_subscriptions.scss'; @@ -136,6 +137,7 @@ const BillingSubscriptions = () => { /> {shouldShowPaymentFailedBanner() && paymentFailedBanner()} {} + {} {showCreditCardBanner && isCardExpired && creditCardExpiredBanner(setShowCreditCardBanner)} diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.scss b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.scss new file mode 100644 index 0000000000..f49b2f2ab7 --- /dev/null +++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.scss @@ -0,0 +1,28 @@ +@import 'utils/mixins'; + +.ToPaidNudgeBanner { + &__actions { + padding-top: 12px; + } + + &__primary { + font-size: 12px; + + @include primary-button; + + &:hover { + color: var(--button-color); + } + } + + &__secondary { + margin-left: 4px; + font-size: 12px; + + @include tertiary-button; + + &:hover { + color: var(--button-bg); + } + } +} diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.test.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.test.tsx new file mode 100644 index 0000000000..ee783bcaaf --- /dev/null +++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.test.tsx @@ -0,0 +1,239 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import React from 'react'; +import {screen} from '@testing-library/react'; + +import {renderWithIntlAndStore} from 'tests/react_testing_utils'; +import {CloudProducts} from 'utils/constants'; + +import {ToPaidNudgeBanner, ToPaidPlanBannerDismissable} from './to_paid_plan_nudge_banner'; + +const initialState = { + views: { + announcementBar: { + announcementBarState: { + announcementBarCount: 1, + }, + }, + }, + entities: { + general: { + config: { + CWSURL: '', + FeatureFlagDeprecateCloudFree: 'true', + }, + license: { + IsLicensed: 'true', + Cloud: 'true', + }, + }, + users: { + currentUserId: 'current_user_id', + profiles: { + current_user_id: {roles: 'system_user'}, + }, + }, + preferences: { + myPreferences: {}, + }, + cloud: {}, + }, +}; + +describe('ToPaidPlanBannerDismissable', () => { + test('should only show for admins on cloud free', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.users.profiles = { + current_user_id: {roles: 'system_admin'}, + }; + state.entities.cloud = { + subscription: { + product_id: 'prod_starter', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_starter: { + id: 'prod_starter', + sku: CloudProducts.STARTER, + }, + }, + }; + + renderWithIntlAndStore(, state); + + screen.getByTestId('cloud-free-deprecation-announcement-bar'); + }); + + test('should NOT show for NON admins', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.users.profiles = { + current_user_id: {roles: 'system_user'}, + }; + state.entities.cloud = { + subscription: { + product_id: 'prod_starter', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_starter: { + id: 'prod_starter', + sku: CloudProducts.STARTER, + }, + }, + }; + + renderWithIntlAndStore(, state); + + expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow(); + }); + + test('should NOT show for admins on cloud pro', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.users.profiles = { + current_user_id: {roles: 'system_admin'}, + }; + state.entities.cloud = { + subscription: { + product_id: 'prod_pro', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_pro: { + id: 'prod_pro', + sku: CloudProducts.PROFESSIONAL, + }, + }, + }; + + renderWithIntlAndStore(, state); + + expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow(); + }); + + test('should NOT show for admins on cloud enterprise', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.users.profiles = { + current_user_id: {roles: 'system_admin'}, + }; + state.entities.cloud = { + subscription: { + product_id: 'prod_enterprise', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_enterprise: { + id: 'prod_enterprise', + sku: CloudProducts.ENTERPRISE, + }, + }, + }; + + renderWithIntlAndStore(, state); + + expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow(); + }); + + test('should NOT show for admins when banner was dismissed in preferences', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.users.profiles = { + current_user_id: {roles: 'system_admin'}, + }; + state.entities.preferences = { + myPreferences: { + 'to_paid_plan_nudge--nudge_to_paid_plan_snoozed': { + category: 'to_paid_plan_nudge', + name: 'nudge_to_paid_plan_snoozed', + value: '{"range": 0, "show": false}', + }, + }, + }; + + state.entities.cloud = { + subscription: { + product_id: 'prod_starter', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_starter: { + id: 'prod_starter', + sku: CloudProducts.STARTER, + }, + }, + }; + + renderWithIntlAndStore(, state); + + expect(() => screen.getByTestId('cloud-free-deprecation-announcement-bar')).toThrow(); + }); +}); + +describe('ToPaidNudgeBanner', () => { + test('should show only for cloud free', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.cloud = { + subscription: { + product_id: 'prod_starter', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_starter: { + id: 'prod_starter', + sku: CloudProducts.STARTER, + }, + }, + }; + + renderWithIntlAndStore(, state); + + screen.getByTestId('cloud-free-deprecation-alert-banner'); + }); + + test('should NOT show for cloud professional', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.cloud = { + subscription: { + product_id: 'prod_pro', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_pro: { + id: 'prod_pro', + sku: CloudProducts.PROFESSIONAL, + }, + }, + }; + + renderWithIntlAndStore(, state); + + expect(() => screen.getByTestId('cloud-free-deprecation-alert-banner')).toThrow(); + }); + + test('should NOT show for cloud enterprise', () => { + const state = JSON.parse(JSON.stringify(initialState)); + state.entities.cloud = { + subscription: { + product_id: 'prod_ent', + is_free_trial: 'false', + trial_end_at: 1, + }, + products: { + prod_ent: { + id: 'prod_ent', + sku: CloudProducts.ENTERPRISE, + }, + }, + }; + + renderWithIntlAndStore(, state); + + expect(() => screen.getByTestId('cloud-free-deprecation-alert-banner')).toThrow(); + }); +}); diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.tsx new file mode 100644 index 0000000000..06fda8eb9a --- /dev/null +++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_paid_plan_nudge_banner.tsx @@ -0,0 +1,246 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import React, {useEffect} from 'react'; +import {useDispatch, useSelector} from 'react-redux'; +import {useIntl, FormattedMessage} from 'react-intl'; +import moment from 'moment'; + +import AlertBanner from 'components/alert_banner'; +import useOpenPricingModal from 'components/common/hooks/useOpenPricingModal'; +import useOpenCloudPurchaseModal from 'components/common/hooks/useOpenCloudPurchaseModal'; +import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink'; +import AnnouncementBar from 'components/announcement_bar/default_announcement_bar'; + +import {getSubscriptionProduct as selectSubscriptionProduct} from 'mattermost-redux/selectors/entities/cloud'; +import {getCurrentUser, isCurrentUserSystemAdmin} from 'mattermost-redux/selectors/entities/users'; +import {savePreferences} from 'mattermost-redux/actions/preferences'; +import {deprecateCloudFree, get as getPreference} from 'mattermost-redux/selectors/entities/preferences'; + +import {AnnouncementBarTypes, CloudBanners, CloudProducts, Preferences} from 'utils/constants'; +import {t} from 'utils/i18n'; + +import {GlobalState} from '@mattermost/types/store'; + +import './to_paid_plan_nudge_banner.scss'; + +enum DismissShowRange { + GreaterThanEqual90 = '>=90', + BetweenNinetyAnd60 = '89-61', + SixtyTo31 = '60-31', + ThirtyTo11 = '30-11', + TenTo1 = '10-1', + Zero = '0' +} + +const cloudFreeCloseMoment = '20230727'; + +interface ToPaidPlanDismissPreference { + + // range represents the range for the days to the deprecation of cloud free e.g. in 30 to 10 days to deprecate cloud free + // Incase of dismissing the banner, range represents the time (days) period when this banner was dismissed. + // This is important because in case the banner was dismissed for a certain period, it helps us know that we should not show it again for that period. + range: DismissShowRange; + show: boolean; +} + +export const ToPaidPlanBannerDismissable = () => { + const dispatch = useDispatch(); + + const openPricingModal = useOpenPricingModal(); + + const currentUser = useSelector(getCurrentUser); + const isAdmin = useSelector(isCurrentUserSystemAdmin); + const product = useSelector(selectSubscriptionProduct); + const cloudFreeDeprecated = useSelector(deprecateCloudFree); + const currentProductStarter = product?.sku === CloudProducts.STARTER; + + const now = moment(Date.now()); + const cloudFreeEndDate = moment(cloudFreeCloseMoment, 'YYYYMMDD'); + const daysToCloudFreeEnd = cloudFreeEndDate.diff(now, 'days'); + + const snoozePreferenceVal = useSelector((state: GlobalState) => getPreference(state, Preferences.TO_PAID_PLAN_NUDGE, CloudBanners.NUDGE_TO_PAID_PLAN_SNOOZED, '{"range": 0, "show": true}')); + const snoozeInfo = JSON.parse(snoozePreferenceVal) as ToPaidPlanDismissPreference; + const show = snoozeInfo.show; + + const snoozedForRange = (range: DismissShowRange) => { + return snoozeInfo.range === range; + }; + + useEffect(() => { + if (!snoozeInfo.show) { + if (daysToCloudFreeEnd >= 90 && !snoozedForRange(DismissShowRange.GreaterThanEqual90)) { + showBanner(true); + } + + if (daysToCloudFreeEnd < 90 && daysToCloudFreeEnd > 60 && !snoozedForRange(DismissShowRange.BetweenNinetyAnd60)) { + showBanner(true); + } + + if (daysToCloudFreeEnd <= 60 && daysToCloudFreeEnd > 30 && !snoozedForRange(DismissShowRange.SixtyTo31)) { + showBanner(true); + } + + if (daysToCloudFreeEnd <= 30 && daysToCloudFreeEnd > 10 && !snoozedForRange(DismissShowRange.ThirtyTo11)) { + showBanner(true); + } + + if (daysToCloudFreeEnd <= 10) { + showBanner(true); + } + } + }, []); + + const showBanner = (show = false) => { + let dRange = DismissShowRange.Zero; + if (daysToCloudFreeEnd >= 90) { + dRange = DismissShowRange.GreaterThanEqual90; + } + + if (daysToCloudFreeEnd < 90 && daysToCloudFreeEnd > 60) { + dRange = DismissShowRange.BetweenNinetyAnd60; + } + + if (daysToCloudFreeEnd <= 60 && daysToCloudFreeEnd > 30) { + dRange = DismissShowRange.SixtyTo31; + } + + if (daysToCloudFreeEnd <= 30 && daysToCloudFreeEnd > 10) { + dRange = DismissShowRange.ThirtyTo11; + } + + // ideally this case should not happen because snooze button is not shown when TenTo1 days are remaining + if (daysToCloudFreeEnd <= 10 && daysToCloudFreeEnd > 0) { + dRange = DismissShowRange.TenTo1; + } + + const snoozeInfo: ToPaidPlanDismissPreference = { + range: dRange, + show, + }; + + dispatch(savePreferences(currentUser.id, [{ + category: Preferences.TO_PAID_PLAN_NUDGE, + name: CloudBanners.NUDGE_TO_PAID_PLAN_SNOOZED, + user_id: currentUser.id, + value: JSON.stringify(snoozeInfo), + }])); + }; + + if (!cloudFreeDeprecated) { + return null; + } + + if (!show) { + return null; + } + + if (!isAdmin) { + return null; + } + + if (!currentProductStarter) { + return null; + } + + let message = { + id: 'cloud_billing.nudge_to_paid.announcement_bar', + defaultMessage: 'Cloud Free will be deprecated on {date}. To keep your workspace, upgrade to a paid plan', + values: { + date: moment(cloudFreeCloseMoment, 'YYYYMMDD').format('MMMM DD, YYYY'), + }, + }; + + if (daysToCloudFreeEnd < 0) { + message = { + id: 'cloud_billing.nudge_to_paid.announcement_bar_deprecated', + defaultMessage: 'Cloud Free was deprecated. To keep your workspace, upgrade to a paid plan', + } as any; + } + + const announcementType = (daysToCloudFreeEnd <= 10) ? AnnouncementBarTypes.CRITICAL : AnnouncementBarTypes.ANNOUNCEMENT; + + return ( + 10} + onButtonClick={openPricingModal} + modalButtonText={t('cloud_billing.nudge_to_paid.view_plans')} + modalButtonDefaultText='View plans' + message={} + showLinkAsButton={true} + handleClose={showBanner} + /> + ); +}; + +export const ToPaidNudgeBanner = () => { + const {formatMessage} = useIntl(); + + const [openSalesLink] = useOpenSalesLink(); + const openPurchaseModal = useOpenCloudPurchaseModal({}); + + const product = useSelector(selectSubscriptionProduct); + const cloudFreeDeprecated = useSelector(deprecateCloudFree); + const currentProductStarter = product?.sku === CloudProducts.STARTER; + + if (!cloudFreeDeprecated) { + return null; + } + + if (!currentProductStarter) { + return null; + } + + const now = moment(Date.now()); + const cloudFreeEndDate = moment(cloudFreeCloseMoment, 'YYYYMMDD'); + const daysToCloudFreeEnd = cloudFreeEndDate.diff(now, 'days'); + + const title = ( + + ); + + const description = ( + + ); + + const viewPlansAction = ( + + ); + + const contactSalesAction = ( + + ); + + const bannerMode = (daysToCloudFreeEnd <= 10) ? 'danger' : 'info'; + + return ( + + ); +}; diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx index af797c5f92..e9061333a5 100644 --- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx +++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.test.tsx @@ -2,11 +2,9 @@ // See LICENSE.txt for license information. import React from 'react'; +import {screen} from '@testing-library/react'; -import {Provider} from 'react-redux'; - -import {mountWithIntl} from 'tests/helpers/intl-test-helper'; -import mockStore from 'tests/test_store'; +import {renderWithIntlAndStore} from 'tests/react_testing_utils'; import {CloudProducts, RecurringIntervals} from 'utils/constants'; import {ToYearlyNudgeBanner, ToYearlyNudgeBannerDismissable} from './to_yearly_nudge_banner'; @@ -42,7 +40,7 @@ const initialState = { }, }; -describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () => { +describe('ToYearlyNudgeBannerDismissable', () => { test('should show for admins cloud professional monthly', () => { const state = JSON.parse(JSON.stringify(initialState)); state.entities.users.profiles = { @@ -63,14 +61,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () = }, }; - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); + renderWithIntlAndStore(, state); - expect(wrapper.find('AnnouncementBar').exists()).toBe(true); + screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar'); }); test('should NOT show for NON admins', () => { @@ -93,14 +86,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () = }, }; - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); + renderWithIntlAndStore(, state); - expect(wrapper.find('AnnouncementBar').exists()).toBe(false); + expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow(); }); test('should NOT show for admins on cloud free', () => { @@ -123,14 +111,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () = }, }; - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); + renderWithIntlAndStore(, state); - expect(wrapper.find('AnnouncementBar').exists()).toBe(false); + expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow(); }); test('should NOT show for admins on cloud enterprise', () => { @@ -153,14 +136,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () = }, }; - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); + renderWithIntlAndStore(, state); - expect(wrapper.find('AnnouncementBar').exists()).toBe(false); + expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow(); }); test('should NOT show for admins on cloud pro annual', () => { @@ -182,15 +160,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () = }, }, }; + renderWithIntlAndStore(, state); - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); - - expect(wrapper.find('AnnouncementBar').exists()).toBe(false); + expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow(); }); test('should NOT show for admins when banner was dismissed in preferences', () => { @@ -200,10 +172,10 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () = }; state.entities.preferences = { myPreferences: { - 'cloud_yearly_nudge_banner--nudge_to_yearly_banner_dismissed': { - category: 'cloud_yearly_nudge_banner', - name: 'nudge_to_yearly_banner_dismissed', - value: 'true', + 'to_cloud_yearly_plan_nudge--nudge_to_cloud_yearly_plan_snoozed': { + category: 'to_cloud_yearly_plan_nudge', + name: 'nudge_to_cloud_yearly_plan_snoozed', + value: '{"range": 0, "show": false}', }, }, }; @@ -221,19 +193,13 @@ describe('components/admin_console/billing/ToYearlyNudgeBannerDismissable', () = }, }, }; + renderWithIntlAndStore(, state); - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); - - expect(wrapper.find('AnnouncementBar').exists()).toBe(false); + expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-announcement-bar')).toThrow(); }); }); -describe('components/admin_console/billing/ToYearlyNudgeBanner', () => { +describe('ToYearlyNudgeBanner', () => { test('should show for cloud professional monthly', () => { const state = JSON.parse(JSON.stringify(initialState)); state.entities.cloud = { @@ -251,14 +217,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBanner', () => { }, }; - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); + renderWithIntlAndStore(, state); - expect(wrapper.find('AlertBanner').exists()).toBe(true); + screen.getByTestId('cloud-pro-monthly-deprecation-alert-banner'); }); test('should NOT show for non cloud professional monthly', () => { @@ -278,13 +239,9 @@ describe('components/admin_console/billing/ToYearlyNudgeBanner', () => { }, }; - const store = mockStore(state); - const wrapper = mountWithIntl( - - - , - ); + renderWithIntlAndStore(, state); - expect(wrapper.find('AlertBanner').exists()).toBe(false); + expect(() => screen.getByTestId('cloud-pro-monthly-deprecation-alert-banner')).toThrow(); }); }); + diff --git a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx index 3cc1e8aa75..f2eac86e69 100644 --- a/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx +++ b/webapp/channels/src/components/admin_console/billing/billing_subscriptions/to_yearly_nudge_banner.tsx @@ -1,9 +1,10 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React from 'react'; +import React, {useEffect} from 'react'; import {useDispatch, useSelector} from 'react-redux'; import {useIntl, FormattedMessage} from 'react-intl'; +import moment from 'moment'; import AlertBanner from 'components/alert_banner'; import useOpenCloudPurchaseModal from 'components/common/hooks/useOpenCloudPurchaseModal'; @@ -22,12 +23,35 @@ import {GlobalState} from '@mattermost/types/store'; import './to_yearly_nudge_banner.scss'; +enum DismissShowRange { + GreaterThanEqual90 = '>=90', + BetweenNinetyAnd60 = '89-61', + SixtyTo31 = '60-31', + ThirtyTo11 = '30-11', + TenTo1 = '10-1', + Zero = '0' +} + +const cloudProMonthlyCloseMoment = '20230727'; + +interface ToYearlyPlanDismissPreference { + + // range represents the range for the days to the deprecation of cloud free e.g. in 30 to 10 days to deprecate cloud free + // Incase of dismissing the banner, range represents the time (days) period when this banner was dismissed. + // This is important because in case the banner was dismissed for a certain period, it helps us know that we should not show it again for that period. + range: DismissShowRange; + show: boolean; +} + const ToYearlyNudgeBannerDismissable = () => { const dispatch = useDispatch(); const openPurchaseModal = useOpenCloudPurchaseModal({}); - const nudgeDismissed = useSelector((state: GlobalState) => getPreference(state, Preferences.CLOUD_YEARLY_NUDGE_BANNER, CloudBanners.NUDGE_TO_YEARLY_BANNER_DISMISSED)) === 'true'; + const snoozePreferenceVal = useSelector((state: GlobalState) => getPreference(state, Preferences.TO_CLOUD_YEARLY_PLAN_NUDGE, CloudBanners.NUDGE_TO_CLOUD_YEARLY_PLAN_SNOOZED, '{"range": 0, "show": true}')); + const snoozeInfo = JSON.parse(snoozePreferenceVal) as ToYearlyPlanDismissPreference; + const show = snoozeInfo.show; + const currentUser = useSelector(getCurrentUser); const isAdmin = useSelector(isCurrentUserSystemAdmin); const product = useSelector(selectSubscriptionProduct); @@ -35,16 +59,75 @@ const ToYearlyNudgeBannerDismissable = () => { const currentProductIsMonthly = product?.recurring_interval === RecurringIntervals.MONTH; const currentProductProMonthly = currentProductProfessional && currentProductIsMonthly; - const savedDismissedPref = () => { + const now = moment(Date.now()); + const proMonthlyEndDate = moment(cloudProMonthlyCloseMoment, 'YYYYMMDD'); + const daysToProMonthlyEnd = proMonthlyEndDate.diff(now, 'days'); + + const snoozedForRange = (range: DismissShowRange) => { + return snoozeInfo.range === range; + }; + + useEffect(() => { + if (!snoozeInfo.show) { + if (daysToProMonthlyEnd >= 90 && !snoozedForRange(DismissShowRange.GreaterThanEqual90)) { + showBanner(true); + } + + if (daysToProMonthlyEnd < 90 && daysToProMonthlyEnd > 60 && !snoozedForRange(DismissShowRange.BetweenNinetyAnd60)) { + showBanner(true); + } + + if (daysToProMonthlyEnd <= 60 && daysToProMonthlyEnd > 30 && !snoozedForRange(DismissShowRange.SixtyTo31)) { + showBanner(true); + } + + if (daysToProMonthlyEnd <= 30 && daysToProMonthlyEnd > 10 && !snoozedForRange(DismissShowRange.ThirtyTo11)) { + showBanner(true); + } + + if (daysToProMonthlyEnd <= 10) { + showBanner(true); + } + } + }, []); + + const showBanner = (show = false) => { + let dRange = DismissShowRange.Zero; + if (daysToProMonthlyEnd >= 90) { + dRange = DismissShowRange.GreaterThanEqual90; + } + + if (daysToProMonthlyEnd < 90 && daysToProMonthlyEnd > 60) { + dRange = DismissShowRange.BetweenNinetyAnd60; + } + + if (daysToProMonthlyEnd <= 60 && daysToProMonthlyEnd > 30) { + dRange = DismissShowRange.SixtyTo31; + } + + if (daysToProMonthlyEnd <= 30 && daysToProMonthlyEnd > 10) { + dRange = DismissShowRange.ThirtyTo11; + } + + // ideally this case should not happen because snooze button is not shown when TenTo1 days are remaining + if (daysToProMonthlyEnd <= 10 && daysToProMonthlyEnd > 0) { + dRange = DismissShowRange.TenTo1; + } + + const snoozeInfo: ToYearlyPlanDismissPreference = { + range: dRange, + show, + }; + dispatch(savePreferences(currentUser.id, [{ - category: Preferences.CLOUD_YEARLY_NUDGE_BANNER, - name: CloudBanners.NUDGE_TO_YEARLY_BANNER_DISMISSED, + category: Preferences.TO_CLOUD_YEARLY_PLAN_NUDGE, + name: CloudBanners.NUDGE_TO_CLOUD_YEARLY_PLAN_SNOOZED, user_id: currentUser.id, - value: 'true', + value: JSON.stringify(snoozeInfo), }])); }; - if (nudgeDismissed) { + if (!show) { return null; } @@ -56,21 +139,30 @@ const ToYearlyNudgeBannerDismissable = () => { return null; } - const message = { - id: 'cloud_billing.nudge_to_yearly.announcement_bar', - defaultMessage: 'Simplify your billing and switch to an annual plan today', - }; + const message = ( + + ); + + const announcementType = (daysToProMonthlyEnd <= 10) ? AnnouncementBarTypes.CRITICAL : AnnouncementBarTypes.ANNOUNCEMENT; return ( 10} onButtonClick={() => openPurchaseModal({trackingLocation: 'to_yearly_nudge_annoucement_bar'})} modalButtonText={t('cloud_billing.nudge_to_yearly.learn_more')} modalButtonDefaultText='Learn more' - message={} + message={message} showLinkAsButton={true} - handleClose={savedDismissedPref} + handleClose={showBanner} /> ); }; @@ -90,17 +182,22 @@ const ToYearlyNudgeBanner = () => { return null; } + const now = moment(Date.now()); + const proMonthlyEndDate = moment(cloudProMonthlyCloseMoment, 'YYYYMMDD'); + const daysToProMonthlyEnd = proMonthlyEndDate.diff(now, 'days'); + const title = ( ); const description = ( ); @@ -122,9 +219,12 @@ const ToYearlyNudgeBanner = () => { ); + const bannerMode = (daysToProMonthlyEnd <= 10) ? 'danger' : 'info'; + return ( void; @@ -28,23 +28,35 @@ const DeleteFeedbackModal = (props: Props) => { defaultMessage: 'Delete Workspace', }); - const deleteFeedbackOptions = [ - props.intl.formatMessage({ - id: 'feedback.deleteWorkspace.feedbackNoValue', - defaultMessage: 'No longer found value', - }), - props.intl.formatMessage({ - id: 'feedback.deleteWorkspace.feedbackMoving', - defaultMessage: 'Moving to a different solution', - }), - props.intl.formatMessage({ - id: 'feedback.deleteWorkspace.feedbackMistake', - defaultMessage: 'Created a workspace by mistake', - }), - props.intl.formatMessage({ - id: 'feedback.deleteWorkspace.feedbackHosting', - defaultMessage: 'Moving to hosting my own Mattermost instance (self-hosted)', - }), + const deleteFeedbackOptions: FeedbackOption[] = [ + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.deleteWorkspace.feedbackNoValue', + defaultMessage: 'No longer found value', + }), + submissionValue: 'No longer found value', + }, + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.deleteWorkspace.feedbackMoving', + defaultMessage: 'Moving to a different solution', + }), + submissionValue: 'Moving to a different solution', + }, + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.deleteWorkspace.feedbackMistake', + defaultMessage: 'Created a workspace by mistake', + }), + submissionValue: 'Created a workspace by mistake', + }, + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.deleteWorkspace.feedbackHosting', + defaultMessage: 'Moving to hosting my own Mattermost instance (self-hosted)', + }), + submissionValue: 'Moving to hosting my own Mattermost instance (self-hosted)', + }, ]; return ( diff --git a/webapp/channels/src/components/admin_console/database_settings.jsx b/webapp/channels/src/components/admin_console/database_settings.jsx index e75e100c89..520cb8e2a7 100644 --- a/webapp/channels/src/components/admin_console/database_settings.jsx +++ b/webapp/channels/src/components/admin_console/database_settings.jsx @@ -4,7 +4,7 @@ import React from 'react'; import {FormattedMessage} from 'react-intl'; -import {recycleDatabaseConnection} from 'actions/admin_actions.jsx'; +import {recycleDatabaseConnection, ping} from 'actions/admin_actions'; import * as Utils from 'utils/utils'; import {t} from 'utils/i18n'; @@ -19,6 +19,15 @@ import TextSetting from './text_setting'; import MigrationsTable from './database'; export default class DatabaseSettings extends AdminSettings { + constructor(props) { + super(props); + + this.state = { + ...this.state, + searchBackend: '', + }; + } + getConfigFromState = (config) => { // driverName and dataSource are read-only from the UI @@ -34,6 +43,17 @@ export default class DatabaseSettings extends AdminSettings { return config; }; + componentDidMount() { + this.getSearchBackend().then((searchBackend) => { + this.setState({searchBackend}); + }); + } + + async getSearchBackend() { + const res = await ping()(); + return res.ActiveSearchBackend; + } + getStateFromConfig(config) { return { driverName: config.SqlSettings.DriverName, @@ -368,6 +388,30 @@ export default class DatabaseSettings extends AdminSettings {
+
+ +
+ +
+ +
+
+
); }; diff --git a/webapp/channels/src/components/admin_console/database_settings.test.jsx b/webapp/channels/src/components/admin_console/database_settings.test.jsx index b6e98f8a6c..936ee41d13 100644 --- a/webapp/channels/src/components/admin_console/database_settings.test.jsx +++ b/webapp/channels/src/components/admin_console/database_settings.test.jsx @@ -7,8 +7,14 @@ import {shallow} from 'enzyme'; import DatabaseSettings from 'components/admin_console/database_settings.jsx'; jest.mock('actions/admin_actions.jsx', () => { + const pingFn = () => { + return jest.fn(() => { + return {ActiveSearchBackend: 'none'}; + }); + }; return { recycleDatabaseConnection: jest.fn(), + ping: pingFn, }; }); diff --git a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx index 3c8a8f4697..987a3421f5 100644 --- a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx +++ b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.test.tsx @@ -69,7 +69,7 @@ describe('components/admin_console/license_settings/enterprise_edition/enterpris admin: { config: { ServiceSettings: { - SelfHostedExpansion: true, + SelfHostedPurchase: true, }, }, }, diff --git a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx index db8fba9cf8..790d3e2f9e 100644 --- a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx +++ b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx @@ -59,13 +59,13 @@ const EnterpriseEditionLeftPanel = ({ const canExpand = useCanSelfHostedExpand(); const selfHostedExpansionModal = useControlSelfHostedExpansionModal({trackingLocation: 'license_settings_add_seats'}); const expandableLink = useSelector(getExpandSeatsLink); - const isSelfHostedExpansionEnabled = useSelector(getConfig)?.ServiceSettings?.SelfHostedExpansion; + const isSelfHostedPurchaseEnabled = useSelector(getConfig)?.ServiceSettings?.SelfHostedPurchase; const query = useQuery(); const actionQueryParam = query.get('action'); useEffect(() => { - if (actionQueryParam === 'show_expansion_modal') { + if (actionQueryParam === 'show_expansion_modal' && canExpand && isSelfHostedPurchaseEnabled) { selfHostedExpansionModal.open(); } }, []); @@ -99,7 +99,7 @@ const EnterpriseEditionLeftPanel = ({ ); const handleClickAddSeats = () => { - if (!isSelfHostedExpansionEnabled || !canExpand) { + if (!isSelfHostedPurchaseEnabled || !canExpand) { window.open(expandableLink(unsanitizedLicense.Id), '_blank'); } else { selfHostedExpansionModal.open(); diff --git a/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx b/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx index ba97c6a2f0..17f13e3861 100644 --- a/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx +++ b/webapp/channels/src/components/admin_console/license_settings/trial_banner/trial_banner.tsx @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React, {useEffect, useState} from 'react'; +import React, {useEffect, useState, ReactNode} from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; import {useDispatch, useSelector} from 'react-redux'; @@ -106,7 +106,7 @@ const TrialBanner = ({ const dispatch = useDispatch(); - const btnText = (status: TrialLoadStatus): string => { + const btnText = (status: TrialLoadStatus) => { switch (status) { case TrialLoadStatus.Started: return formatMessage({id: 'start_trial.modal.gettingTrial', defaultMessage: 'Getting Trial...'}); @@ -115,7 +115,22 @@ const TrialBanner = ({ case TrialLoadStatus.Failed: return formatMessage({id: 'start_trial.modal.failed', defaultMessage: 'Failed'}); case TrialLoadStatus.Embargoed: - return formatMessage({id: 'admin.license.trial-request.embargoed'}); + return formatMessage( + { + id: 'admin.license.trial-request.embargoed', + defaultMessage: 'We were unable to process the request due to limitations for embargoed countries. Learn more in our documentation, or reach out to legal@mattermost.com for questions around export limitations.', + }, + { + link: (text: string) => ( + + {text} + + ), + }, + ); default: return formatMessage({id: 'admin.license.trial-request.startTrial', defaultMessage: 'Start trial'}); } diff --git a/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap b/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap index a13c3bb7ec..142bbd54a4 100644 --- a/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap +++ b/webapp/channels/src/components/admin_console/request_button/__snapshots__/request_button.test.tsx.snap @@ -20,7 +20,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > @@ -30,7 +30,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match >
@@ -42,7 +42,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match buttonText={ } disabled={false} @@ -55,7 +55,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match helpText={ } includeDetailedError={true} @@ -103,7 +103,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Button Text @@ -154,7 +154,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Help Text @@ -171,7 +171,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match buttonText={ } disabled={false} @@ -184,7 +184,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match helpText={ } includeDetailedError={false} @@ -240,7 +240,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Button Text @@ -291,7 +291,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Help Text @@ -308,7 +308,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match buttonText={ } disabled={false} @@ -321,7 +321,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match helpText={ } includeDetailedError={false} @@ -369,7 +369,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Button Text @@ -413,7 +413,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Help Text @@ -430,7 +430,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match buttonText={ } disabled={false} @@ -443,7 +443,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match helpText={ } includeDetailedError={false} @@ -499,7 +499,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Button Text @@ -513,7 +513,7 @@ exports[`components/admin_console/request_button/request_button.jsx should match > Help Text diff --git a/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx b/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx index f4ec173212..176669253f 100644 --- a/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx +++ b/webapp/channels/src/components/admin_console/request_button/request_button.test.tsx @@ -18,13 +18,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => { requestAction={emptyFunction} helpText={ } buttonText={ } @@ -42,13 +42,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => { requestAction={requestActionSuccess} helpText={ } buttonText={ } @@ -72,13 +72,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => { requestAction={requestActionSuccess} helpText={ } buttonText={ } @@ -102,13 +102,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => { requestAction={requestActionSuccess} helpText={ } buttonText={ } @@ -129,13 +129,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => { requestAction={requestActionSuccess} helpText={ } buttonText={ } @@ -164,13 +164,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => { requestAction={requestActionFailure} helpText={ } buttonText={ } @@ -191,13 +191,13 @@ describe('components/admin_console/request_button/request_button.jsx', () => { requestAction={requestActionFailure} helpText={ } buttonText={ } diff --git a/webapp/channels/src/components/admin_console/schema_admin_settings.jsx b/webapp/channels/src/components/admin_console/schema_admin_settings.jsx index d1b8886a8e..b35db711ef 100644 --- a/webapp/channels/src/components/admin_console/schema_admin_settings.jsx +++ b/webapp/channels/src/components/admin_console/schema_admin_settings.jsx @@ -671,7 +671,7 @@ export default class SchemaAdminSettings extends React.PureComponent { }; handleGeneratedChange = (id, s) => { - this.handleChange(id, s.replace('+', '-').replace('/', '_')); + this.handleChange(id, s.replace(/\+/g, '-').replace(/\//g, '_')); }; handleChange = (id, value, confirm = false, doSubmit = false, warning = false) => { diff --git a/webapp/channels/src/components/admin_console/server_logs/log_list.tsx b/webapp/channels/src/components/admin_console/server_logs/log_list.tsx index d73d3d4b4e..ce8fa09e16 100644 --- a/webapp/channels/src/components/admin_console/server_logs/log_list.tsx +++ b/webapp/channels/src/components/admin_console/server_logs/log_list.tsx @@ -95,7 +95,7 @@ export default class LogList extends React.PureComponent { ); const level: JSX.Element = ( ); diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap index f3da9ea817..a714b14a38 100644 --- a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap +++ b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_profile.test.tsx.snap @@ -213,9 +213,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho content="name" intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -242,6 +244,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud restore sho "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, @@ -457,9 +460,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc content="name" intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -486,6 +491,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, @@ -603,9 +609,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc id="sharedTooltip" intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -632,6 +640,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, @@ -834,9 +843,11 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc content="name" intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -863,6 +874,7 @@ exports[`admin_console/team_channel_settings/team/TeamProfile__Cloud should matc "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx index 3953977204..514597a354 100644 --- a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx +++ b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.test.tsx @@ -6,7 +6,7 @@ import {shallow} from 'enzyme'; import ChipsList, {ChipsInfoType} from 'components/admin_console/workspace-optimization/chips_list'; -import {ItemStatus} from './dashboard.data'; +import {ItemStatus} from './dashboard.type'; describe('components/admin_console/workspace-optimization/chips_list', () => { const overallScoreChips: ChipsInfoType = { diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx index 2dd06b5bc1..d9911f749b 100644 --- a/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx +++ b/webapp/channels/src/components/admin_console/workspace-optimization/chips_list.tsx @@ -6,7 +6,7 @@ import {FormattedMessage} from 'react-intl'; import Chip from 'components/common/chip/chip'; -import {ItemStatus} from './dashboard.data'; +import {ItemStatus} from './dashboard.type'; import './dashboard.scss'; diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx index dd5ee9b565..93bfad13b8 100644 --- a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.data.tsx @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React from 'react'; +import React, {useEffect, useMemo, useState} from 'react'; import {useIntl} from 'react-intl'; import {useSelector} from 'react-redux'; @@ -14,56 +14,23 @@ import { AccountMultipleOutlineIcon, } from '@mattermost/compass-icons/components'; -import {getLicense} from 'mattermost-redux/selectors/entities/general'; +import {getLicense, getServerVersion} from 'mattermost-redux/selectors/entities/general'; import {GlobalState} from '@mattermost/types/store'; -import {CloudLinks, ConsolePages, DocLinks} from 'utils/constants'; +import {ConsolePages} from 'utils/constants'; import {daysToLicenseExpire, isEnterpriseOrE20License, getIsStarterLicense} from '../../../utils/license_utils'; import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink'; +import {AdminConfig} from '@mattermost/types/config'; +import {runConfigChecks} from './dashboard_checks/config'; +import {DataModel, ItemStatus, Options} from './dashboard.type'; +import {runAccessChecks} from './dashboard_checks/access'; +import {runDataPrivacyChecks} from './dashboard_checks/data_privacy'; +import {runPerformanceChecks} from './dashboard_checks/performance'; +import {runEaseOfUseChecks} from './dashboard_checks/easy_management'; +import {runUpdateChecks} from './dashboard_checks/updates'; -export type DataModel = { - [key: string]: { - title: string; - description: string; - descriptionOk: string; - items: ItemModel[]; - icon: React.ReactNode; - hide?: boolean; - }; -} - -export enum ItemStatus { - NONE = 'none', - OK = 'ok', - INFO = 'info', - WARNING = 'warning', - ERROR = 'error', -} - -export type ItemModel = { - id: string; - title: string; - description: string; - status: ItemStatus; - scoreImpact: number; - impactModifier: number; - configUrl?: string; - configText?: string; - telemetryAction?: string; - infoUrl?: string; - infoText?: string; -} - -export type UpdatesParam = { - serverVersion: { - type: string; - status: ItemStatus; - description: string; - }; -} - -const impactModifiers: Record = { +export const impactModifiers: Record = { [ItemStatus.NONE]: 1, [ItemStatus.OK]: 1, [ItemStatus.INFO]: 0.5, @@ -71,11 +38,191 @@ const impactModifiers: Record = { [ItemStatus.ERROR]: 0, }; -const useMetricsData = () => { +const getUpdatesData = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => ({ + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.updates.title', + defaultMessage: 'Server updates', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.updates.description', + defaultMessage: 'An update is available.', + }), + descriptionOk: formatMessage({ + id: 'admin.reporting.workspace_optimization.updates.descriptionOk', + defaultMessage: 'Your workspace is completely up to date!', + }), + icon: ( +
+ +
+ ), + items: await runUpdateChecks(config, formatMessage, options), +}); + +const getConfigurationData = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => ({ + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.configuration.title', + defaultMessage: 'Configuration', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.configuration.description', + defaultMessage: 'You have configuration issues to resolve', + }), + hide: options.isCloud, + descriptionOk: formatMessage({ + id: 'admin.reporting.workspace_optimization.configuration.descriptionOk', + defaultMessage: 'You\'ve successfully configured SSL and Session Lengths!', + }), + icon: ( +
+ +
+ ), + items: await runConfigChecks(config, formatMessage, options), +}); + +const getAccessData = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => ({ + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.access.title', + defaultMessage: 'Workspace access', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.access.description', + defaultMessage: 'Web server configuration may be affecting access to your Mattermost workspace.', + }), + hide: options.isCloud, + descriptionOk: formatMessage({ + id: 'admin.reporting.workspace_optimization.access.descriptionOk', + defaultMessage: 'Your web server configuration is passing a live URL test!', + }), + icon: ( +
+ +
+ ), + items: await runAccessChecks(config, formatMessage), +}); + +const getPerformanceData = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => ({ + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.performance.title', + defaultMessage: 'Performance', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.performance.description', + defaultMessage: 'Your server would benefit from some performance tweaks.', + }), + hide: options.isCloud, + descriptionOk: formatMessage({ + id: 'admin.reporting.workspace_optimization.performance.descriptionOk', + defaultMessage: 'Your search performance suits your workspace usage!', + }), + icon: ( +
+ +
+ ), + items: await runPerformanceChecks(config, formatMessage, options), +}); + +const getDataPrivacyData = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => ({ + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.data_privacy.title', + defaultMessage: 'Data privacy', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.data_privacy.description', + defaultMessage: 'Get better insight and control over your data.', + }), + descriptionOk: formatMessage({ + id: 'admin.reporting.workspace_optimization.data_privacy.descriptionOk', + defaultMessage: 'You\'ve enabled data retention and compliance features!', + }), + icon: ( +
+ +
+ ), + items: await runDataPrivacyChecks(config, formatMessage, options), +}); + +const getEaseOfManagementData = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => ({ + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.ease_of_management.title', + defaultMessage: 'Ease of management', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.ease_of_management.description', + defaultMessage: 'Make it easier to manage your Mattermost workspace.', + }), + descriptionOk: formatMessage({ + id: 'admin.reporting.workspace_optimization.ease_of_management.descriptionOk', + defaultMessage: 'Your user authentication setup is appropriate based on your current usage!', + }), + icon: ( +
+ +
+ ), + items: await runEaseOfUseChecks(config, formatMessage, options), +}); + +const useMetricsData = ( + config: Partial, +) => { + const [loading, setLoading] = useState(true); + const [data, setData] = useState(undefined); + const {formatMessage} = useIntl(); const prevTrialLicense = useSelector((state: GlobalState) => state.entities.admin.prevTrialLicense); const license = useSelector(getLicense); + // get the currently installed server version + const installedVersion = useSelector((state: GlobalState) => getServerVersion(state)); + const analytics = useSelector((state: GlobalState) => state.entities.admin.analytics) as unknown as Options['analytics']; + const canStartTrial = license?.IsLicensed !== 'true' && prevTrialLicense?.IsLicensed !== 'true'; const daysUntilExpiration = daysToLicenseExpire(license) || -1; @@ -87,358 +234,46 @@ const useMetricsData = () => { const [, contactSalesLink] = useOpenSalesLink(); - const trialOrEnterpriseCtaConfig = { + const trialOrEnterpriseCtaConfig = useMemo(() => ({ configUrl: canStartTrial ? ConsolePages.LICENSE : contactSalesLink, configText: canStartTrial ? formatMessage({id: 'admin.reporting.workspace_optimization.cta.startTrial', defaultMessage: 'Start trial'}) : formatMessage({id: 'admin.reporting.workspace_optimization.cta.upgradeLicense', defaultMessage: 'Contact sales'}), + }), [canStartTrial, contactSalesLink, formatMessage]); + + const options: Options = useMemo(() => ({ + isLicensed, + isEnterpriseLicense, + trialOrEnterpriseCtaConfig, + isStarterLicense, + isCloud, + analytics, + installedVersion, + }), [isLicensed, isEnterpriseLicense, trialOrEnterpriseCtaConfig, isStarterLicense, isCloud, analytics, installedVersion]); + + useEffect(() => { + setLoading(true); + const refreshData = async () => { + const data = { + updates: await getUpdatesData(config, formatMessage, options), + configuration: await getConfigurationData(config, formatMessage, options), + access: await getAccessData(config, formatMessage, options), + performance: await getPerformanceData(config, formatMessage, options), + dataPrivacy: await getDataPrivacyData(config, formatMessage, options), + easyManagement: await getEaseOfManagementData(config, formatMessage, options), + }; + + return data; + }; + + refreshData().then((data) => { + setData(data); + setLoading(false); + }); + }, [config, formatMessage, options]); + + return { + data, + loading, }; - - const getUpdatesData = (data: UpdatesParam) => ({ - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.updates.title', - defaultMessage: 'Server updates', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.updates.description', - defaultMessage: 'An update is available.', - }), - descriptionOk: formatMessage({ - id: 'admin.reporting.workspace_optimization.updates.descriptionOk', - defaultMessage: 'Your workspace is completely up to date!', - }), - icon: ( -
- -
- ), - items: [ - { - id: 'server_version', - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.updates.server_version.status.title', - defaultMessage: '{type} version update available.', - }, {type: data.serverVersion.type}), - description: data.serverVersion.description, - configUrl: CloudLinks.DOWNLOAD_UPDATE, - configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.downloadUpdate', defaultMessage: 'Download update'}), - infoUrl: DocLinks.UPGRADE_SERVER, - infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - telemetryAction: 'server-version', - status: data.serverVersion.status, - scoreImpact: 15, - impactModifier: impactModifiers[data.serverVersion.status], - }, - ], - }); - - type ConfigurationParam = { - ssl: { - status: ItemStatus; - }; - sessionLength: { - status: ItemStatus; - }; - } - - const getConfigurationData = (data: ConfigurationParam) => ({ - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.configuration.title', - defaultMessage: 'Configuration', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.configuration.description', - defaultMessage: 'You have configuration issues to resolve', - }), - hide: isCloud, - descriptionOk: formatMessage({ - id: 'admin.reporting.workspace_optimization.configuration.descriptionOk', - defaultMessage: 'You\'ve successfully configured SSL and Session Lengths!', - }), - icon: ( -
- -
- ), - items: [ - { - id: 'ssl', - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.configuration.ssl.title', - defaultMessage: 'Configure SSL to make your server more secure', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.configuration.ssl.description', - defaultMessage: 'We strongly recommend securing your Mattermost workspace by configuring SSL in production environments.', - }), - infoUrl: DocLinks.SSL_CERTIFICATE, - infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - telemetryAction: 'ssl', - status: data.ssl.status, - scoreImpact: 25, - impactModifier: impactModifiers[data.ssl.status], - }, - { - id: 'session-length', - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.configuration.session_length.title', - defaultMessage: 'Session lengths is set to default', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.configuration.session_length.description', - defaultMessage: 'Your session length is set to the default of 30 days. A longer session length provides convenience, and a shorter session provides tighter security. We recommend adjusting this based on your organization\'s security policies.', - }), - configUrl: ConsolePages.SESSION_LENGTHS, - configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureSessionLength', defaultMessage: 'Configure session length'}), - infoUrl: DocLinks.SESSION_LENGTHS, - infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - telemetryAction: 'session-length', - status: data.sessionLength.status, - scoreImpact: 8, - impactModifier: impactModifiers[data.sessionLength.status], - }, - ], - }); - - type AccessParam = { - siteUrl: { - status: ItemStatus; - }; - } - - const getAccessData = (data: AccessParam) => ({ - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.access.title', - defaultMessage: 'Workspace access', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.access.description', - defaultMessage: 'Web server configuration may be affecting access to your Mattermost workspace.', - }), - hide: isCloud, - descriptionOk: formatMessage({ - id: 'admin.reporting.workspace_optimization.access.descriptionOk', - defaultMessage: 'Your web server configuration is passing a live URL test!', - }), - icon: ( -
- -
- ), - items: [ - { - id: 'site-url', - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.access.site_url.title', - defaultMessage: 'Misconfigured web server', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.access.site_url.description', - defaultMessage: 'Your web server settings aren\'t passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.', - }), - configUrl: ConsolePages.WEB_SERVER, - configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureWebServer', defaultMessage: 'Configure web server'}), - infoUrl: DocLinks.SITE_URL, - infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - telemetryAction: 'site-url', - status: data.siteUrl.status, - scoreImpact: 12, - impactModifier: impactModifiers[data.siteUrl.status], - }, - ], - }); - - type PerformanceParam = { - search: { - status: ItemStatus; - }; - } - - const getPerformanceData = (data: PerformanceParam) => ({ - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.performance.title', - defaultMessage: 'Performance', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.performance.description', - defaultMessage: 'Your server would benefit from some performance tweaks.', - }), - hide: isCloud, - descriptionOk: formatMessage({ - id: 'admin.reporting.workspace_optimization.performance.descriptionOk', - defaultMessage: 'Your search performance suits your workspace usage!', - }), - icon: ( -
- -
- ), - items: [ - { - id: 'search', - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.performance.search.title', - defaultMessage: 'Search performance', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.performance.search.description', - defaultMessage: 'Your server has reached over 500 users and 2 million posts which can result in slow search performance. We recommend enabling Elasticsearch for better performance.', - }), - ...(isLicensed && isEnterpriseLicense ? { - configUrl: ConsolePages.ELASTICSEARCH, - configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureElasticsearch', defaultMessage: 'Try Elasticsearch'}), - } : trialOrEnterpriseCtaConfig), - infoUrl: DocLinks.ELASTICSEARCH, - infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - telemetryAction: 'search-optimization', - status: data.search.status, - scoreImpact: 20, - impactModifier: impactModifiers[data.search.status], - }, - ], - }); - - type DataPrivacyParam = { - retention: { - status: ItemStatus; - }; - } - - // TBD - const getDataPrivacyData = (data: DataPrivacyParam) => ({ - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.data_privacy.title', - defaultMessage: 'Data privacy', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.data_privacy.description', - defaultMessage: 'Get better insight and control over your data.', - }), - descriptionOk: formatMessage({ - id: 'admin.reporting.workspace_optimization.data_privacy.descriptionOk', - defaultMessage: 'You\'ve enabled data retention and compliance features!', - }), - icon: ( -
- -
- ), - items: [ - { - id: 'data-retention', - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.data_privacy.retention.title', - defaultMessage: 'Become more data aware', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.data_privacy.retention.description', - defaultMessage: 'Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.', - }), - ...(isLicensed && isEnterpriseLicense ? { - configUrl: ConsolePages.DATA_RETENTION, - configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureDataRetention', defaultMessage: 'Try data retention'}), - } : trialOrEnterpriseCtaConfig), - infoUrl: DocLinks.DATA_RETENTION_POLICY, - infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - telemetryAction: 'data-retention', - status: data.retention.status, - scoreImpact: 16, - impactModifier: impactModifiers[data.retention.status], - }, - ], - }); - - type EaseOfManagementParam = { - ldap: { - status: ItemStatus; - }; - guestAccounts?: { - status: ItemStatus; - }; - } - - // TBD - const getEaseOfManagementData = (data: EaseOfManagementParam) => ({ - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.ease_of_management.title', - defaultMessage: 'Ease of management', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.ease_of_management.description', - defaultMessage: 'Make it easier to manage your Mattermost workspace.', - }), - descriptionOk: formatMessage({ - id: 'admin.reporting.workspace_optimization.ease_of_management.descriptionOk', - defaultMessage: 'Your user authentication setup is appropriate based on your current usage!', - }), - icon: ( -
- -
- ), - items: [ - { - id: 'ad-ldap', - title: formatMessage({ - id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.title', - defaultMessage: 'AD/LDAP integration recommended', - }), - description: formatMessage({ - id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.description', - defaultMessage: 'You\'ve reached over 100 users! We recommend setting up AD/LDAP user authentication for easier onboarding as well as automated deactivations and role assignments.', - }), - ...(isLicensed && !isStarterLicense ? { - configUrl: ConsolePages.AD_LDAP, - configText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.configureLDAP', defaultMessage: 'Try AD/LDAP'}), - } : trialOrEnterpriseCtaConfig), - infoUrl: DocLinks.AD_LDAP, - infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - telemetryAction: 'ad-ldap', - status: data.ldap.status, - scoreImpact: 22, - impactModifier: impactModifiers[data.ldap.status], - }, - - // commented out for now. - // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385 - // { - // id: 'guest-accounts', - // title: formatMessage({ - // id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.title', - // defaultMessage: 'Guest Accounts recommended', - // }), - // description: formatMessage({ - // id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.description', - // defaultMessage: 'Several user accounts are using different domains than your Site URL. You can control user access to channels and teams with guest accounts. We recommend starting an Enterprise trial and enabling Guest Access.', - // }), - // ...trialOrEnterpriseCtaConfig, - // infoUrl: 'https://docs.mattermost.com/onboard/guest-accounts.html', - // infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), - // telemetryAction: 'guest-accounts', - // status: data.guestAccounts.status, - // scoreImpact: 6, - // impactModifier: impactModifiers[data.guestAccounts.status], - // }, - ], - }); - - return {getAccessData, getConfigurationData, getUpdatesData, getPerformanceData, getDataPrivacyData, getEaseOfManagementData, isLicensed, isEnterpriseLicense}; }; export default useMetricsData; diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx index 6fcbd8b6f3..2409601512 100644 --- a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.tsx @@ -4,17 +4,11 @@ import {CheckIcon} from '@mattermost/compass-icons/components'; import classNames from 'classnames'; -import React, {useEffect, useState} from 'react'; -import {useIntl} from 'react-intl'; -import {useSelector} from 'react-redux'; +import React from 'react'; import styled from 'styled-components'; -import {GlobalState} from '@mattermost/types/store'; -import {getServerVersion} from 'mattermost-redux/selectors/entities/general'; -import {Client4} from 'mattermost-redux/client'; import Accordion, {AccordionItemType} from 'components/common/accordion/accordion'; -import {elasticsearchTest, ldapTest, testSiteURL} from '../../../actions/admin_actions'; import LoadingScreen from '../../loading_screen'; import FormattedAdminHeader from '../../widgets/admin_console/formatted_admin_header'; import {Props} from '../admin_console'; @@ -22,10 +16,11 @@ import {Props} from '../admin_console'; import ChipsList, {ChipsInfoType} from './chips_list'; import CtaButtons from './cta_buttons'; -import useMetricsData, {DataModel, ItemStatus, UpdatesParam} from './dashboard.data'; +import useMetricsData from './dashboard.data'; import './dashboard.scss'; import OverallScore from './overall-score'; +import {ItemStatus} from './dashboard.type'; const AccordionItem = styled.div` padding: 12px; @@ -49,180 +44,7 @@ const successIcon = ( ); const WorkspaceOptimizationDashboard = (props: Props) => { - const [loading, setLoading] = useState(true); - const [versionData, setVersionData] = useState({type: '', description: '', status: ItemStatus.NONE}); - - // const [guestAccountStatus, setGuestAccountStatus] = useState('none'); - const [liveUrlStatus, setLiveUrlStatus] = useState(ItemStatus.ERROR); - const [elastisearchStatus, setElasticsearchStatus] = useState(ItemStatus.INFO); - const [ldapStatus, setLdapStatus] = useState(ItemStatus.INFO); - const [dataRetentionStatus, setDataRetentionStatus] = useState(ItemStatus.INFO); - const {formatMessage} = useIntl(); - const {getAccessData, getConfigurationData, getUpdatesData, getPerformanceData, getDataPrivacyData, getEaseOfManagementData, isLicensed, isEnterpriseLicense} = useMetricsData(); - - // get the currently installed server version - const installedVersion = useSelector((state: GlobalState) => getServerVersion(state)); - const analytics = useSelector((state: GlobalState) => state.entities.admin.analytics); - const {TOTAL_USERS: totalUsers, TOTAL_POSTS: totalPosts} = analytics!; - - // gather locally available data - const { - ServiceSettings, - DataRetentionSettings, - ElasticsearchSettings, - LdapSettings, - - // TeamSettings, - // GuestAccountsSettings, - } = props.config; - const {location} = document; - - const sessionLengthWebInHours = ServiceSettings?.SessionLengthWebInHours || -1; - - const testURL = () => { - if (!ServiceSettings?.SiteURL) { - return Promise.resolve(); - } - - const onSuccess = ({status}: any) => setLiveUrlStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.ERROR); - const onError = () => setLiveUrlStatus(ItemStatus.ERROR); - return testSiteURL(onSuccess, onError, ServiceSettings?.SiteURL); - }; - - const testDataRetention = async () => { - if (!isLicensed || !isEnterpriseLicense) { - return Promise.resolve(); - } - - if (DataRetentionSettings?.EnableMessageDeletion || DataRetentionSettings?.EnableFileDeletion) { - setDataRetentionStatus(ItemStatus.OK); - return Promise.resolve(); - } - - const result = await fetch(`${Client4.getBaseRoute()}/data_retention/policies?page=0&per_page=0`).then((result) => result.json()); - - setDataRetentionStatus(result.total_count > 0 ? ItemStatus.OK : ItemStatus.INFO); - return Promise.resolve(); - }; - - const fetchVersion = async () => { - const result = await fetch(`${Client4.getBaseRoute()}/latest_version`).then((result) => result.json()); - - if (result.tag_name) { - const sanitizedVersion = result.tag_name.startsWith('v') ? result.tag_name.slice(1) : result.tag_name; - const newVersionParts = sanitizedVersion.split('.'); - const installedVersionParts = installedVersion.split('.').slice(0, 3); - - // quick general check if a newer version is available - let type = ''; - let status: ItemStatus = ItemStatus.OK; - - if (newVersionParts.join('') > installedVersionParts.join('')) { - // get correct values to be inserted into the accordion item - switch (true) { - case newVersionParts[0] > installedVersionParts[0]: - type = formatMessage({ - id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.major', - defaultMessage: 'Major', - }); - status = ItemStatus.ERROR; - break; - case newVersionParts[1] > installedVersionParts[1]: - type = formatMessage({ - id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.minor', - defaultMessage: 'Minor', - }); - status = ItemStatus.WARNING; - break; - case newVersionParts[2] > installedVersionParts[2]: - type = formatMessage({ - id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.patch', - defaultMessage: 'Patch', - }); - status = ItemStatus.INFO; - break; - } - } - - setVersionData({type, description: result.body, status}); - } - }; - - const testElasticsearch = () => { - if (!isLicensed || !isEnterpriseLicense || !(ElasticsearchSettings?.EnableIndexing && ElasticsearchSettings?.EnableSearching)) { - return Promise.resolve(); - } - - const onSuccess = ({status}: any) => setElasticsearchStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.INFO); - const onError = () => setElasticsearchStatus(ItemStatus.INFO); - - return elasticsearchTest(props.config, onSuccess, onError); - }; - - const testLdap = () => { - if (!isLicensed || !LdapSettings?.Enable) { - return Promise.resolve(); - } - - const onSuccess = ({status}: any) => setLdapStatus(status === 'OK' ? ItemStatus.OK : ItemStatus.INFO); - const onError = () => setLdapStatus(ItemStatus.INFO); - - return ldapTest(onSuccess, onError); - }; - - // commented out for now. - // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385 - // const fetchGuestAccounts = async () => { - // if (TeamSettings?.EnableOpenServer && GuestAccountsSettings?.Enable) { - // let usersArray = await fetch(`${Client4.getBaseRoute()}/users/invalid_emails`).then((result) => result.json()); - // - // // this setting is just a string with a list of domains, or an empty string - // if (GuestAccountsSettings?.RestrictCreationToDomains) { - // const domainList = GuestAccountsSettings?.RestrictCreationToDomains; - // usersArray = usersArray.filter(({email}: Record) => domainList.includes((email as string).split('@')[1])); - // } - // - // // if guest accounts make up more than 5% of the user base show the info accordion - // if (usersArray.length > (totalUsers as number * 0.05)) { - // setGuestAccountStatus(ItemStatus.INFO); - // return; - // } - // } - // - // setGuestAccountStatus(ItemStatus.OK); - // }; - - useEffect(() => { - const promises = []; - promises.push(testURL()); - promises.push(testLdap()); - promises.push(fetchVersion()); - promises.push(testElasticsearch()); - promises.push(testDataRetention()); - - // promises.push(fetchGuestAccounts()); - Promise.all(promises).then(() => setLoading(false)); - }, [props.config, isLicensed, isEnterpriseLicense]); - - const data: DataModel = { - updates: getUpdatesData({serverVersion: versionData}), - configuration: getConfigurationData({ - ssl: {status: location.protocol === 'https:' ? ItemStatus.OK : ItemStatus.ERROR}, - sessionLength: {status: sessionLengthWebInHours === 720 ? ItemStatus.INFO : ItemStatus.OK}, - }), - access: getAccessData({siteUrl: {status: liveUrlStatus}}), - performance: getPerformanceData({ - search: { - status: totalPosts < 2_000_000 && totalUsers < 500 ? ItemStatus.OK : elastisearchStatus, - }, - }), - dataPrivacy: getDataPrivacyData({retention: {status: dataRetentionStatus}}), - easyManagement: getEaseOfManagementData({ - ldap: {status: totalUsers < 100 ? ItemStatus.OK : ldapStatus}, - - // guestAccounts: {status: guestAccountStatus}, - }), - }; + const {data, loading} = useMetricsData(props.config); const overallScoreChips: ChipsInfoType = { [ItemStatus.INFO]: 0, @@ -236,7 +58,7 @@ const WorkspaceOptimizationDashboard = (props: Props) => { }; // eslint-disable-next-line @typescript-eslint/no-unused-vars - const accData: AccordionItemType[] = Object.entries(data).filter(([_, y]) => !y.hide).map(([accordionKey, accordionData]) => { + const accordionItemsData: AccordionItemType[] | undefined = data && Object.entries(data).filter(([_, y]) => !y.hide).map(([accordionKey, accordionData]) => { const accordionDataChips: ChipsInfoType = { [ItemStatus.INFO]: 0, [ItemStatus.WARNING]: 0, @@ -297,7 +119,7 @@ const WorkspaceOptimizationDashboard = (props: Props) => { }; }); - return loading ? : ( + return loading || !accordionItemsData ? : (
{ chartValue={Math.floor((overallScore.current / overallScore.max) * 100)} />
diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts new file mode 100644 index 0000000000..b87c9d1bdd --- /dev/null +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard.type.ts @@ -0,0 +1,75 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +export type DataModel = { + [key: string]: { + title: string; + description: string; + descriptionOk: string; + items: ItemModel[]; + icon: React.ReactNode; + hide?: boolean; + }; +} + +export enum ItemStatus { + + /** Return NONE if it's not relevant, not configured, or not an option */ + NONE = 'none', + + /** Return OK if all checks for this have passed */ + OK = 'ok', + + /** Return info if it might not be relevant to them, but they could utilize it */ + INFO = 'info', + WARNING = 'warning', + ERROR = 'error', +} + +export type ItemModel = { + id: string; + title: string; + description: string; + status: ItemStatus; + scoreImpact: number; + impactModifier: number; + configUrl?: string; + configText?: string; + telemetryAction?: string; + infoUrl?: string; + infoText?: string; +} + +export type UpdatesParam = { + serverVersion: { + type: string; + status: ItemStatus; + description: string; + }; +} + +type Analytics = { + DAILY_ACTIVE_USERS: number; + MONTHLY_ACTIVE_USERS: number; + TOTAL_INACTIVE_USERS: number; + TOTAL_MASTER_DB_CONNECTIONS: number; + TOTAL_POSTS: number; + TOTAL_PRIVATE_GROUPS: number; + TOTAL_PUBLIC_CHANNELS: number; + TOTAL_READ_DB_CONNECTIONS: number; + TOTAL_TEAMS: number; + TOTAL_USERS: number; + TOTAL_WEBSOCKET_CONNECTIONS: number; +} +export type Options = { + isLicensed: boolean; + isEnterpriseLicense: boolean; + trialOrEnterpriseCtaConfig: { + configUrl: string; + configText: string; + }; + isCloud: boolean; + isStarterLicense: boolean; + analytics: Analytics | undefined; + installedVersion: string; +}; diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts new file mode 100644 index 0000000000..e8f37024bb --- /dev/null +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/access.ts @@ -0,0 +1,66 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import {useIntl} from 'react-intl'; +import {ItemModel, ItemStatus} from '../dashboard.type'; +import {ConsolePages, DocLinks} from 'utils/constants'; +import {impactModifiers} from '../dashboard.data'; +import {AdminConfig} from '@mattermost/types/config'; +import {testSiteURL} from 'actions/admin_actions'; + +/** + * + * @description Checking to see if the siteURL is configured correctly by running it through the same "check siteURL" button that exists on the webserver page. + */ +const siteURLCheck = async (config: Partial, formatMessage: ReturnType['formatMessage']): Promise => { + let status = ItemStatus.OK; + const testURL = async () => { + if (!config.ServiceSettings?.SiteURL) { + status = ItemStatus.ERROR; + } + + const onSuccess = ({status: s}: any) => { + if (s === 'OK') { + status = ItemStatus.OK; + } + }; + const onError = () => { + status = ItemStatus.ERROR; + }; + await testSiteURL(onSuccess, onError, config.ServiceSettings?.SiteURL); + }; + + await testURL(); + return { + id: 'site-url', + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.access.site_url.title', + defaultMessage: 'Misconfigured web server', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.access.site_url.description', + defaultMessage: 'Your web server settings aren\'t passing a live URL test which means your workspace may not be accessible to users. We recommend updating your web server settings.', + }), + configUrl: ConsolePages.WEB_SERVER, + configText: formatMessage({id: 'admin.reporting.workspace_optimization.access.site_url.cta', defaultMessage: 'Configure web server'}), + infoUrl: DocLinks.SITE_URL, + infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), + telemetryAction: 'site-url', + status, + scoreImpact: 12, + impactModifier: impactModifiers[status], + }; +}; + +const checks = [ + siteURLCheck, +]; + +export const runAccessChecks = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], +) => { + const results = await Promise.all(checks.map((check) => check(config, formatMessage))); + return results; +}; + diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts new file mode 100644 index 0000000000..3cc59e7939 --- /dev/null +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/config.ts @@ -0,0 +1,84 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +/* eslint-disable @typescript-eslint/no-unused-vars */ + +import {AdminConfig} from '@mattermost/types/config'; +import {useIntl} from 'react-intl'; +import {ConsolePages, DocLinks} from 'utils/constants'; +import {ItemModel, ItemStatus, Options} from '../dashboard.type'; +import {impactModifiers} from '../dashboard.data'; + +/** + * + * @description This checks to see if the user's active session is done over https. This does not check if the server is configured to use https. + */ +const ssl = ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +): ItemModel => { + const status = document.location.protocol === 'https:' ? ItemStatus.OK : ItemStatus.ERROR; + + return { + id: 'ssl', + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.configuration.ssl.title', + defaultMessage: 'Configure SSL to make your server more secure', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.configuration.ssl.description', + defaultMessage: 'We strongly recommend securing your Mattermost workspace by configuring SSL in production environments.', + }), + infoUrl: DocLinks.SSL_CERTIFICATE, + infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), + telemetryAction: 'ssl', + status, + scoreImpact: 25, + impactModifier: impactModifiers[status], + }; +}; + +/** + * + * @description This checks to see if the user has adjusted the default session lengths to something other than 720 hours. + */ +const sessionLength = ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +): ItemModel => { + const status = config.ServiceSettings?.SessionLengthMobileInHours === 720 ? ItemStatus.INFO : ItemStatus.OK; + return { + id: 'session-length', + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.configuration.session_length.title', + defaultMessage: 'Session lengths is set to default', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.configuration.session_length.description', + defaultMessage: 'Your session length is set to the default of 30 days. A longer session length provides convenience, and a shorter session provides tighter security. We recommend adjusting this based on your organization\'s security policies.', + }), + configUrl: ConsolePages.SESSION_LENGTHS, + configText: formatMessage({id: 'admin.reporting.workspace_optimization.configuration.session_length.cta', defaultMessage: 'Configure session length'}), + infoUrl: DocLinks.SESSION_LENGTHS, + infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), + telemetryAction: 'session-length', + status, + scoreImpact: 8, + impactModifier: impactModifiers[status], + }; +}; + +export const runConfigChecks = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => { + const checks = [ + ssl, + sessionLength, + ]; + const results = await Promise.all(checks.map((check) => check(config, formatMessage, options))); + return results; +}; diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts new file mode 100644 index 0000000000..049f90015c --- /dev/null +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/data_privacy.ts @@ -0,0 +1,70 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import {useIntl} from 'react-intl'; +import {impactModifiers} from '../dashboard.data'; +import {ConsolePages, DocLinks} from 'utils/constants'; +import {Client4} from 'mattermost-redux/client'; +import {ItemStatus, Options} from '../dashboard.type'; +import {AdminConfig} from '@mattermost/types/config'; + +/** + * + * @description Checks if they they have a global policy deletion enabled, or if a custom policy has been created. + */ +const dataRetentionCheck = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => { + const testDataRetention = async ( + config: Partial, + options: Options, + ) => { + if (!options.isLicensed || !options.isEnterpriseLicense) { + return ItemStatus.INFO; + } + + if (config.DataRetentionSettings?.EnableMessageDeletion || config.DataRetentionSettings?.EnableFileDeletion) { + return ItemStatus.OK; + } + + const policyCount: {total_count: number} = await fetch(`${Client4.getBaseRoute()}/data_retention/policies_count`).then((result) => result.json()); + return policyCount.total_count > 0 ? ItemStatus.OK : ItemStatus.INFO; + }; + + const status = await testDataRetention(config, options); + return { + id: 'data-retention', + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.data_privacy.retention.title', + defaultMessage: 'Become more data aware', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.data_privacy.retention.description', + defaultMessage: 'Organizations in highly regulated industries require more control and insight with their data. We recommend enabling Data Retention and Compliance features.', + }), + ...(options.isLicensed && options.isEnterpriseLicense ? { + configUrl: ConsolePages.DATA_RETENTION, + configText: formatMessage({id: 'admin.reporting.workspace_optimization.data_privacy.retention.cta', defaultMessage: 'Try data retention'}), + } : options.trialOrEnterpriseCtaConfig), + infoUrl: DocLinks.DATA_RETENTION_POLICY, + infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), + telemetryAction: 'data-retention', + status, + scoreImpact: 16, + impactModifier: impactModifiers[status], + }; +}; + +export const runDataPrivacyChecks = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => { + const checks = [ + dataRetentionCheck, + ]; + const results = await Promise.all(checks.map((check) => check(config, formatMessage, options))); + return results; +}; diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts new file mode 100644 index 0000000000..1a959918ad --- /dev/null +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts @@ -0,0 +1,129 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import {AdminConfig} from '@mattermost/types/config'; +import {useIntl} from 'react-intl'; +import {ItemModel, ItemStatus, Options} from '../dashboard.type'; +import {ConsolePages, DocLinks} from 'utils/constants'; +import {impactModifiers} from '../dashboard.data'; + +// import {Client4} from 'mattermost-redux/client'; +// import {AnalyticsRow} from '@mattermost/types/admin'; +import {ldapTest} from 'actions/admin_actions'; + +const usesLDAP = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +): Promise => { + const testLdap = async ( + config: Partial, + options: Options, + ): Promise => { + let check = ItemStatus.INFO; + + if (!options.isLicensed || !config.LdapSettings?.Enable) { + return check; + } + + const onSuccess = ({status}: any) => { + if (status === 'OK') { + check = ItemStatus.OK; + } + }; + + await ldapTest(onSuccess); + + return check; + }; + + // something feels flawed in this check. + const status = options.analytics?.TOTAL_USERS as number > 100 ? await testLdap(config, options) : ItemStatus.OK; + + return { + id: 'ad-ldap', + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.title', + defaultMessage: 'AD/LDAP integration recommended', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.description', + defaultMessage: 'You\'ve reached over 100 users! We recommend setting up AD/LDAP user authentication for easier onboarding as well as automated deactivations and role assignments.', + }), + ...(options.isLicensed && !options.isStarterLicense ? { + configUrl: ConsolePages.AD_LDAP, + configText: formatMessage({id: 'admin.reporting.workspace_optimization.ease_of_management.ldap.cta', defaultMessage: 'Try AD/LDAP'}), + } : options.trialOrEnterpriseCtaConfig), + infoUrl: DocLinks.AD_LDAP, + infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), + telemetryAction: 'ad-ldap', + status, + scoreImpact: 22, + impactModifier: impactModifiers[status], + }; +}; + +// // commented out for now. +// // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385 +// const fetchGuestAccounts = async ( +// config: Partial, +// analytics: Record | undefined, +// ) => { +// if (config.TeamSettings?.EnableOpenServer && config.GuestAccountsSettings?.Enable) { +// let usersArray = await fetch(`${Client4.getBaseRoute()}/users/invalid_emails`).then((result) => result.json()); + +// // this setting is just a string with a list of domains, or an empty string +// if (config.GuestAccountsSettings?.RestrictCreationToDomains) { +// const domainList = config.GuestAccountsSettings?.RestrictCreationToDomains; +// usersArray = usersArray.filter(({email}: Record) => domainList.includes((email as string).split('@')[1])); +// } + +// // if guest accounts make up more than 5% of the user base show the info accordion +// if (analytics && usersArray.length > (analytics.totalUsers as number * 0.05)) { +// return ItemStatus.INFO; +// } +// } + +// return ItemStatus.OK; +// }; + +// const guestAccounts = async ( +// config: Partial, +// formatMessage: ReturnType['formatMessage'], +// options: Options, +// ): Promise => { +// const status = await fetchGuestAccounts(config, options.analytics); +// return { +// id: 'guest-accounts', +// title: formatMessage({ +// id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.title', +// defaultMessage: 'Guest Accounts recommended', +// }), +// description: formatMessage({ +// id: 'admin.reporting.workspace_optimization.ease_of_management.guests_accounts.description', +// defaultMessage: 'Several user accounts are using different domains than your Site URL. You can control user access to channels and teams with guest accounts. We recommend starting an Enterprise trial and enabling Guest Access.', +// }), +// ...options.trialOrEnterpriseCtaConfig, +// infoUrl: 'https://docs.mattermost.com/onboard/guest-accounts.html', +// infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), +// telemetryAction: 'guest-accounts', +// status, +// scoreImpact: 6, +// impactModifier: impactModifiers[status], +// }; +// }; + +export const runEaseOfUseChecks = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +): Promise => { + const checks = [ + usesLDAP, + + // guestAccounts, + ]; + + const results = await Promise.all(checks.map((check) => check(config, formatMessage, options))); + return results; +}; diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts new file mode 100644 index 0000000000..50d7f6f662 --- /dev/null +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/performance.ts @@ -0,0 +1,72 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import {AdminConfig} from '@mattermost/types/config'; +import {ItemModel, ItemStatus, Options} from '../dashboard.type'; +import {elasticsearchTest} from 'actions/admin_actions'; +import {useIntl} from 'react-intl'; +import {ConsolePages, DocLinks} from 'utils/constants'; +import {impactModifiers} from '../dashboard.data'; + +const search = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +): Promise => { + const testElasticsearch = async ( + config: Partial, + options: Options, + ) => { + let check = ItemStatus.INFO; + + if (!options.isLicensed || !options.isEnterpriseLicense || !(config.ElasticsearchSettings?.EnableIndexing && config.ElasticsearchSettings?.EnableSearching)) { + return check; + } + + const onSuccess = ({status}: any) => { + if (status === 'OK') { + check = ItemStatus.OK; + } + }; + await elasticsearchTest(config, onSuccess); + return check; + }; + + const totalPosts = options.analytics?.TOTAL_POSTS as number; + const totalUsers = options.analytics?.TOTAL_USERS as number; + const status = totalPosts < 2_000_000 && totalUsers < 500 ? ItemStatus.OK : await testElasticsearch(config, options); + return { + id: 'search', + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.performance.search.title', + defaultMessage: 'Search performance', + }), + description: formatMessage({ + id: 'admin.reporting.workspace_optimization.performance.search.description', + defaultMessage: 'Your server has reached over 500 users and 2 million posts which can result in slow search performance. We recommend enabling Elasticsearch for better performance.', + }), + ...(options.isLicensed && options.isEnterpriseLicense ? { + configUrl: ConsolePages.ELASTICSEARCH, + configText: formatMessage({id: 'admin.reporting.workspace_optimization.search.cta', defaultMessage: 'Try Elasticsearch'}), + } : options.trialOrEnterpriseCtaConfig), + infoUrl: DocLinks.ELASTICSEARCH, + infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), + telemetryAction: 'search-optimization', + status, + scoreImpact: 20, + impactModifier: impactModifiers[status], + }; +}; + +export const runPerformanceChecks = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => { + const checks = [ + search, + ]; + + const results = await Promise.all(checks.map((check) => check(config, formatMessage, options))); + return results; +}; diff --git a/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts new file mode 100644 index 0000000000..438e358f6d --- /dev/null +++ b/webapp/channels/src/components/admin_console/workspace-optimization/dashboard_checks/updates.ts @@ -0,0 +1,94 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import {Client4} from 'mattermost-redux/client'; +import {ItemStatus, Options} from '../dashboard.type'; +import {useIntl} from 'react-intl'; +import {AdminConfig} from '@mattermost/types/config'; +import {CloudLinks, DocLinks} from 'utils/constants'; +import {impactModifiers} from '../dashboard.data'; + +const testServerVersion = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => { + const fetchVersion = async ( + installedVersion: string, + formatMessage: ReturnType['formatMessage'], + ) => { + const result = await fetch(`${Client4.getBaseRoute()}/latest_version`).then((result) => result.json()); + + if (result.tag_name) { + const sanitizedVersion = result.tag_name.startsWith('v') ? result.tag_name.slice(1) : result.tag_name; + const newVersionParts = sanitizedVersion.split('.'); + const installedVersionParts = installedVersion.split('.').slice(0, 3); + + // quick general check if a newer version is available + let type = ''; + let status: ItemStatus = ItemStatus.OK; + + if (newVersionParts.join('') > installedVersionParts.join('')) { + // get correct values to be inserted into the accordion item + switch (true) { + case newVersionParts[0] > installedVersionParts[0]: + type = formatMessage({ + id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.major', + defaultMessage: 'Major', + }); + status = ItemStatus.ERROR; + break; + case newVersionParts[1] > installedVersionParts[1]: + type = formatMessage({ + id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.minor', + defaultMessage: 'Minor', + }); + status = ItemStatus.WARNING; + break; + case newVersionParts[2] > installedVersionParts[2]: + type = formatMessage({ + id: 'admin.reporting.workspace_optimization.updates.server_version.update_type.patch', + defaultMessage: 'Patch', + }); + status = ItemStatus.INFO; + break; + } + } + + return {type, description: result.body, status}; + } + + return {type: '', description: '', status: ItemStatus.OK}; + }; + + const serverVersion = await fetchVersion(options.installedVersion, formatMessage); + return { + id: 'server_version', + title: formatMessage({ + id: 'admin.reporting.workspace_optimization.updates.server_version.status.title', + defaultMessage: '{type} version update available.', + }, {type: serverVersion.type}), + description: serverVersion.description, + configUrl: CloudLinks.DOWNLOAD_UPDATE, + configText: formatMessage({id: 'admin.reporting.workspace_optimization.updates.server_version.cta', defaultMessage: 'Download update'}), + infoUrl: DocLinks.UPGRADE_SERVER, + infoText: formatMessage({id: 'admin.reporting.workspace_optimization.cta.learnMore', defaultMessage: 'Learn more'}), + telemetryAction: 'server-version', + status: serverVersion.status, + scoreImpact: 15, + impactModifier: impactModifiers[serverVersion.status], + }; +}; + +export const runUpdateChecks = async ( + config: Partial, + formatMessage: ReturnType['formatMessage'], + options: Options, +) => { + const checks = [ + testServerVersion, + ]; + + const results = await Promise.all(checks.map((check) => check(config, formatMessage, options))); + return results; +}; diff --git a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx index ef81ba5823..ee907be96f 100644 --- a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx +++ b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.test.jsx @@ -40,6 +40,7 @@ describe('components/AdvancedCreateComment', () => { uploadsInProgress: [{}], fileInfos: [{}, {}, {}], }, + isRemoteDraft: false, enableAddButton: true, ctrlSend: false, latestPostId, @@ -84,9 +85,10 @@ describe('components/AdvancedCreateComment', () => { test('should match snapshot, empty comment', () => { const draft = emptyDraft; + const isRemoteDraft = false; const enableAddButton = false; const ctrlSend = true; - const props = {...baseProps, draft, enableAddButton, ctrlSend}; + const props = {...baseProps, draft, isRemoteDraft, enableAddButton, ctrlSend}; const wrapper = shallow( , @@ -104,8 +106,9 @@ describe('components/AdvancedCreateComment', () => { uploadsInProgress: [], fileInfos: [], }; + const isRemoteDraft = false; const ctrlSend = true; - const props = {...baseProps, ctrlSend, draft, clearCommentDraftUploads, onResetHistoryIndex, getChannelMemberCountsByGroup}; + const props = {...baseProps, ctrlSend, draft, isRemoteDraft, clearCommentDraftUploads, onResetHistoryIndex, getChannelMemberCountsByGroup}; const wrapper = shallow( , diff --git a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx index b0679ea814..63c2a57bd5 100644 --- a/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx +++ b/webapp/channels/src/components/advanced_create_comment/advanced_create_comment.tsx @@ -13,6 +13,7 @@ import * as GlobalActions from 'actions/global_actions'; import Constants, {AdvancedTextEditor as AdvancedTextEditorConst, Locations, ModalIdentifiers, Preferences} from 'utils/constants'; import {PreferenceType} from '@mattermost/types/preferences'; +import * as Keyboard from 'utils/keyboard'; import * as UserAgent from 'utils/user_agent'; import * as Utils from 'utils/utils'; import { @@ -73,6 +74,9 @@ type Props = { // The current draft of the comment draft: PostDraft; + // Data used for knowing if the draft came from a WS event + isRemoteDraft: boolean; + // Determines if the submit button should be rendered enableAddButton?: boolean; @@ -232,8 +236,14 @@ class AdvancedCreateComment extends React.PureComponent { const rootChanged = props.rootId !== state.rootId; const messageInHistoryChanged = props.messageInHistory !== state.messageInHistory; - if (rootChanged || messageInHistoryChanged || props.draft.remote) { - updatedState = {...updatedState, draft: {...props.draft, uploadsInProgress: rootChanged ? [] : props.draft.uploadsInProgress}}; + if (rootChanged || messageInHistoryChanged || (props.isRemoteDraft && props.draft.message !== state.draft?.message)) { + updatedState = { + ...updatedState, + draft: { + ...props.draft, + uploadsInProgress: rootChanged ? [] : props.draft.uploadsInProgress, + }, + }; } return updatedState; @@ -251,6 +261,7 @@ class AdvancedCreateComment extends React.PureComponent { serverError: null, showFormat: false, isFormattingBarHidden: props.isFormattingBarHidden, + caretPosition: props.draft.caretPosition, }; this.textboxRef = React.createRef(); @@ -342,7 +353,6 @@ class AdvancedCreateComment extends React.PureComponent { const updatedDraft = { ...this.state.draft, show: !isDraftEmpty(this.state.draft), - remote: false, } as PostDraft; this.props.onUpdateCommentDraft(updatedDraft, true); @@ -355,7 +365,6 @@ class AdvancedCreateComment extends React.PureComponent { draft: { ...prev.draft, show: !isDraftEmpty(prev.draft), - remote: false, } as PostDraft, }; } @@ -819,11 +828,11 @@ class AdvancedCreateComment extends React.PureComponent { handleKeyDown = (e: React.KeyboardEvent) => { const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey; - const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.BACK_SLASH); + const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.BACK_SLASH); - const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey; - const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey; - const shiftAltCombo = !Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey; + const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey; + const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey; + const shiftAltCombo = !Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey; // listen for line break key combo and insert new line character if (Utils.isUnhandledLineBreakKeyCombo(e)) { @@ -838,7 +847,7 @@ class AdvancedCreateComment extends React.PureComponent { if ( (this.props.ctrlSend || this.props.codeBlockOnCtrlEnter) && - Utils.isKeyPressed(e, KeyCodes.ENTER) && + Keyboard.isKeyPressed(e, KeyCodes.ENTER) && (e.ctrlKey || e.metaKey) ) { this.setShowPreview(false); @@ -849,7 +858,7 @@ class AdvancedCreateComment extends React.PureComponent { const draft = this.state.draft!; const {message} = draft; - if (Utils.isKeyPressed(e, KeyCodes.ESCAPE)) { + if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE)) { this.textboxRef.current?.blur(); } @@ -858,7 +867,7 @@ class AdvancedCreateComment extends React.PureComponent { !e.metaKey && !e.altKey && !e.shiftKey && - Utils.isKeyPressed(e, KeyCodes.UP) && + Keyboard.isKeyPressed(e, KeyCodes.UP) && message === '' ) { e.preventDefault(); @@ -879,13 +888,13 @@ class AdvancedCreateComment extends React.PureComponent { } = e.target as TextboxElement; if (ctrlKeyCombo) { - if (Utils.isKeyPressed(e, KeyCodes.UP)) { + if (Keyboard.isKeyPressed(e, KeyCodes.UP)) { e.preventDefault(); this.props.onMoveHistoryIndexBack(); - } else if (Utils.isKeyPressed(e, KeyCodes.DOWN)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.DOWN)) { e.preventDefault(); this.props.onMoveHistoryIndexForward(); - } else if (Utils.isKeyPressed(e, KeyCodes.B)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.B)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -894,7 +903,7 @@ class AdvancedCreateComment extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.I)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.I)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -905,7 +914,7 @@ class AdvancedCreateComment extends React.PureComponent { }); } } else if (ctrlAltCombo) { - if (Utils.isKeyPressed(e, KeyCodes.K)) { + if (Keyboard.isKeyPressed(e, KeyCodes.K)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -914,7 +923,7 @@ class AdvancedCreateComment extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.C)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.C)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -923,21 +932,21 @@ class AdvancedCreateComment extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.E)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.E)) { e.stopPropagation(); e.preventDefault(); this.toggleEmojiPicker(); - } else if (Utils.isKeyPressed(e, KeyCodes.T)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.T)) { e.stopPropagation(); e.preventDefault(); this.toggleAdvanceTextEditor(); - } else if (Utils.isKeyPressed(e, KeyCodes.P) && draft.message.length) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.P) && draft.message.length) { e.stopPropagation(); e.preventDefault(); this.setShowPreview(!this.props.shouldShowPreview); } } else if (shiftAltCombo) { - if (Utils.isKeyPressed(e, KeyCodes.X)) { + if (Keyboard.isKeyPressed(e, KeyCodes.X)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -946,7 +955,7 @@ class AdvancedCreateComment extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.SEVEN)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.SEVEN)) { e.preventDefault(); this.applyMarkdown({ markdownMode: 'ol', @@ -954,7 +963,7 @@ class AdvancedCreateComment extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.EIGHT)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.EIGHT)) { e.preventDefault(); this.applyMarkdown({ markdownMode: 'ul', @@ -962,7 +971,7 @@ class AdvancedCreateComment extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.NINE)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.NINE)) { e.preventDefault(); this.applyMarkdown({ markdownMode: 'quote', diff --git a/webapp/channels/src/components/advanced_create_comment/index.ts b/webapp/channels/src/components/advanced_create_comment/index.ts index 75095246ec..065683f481 100644 --- a/webapp/channels/src/components/advanced_create_comment/index.ts +++ b/webapp/channels/src/components/advanced_create_comment/index.ts @@ -64,6 +64,7 @@ function makeMapStateToProps() { const err = state.requests.posts.createPost.error || {}; const draft = getPostDraft(state, StoragePrefixes.COMMENT_DRAFT, ownProps.rootId); + const isRemoteDraft = state.views.drafts.remotes[`${StoragePrefixes.COMMENT_DRAFT}${ownProps.rootId}`] || false; const channelMembersCount = getAllChannelStats(state)[ownProps.channelId] ? getAllChannelStats(state)[ownProps.channelId].member_count : 1; const messageInHistory = getMessageInHistoryItem(state); @@ -91,6 +92,7 @@ function makeMapStateToProps() { return { currentTeamId, draft, + isRemoteDraft, messageInHistory, channelMembersCount, currentUserId, @@ -121,11 +123,11 @@ function makeMapStateToProps() { } function makeOnUpdateCommentDraft(rootId: string, channelId: string) { - return (draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId, remote: false} : draft, save); + return (draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId} : draft, save); } function makeUpdateCommentDraftWithRootId(channelId: string) { - return (rootId: string, draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId, remote: false} : draft, save); + return (rootId: string, draft?: PostDraft, save = false) => updateCommentDraft(rootId, draft ? {...draft, channelId} : draft, save); } type Actions = { diff --git a/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx b/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx index 76ebc7bf4f..eb04b8a1d2 100644 --- a/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx +++ b/webapp/channels/src/components/advanced_create_post/advanced_create_post.test.jsx @@ -115,6 +115,7 @@ function advancedCreatePost({ fullWidthTextBox={fullWidthTextBox} currentChannelMembersCount={currentChannelMembersCount} draft={draft} + isRemoteDraft={false} recentPostIdInChannel={recentPostIdInChannel} latestReplyablePostId={latestReplyablePostId} locale={locale} diff --git a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx index 630ad71188..bf333ccb43 100644 --- a/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx +++ b/webapp/channels/src/components/advanced_create_post/advanced_create_post.tsx @@ -22,6 +22,7 @@ import Constants, { Preferences, AdvancedTextEditor as AdvancedTextEditorConst, } from 'utils/constants'; +import * as Keyboard from 'utils/keyboard'; import { containsAtChannel, specialMentionsInText, @@ -34,7 +35,6 @@ import { } from 'utils/post_utils'; import {getTable, hasHtmlLink, formatMarkdownMessage, formatGithubCodePaste, isGitHubCodeBlock} from 'utils/paste'; import * as UserAgent from 'utils/user_agent'; -import {isMac} from 'utils/utils'; import * as Utils from 'utils/utils'; import EmojiMap from 'utils/emoji_map'; import {applyMarkdown, ApplyMarkdownOptions} from 'utils/markdown/apply_markdown'; @@ -124,6 +124,9 @@ type Props = { // Data used for populating message state from previous draft draft: PostDraft; + // Data used for knowing if the draft came from a WS event + isRemoteDraft: boolean; + // Data used dispatching handleViewAction ex: edit post latestReplyablePostId?: string; locale: string; @@ -279,7 +282,7 @@ class AdvancedCreatePost extends React.PureComponent { }; if ( props.currentChannel.id !== state.currentChannel.id || - (props.draft.remote && props.draft.message !== state.message) + (props.isRemoteDraft && props.draft.message !== state.message) ) { updatedState = { ...updatedState, @@ -294,8 +297,8 @@ class AdvancedCreatePost extends React.PureComponent { constructor(props: Props) { super(props); this.state = { - message: this.props.draft.message, - caretPosition: this.props.draft.message.length, + message: props.draft.message, + caretPosition: props.draft.message.length, submitting: false, showEmojiPicker: false, uploadsProgressPercent: {}, @@ -387,7 +390,6 @@ class AdvancedCreatePost extends React.PureComponent { this.draftsForChannel[channelId] = { ...draft, show: !isDraftEmpty(draft), - remote: false, } as PostDraft; } } @@ -1096,7 +1098,7 @@ class AdvancedCreatePost extends React.PureComponent { documentKeyHandler = (e: KeyboardEvent) => { const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey; - const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.BACK_SLASH); + const lastMessageReactionKeyCombo = ctrlOrMetaKeyPressed && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.BACK_SLASH); if (lastMessageReactionKeyCombo) { this.reactToLastMessage(e); return; @@ -1134,12 +1136,12 @@ class AdvancedCreatePost extends React.PureComponent { const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey; const ctrlEnterKeyCombo = (this.props.ctrlSend || this.props.codeBlockOnCtrlEnter) && - Utils.isKeyPressed(e, KeyCodes.ENTER) && + Keyboard.isKeyPressed(e, KeyCodes.ENTER) && ctrlOrMetaKeyPressed; - const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey; - const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey; - const shiftAltCombo = !Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey; + const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey; + const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey; + const shiftAltCombo = !Keyboard.cmdOrCtrlPressed(e) && e.shiftKey && e.altKey; // listen for line break key combo and insert new line character if (Utils.isUnhandledLineBreakKeyCombo(e)) { @@ -1155,7 +1157,7 @@ class AdvancedCreatePost extends React.PureComponent { const {message} = this.state; - if (Utils.isKeyPressed(e, KeyCodes.ESCAPE)) { + if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE)) { this.textboxRef.current?.blur(); } @@ -1164,7 +1166,7 @@ class AdvancedCreatePost extends React.PureComponent { !e.metaKey && !e.altKey && !e.shiftKey && - Utils.isKeyPressed(e, KeyCodes.UP) && + Keyboard.isKeyPressed(e, KeyCodes.UP) && message === '' ) { e.preventDefault(); @@ -1182,15 +1184,15 @@ class AdvancedCreatePost extends React.PureComponent { } = e.target as TextboxElement; if (ctrlKeyCombo) { - if (draftMessageIsEmpty && Utils.isKeyPressed(e, KeyCodes.UP)) { + if (draftMessageIsEmpty && Keyboard.isKeyPressed(e, KeyCodes.UP)) { e.stopPropagation(); e.preventDefault(); this.loadPrevMessage(e); - } else if (draftMessageIsEmpty && Utils.isKeyPressed(e, KeyCodes.DOWN)) { + } else if (draftMessageIsEmpty && Keyboard.isKeyPressed(e, KeyCodes.DOWN)) { e.stopPropagation(); e.preventDefault(); this.loadNextMessage(e); - } else if (Utils.isKeyPressed(e, KeyCodes.B)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.B)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -1199,7 +1201,7 @@ class AdvancedCreatePost extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.I)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.I)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -1210,7 +1212,7 @@ class AdvancedCreatePost extends React.PureComponent { }); } } else if (ctrlAltCombo) { - if (Utils.isKeyPressed(e, KeyCodes.K)) { + if (Keyboard.isKeyPressed(e, KeyCodes.K)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -1219,7 +1221,7 @@ class AdvancedCreatePost extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.C)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.C)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -1228,21 +1230,21 @@ class AdvancedCreatePost extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.E)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.E)) { e.stopPropagation(); e.preventDefault(); this.toggleEmojiPicker(); - } else if (Utils.isKeyPressed(e, KeyCodes.T)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.T)) { e.stopPropagation(); e.preventDefault(); this.toggleAdvanceTextEditor(); - } else if (Utils.isKeyPressed(e, KeyCodes.P) && message.length) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.P) && message.length) { e.stopPropagation(); e.preventDefault(); this.setShowPreview(!this.props.shouldShowPreview); } } else if (shiftAltCombo) { - if (Utils.isKeyPressed(e, KeyCodes.X)) { + if (Keyboard.isKeyPressed(e, KeyCodes.X)) { e.stopPropagation(); e.preventDefault(); this.applyMarkdown({ @@ -1251,7 +1253,7 @@ class AdvancedCreatePost extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.SEVEN)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.SEVEN)) { e.preventDefault(); this.applyMarkdown({ markdownMode: 'ol', @@ -1259,7 +1261,7 @@ class AdvancedCreatePost extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.EIGHT)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.EIGHT)) { e.preventDefault(); this.applyMarkdown({ markdownMode: 'ul', @@ -1267,7 +1269,7 @@ class AdvancedCreatePost extends React.PureComponent { selectionEnd, message: value, }); - } else if (Utils.isKeyPressed(e, KeyCodes.NINE)) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.NINE)) { e.preventDefault(); this.applyMarkdown({ markdownMode: 'quote', @@ -1277,21 +1279,21 @@ class AdvancedCreatePost extends React.PureComponent { }); } } - const upKeyOnly = !ctrlOrMetaKeyPressed && !e.altKey && !e.shiftKey && Utils.isKeyPressed(e, KeyCodes.UP); - const shiftUpKeyCombo = !ctrlOrMetaKeyPressed && !e.altKey && e.shiftKey && Utils.isKeyPressed(e, KeyCodes.UP); - const ctrlShiftCombo = Utils.cmdOrCtrlPressed(e, true) && e.shiftKey; + const upKeyOnly = !ctrlOrMetaKeyPressed && !e.altKey && !e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.UP); + const shiftUpKeyCombo = !ctrlOrMetaKeyPressed && !e.altKey && e.shiftKey && Keyboard.isKeyPressed(e, KeyCodes.UP); + const ctrlShiftCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.shiftKey; if (upKeyOnly && messageIsEmpty) { this.editLastPost(e); } else if (shiftUpKeyCombo && messageIsEmpty) { this.replyToLastPost(e); - } else if (ctrlShiftCombo && Utils.isKeyPressed(e, KeyCodes.E)) { + } else if (ctrlShiftCombo && Keyboard.isKeyPressed(e, KeyCodes.E)) { e.stopPropagation(); e.preventDefault(); this.toggleEmojiPicker(); - } else if (((isMac() && ctrlShiftCombo) || (!isMac() && ctrlAltCombo)) && Utils.isKeyPressed(e, KeyCodes.P) && this.state.message.length) { + } else if (((UserAgent.isMac() && ctrlShiftCombo) || (!UserAgent.isMac() && ctrlAltCombo)) && Keyboard.isKeyPressed(e, KeyCodes.P) && this.state.message.length) { this.setShowPreview(!this.props.shouldShowPreview); - } else if (ctrlAltCombo && Utils.isKeyPressed(e, KeyCodes.T)) { + } else if (ctrlAltCombo && Keyboard.isKeyPressed(e, KeyCodes.T)) { this.toggleAdvanceTextEditor(); } }; diff --git a/webapp/channels/src/components/advanced_create_post/index.ts b/webapp/channels/src/components/advanced_create_post/index.ts index e6559e9a5b..c582f2316b 100644 --- a/webapp/channels/src/components/advanced_create_post/index.ts +++ b/webapp/channels/src/components/advanced_create_post/index.ts @@ -77,6 +77,7 @@ function makeMapStateToProps() { const currentChannel = getCurrentChannel(state) || {}; const currentChannelTeammateUsername = getUser(state, currentChannel.teammate_id || '')?.username; const draft = getChannelDraft(state, currentChannel.id); + const isRemoteDraft = state.views.drafts.remotes[`${StoragePrefixes.DRAFT}${currentChannel.id}`] || false; const latestReplyablePostId = getLatestReplyablePostId(state); const currentChannelMembersCount = getCurrentChannelStats(state) ? getCurrentChannelStats(state).member_count : 1; const enableEmojiPicker = config.EnableEmojiPicker === 'true'; @@ -117,6 +118,7 @@ function makeMapStateToProps() { showSendTutorialTip, messageInHistoryItem: getMessageInHistoryItem(state), draft, + isRemoteDraft, latestReplyablePostId, locale: getCurrentLocale(state), currentUsersLatestPost: getCurrentUsersLatestPost(state, ''), @@ -181,12 +183,7 @@ function setDraft(key: string, value: PostDraft, draftChannelId: string, save = const channelId = draftChannelId || getCurrentChannelId(getState()); let updatedValue = null; if (value) { - updatedValue = {...value}; - updatedValue = { - ...value, - channelId, - remote: false, - }; + updatedValue = {...value, channelId}; } if (updatedValue) { return dispatch(updateDraft(key, updatedValue, '', save)); diff --git a/webapp/channels/src/components/alert_banner.tsx b/webapp/channels/src/components/alert_banner.tsx index ebd3adaae8..b091a555ec 100644 --- a/webapp/channels/src/components/alert_banner.tsx +++ b/webapp/channels/src/components/alert_banner.tsx @@ -21,6 +21,7 @@ import './alert_banner.scss'; export type ModeType = 'danger' | 'warning' | 'info' | 'success'; export type AlertBannerProps = { + id?: string; mode: ModeType; title?: React.ReactNode; message?: React.ReactNode; @@ -35,6 +36,7 @@ export type AlertBannerProps = { } const AlertBanner = ({ + id, mode, title, message, @@ -70,6 +72,7 @@ const AlertBanner = ({ return (
{ let cloudDelinquencyAnnouncementBar = null; let notifyAdminDowngradeDelinquencyBar = null; let toYearlyNudgeBannerDismissable = null; + let toPaidPlanNudgeBannerDismissable = null; if (this.props.license?.Cloud === 'true') { paymentAnnouncementBar = ( @@ -89,6 +91,7 @@ class AnnouncementBarController extends React.PureComponent { ); toYearlyNudgeBannerDismissable = (); + toPaidPlanNudgeBannerDismissable = (); } let autoStartTrialModal = null; @@ -108,6 +111,7 @@ class AnnouncementBarController extends React.PureComponent { {cloudDelinquencyAnnouncementBar} {notifyAdminDowngradeDelinquencyBar} {toYearlyNudgeBannerDismissable} + {toPaidPlanNudgeBannerDismissable} {this.props.license?.Cloud !== 'true' && } {autoStartTrialModal} diff --git a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx index e9fcd6ba46..f03effb517 100644 --- a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx +++ b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/cloud_trial_announcement_bar.tsx @@ -18,6 +18,8 @@ import PricingModal from 'components/pricing_modal'; import {ModalData} from 'types/actions'; +import {AlertCircleOutlineIcon, AlertOutlineIcon} from '@mattermost/compass-icons/components'; + import { Preferences, CloudBanners, @@ -38,6 +40,7 @@ type Props = { daysLeftOnTrial: number; isCloud: boolean; subscription?: Subscription; + reverseTrial: boolean; actions: { savePreferences: (userId: string, preferences: PreferenceType[]) => void; getCloudSubscription: () => void; @@ -132,15 +135,34 @@ class CloudTrialAnnouncementBar extends React.PureComponent { return null; } - const trialMoreThan3DaysMsg = ( + let trialMoreThan7DaysMsg = ( ); - const trialLessThan3DaysMsg = ( + let modalButtonText = t('admin.billing.subscription.cloudTrial.subscribeButton'); + let modalButtonDefaultText = 'Upgrade Now'; + + if (this.props.reverseTrial) { + modalButtonText = t('admin.billing.subscription.cloudReverseTrial.subscribeButton'); + modalButtonDefaultText = 'Review your options'; + } + + if (this.props.reverseTrial) { + const trialEnd = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'MMMM Do'); + trialMoreThan7DaysMsg = ( + + ); + } + + let trialLessThan7DaysMsg = ( { /> ); - const userEndTrialDate = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'MMMM Do YYYY'); - const userEndTrialHour = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'HH:mm:ss', this.props.currentUser.timezone?.automaticTimezone as string); + if (this.props.reverseTrial) { + trialLessThan7DaysMsg = ( + + ); + } - const trialLastDaysMsg = ( + const userEndTrialDate = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'MMMM Do YYYY'); + const userEndTrialHour = getLocaleDateFromUTC((this.props.subscription?.trial_end_at as number / 1000), 'HH:mm', this.props.currentUser.timezone?.automaticTimezone as string); + + let trialLastDaysMsg = ( { /> ); + if (this.props.reverseTrial) { + trialLastDaysMsg = ( + + ); + } + let bannerMessage; let icon; - switch (daysLeftOnTrial) { - case TrialPeriodDays.TRIAL_WARNING_THRESHOLD: - case TrialPeriodDays.TRIAL_2_DAYS: - bannerMessage = trialLessThan3DaysMsg; - break; - case TrialPeriodDays.TRIAL_1_DAY: - case TrialPeriodDays.TRIAL_0_DAYS: + + if (daysLeftOnTrial >= TrialPeriodDays.TRIAL_2_DAYS && daysLeftOnTrial <= TrialPeriodDays.TRIAL_WARNING_THRESHOLD) { + bannerMessage = trialLessThan7DaysMsg; + icon = ; + } else if (daysLeftOnTrial <= TrialPeriodDays.TRIAL_1_DAY && daysLeftOnTrial >= TrialPeriodDays.TRIAL_0_DAYS) { bannerMessage = trialLastDaysMsg; - break; - default: - bannerMessage = trialMoreThan3DaysMsg; - icon = ; - break; + icon = ; + } else { + bannerMessage = trialMoreThan7DaysMsg; + icon = ; } const dismissable = this.isDismissable(); @@ -184,8 +223,8 @@ class CloudTrialAnnouncementBar extends React.PureComponent { showCloseButton={dismissable} handleClose={this.handleClose} onButtonClick={this.showModal} - modalButtonText={t('admin.billing.subscription.cloudTrial.subscribeButton')} - modalButtonDefaultText={'Upgrade Now'} + modalButtonText={modalButtonText} + modalButtonDefaultText={modalButtonDefaultText} message={bannerMessage} showLinkAsButton={true} icon={icon} diff --git a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts index 9b6bbfc443..3d7e4fd871 100644 --- a/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts +++ b/webapp/channels/src/components/announcement_bar/cloud_trial_announcement_bar/index.ts @@ -21,6 +21,7 @@ import {Preferences, TrialPeriodDays} from 'utils/constants'; import {getRemainingDaysFromFutureTimestamp} from 'utils/utils'; import CloudTrialAnnouncementBar from './cloud_trial_announcement_bar'; +import {getConfig} from 'mattermost-redux/selectors/entities/admin'; function mapStateToProps(state: GlobalState) { const getCategory = makeGetCategory(); @@ -29,6 +30,7 @@ function mapStateToProps(state: GlobalState) { const isCloud = getLicense(state).Cloud === 'true'; let isFreeTrial = false; let daysLeftOnTrial = 0; + const config = getConfig(state); if (isCloud && subscription?.is_free_trial === 'true') { isFreeTrial = true; @@ -46,6 +48,7 @@ function mapStateToProps(state: GlobalState) { isCloud, subscription, preferences: getCategory(state, Preferences.CLOUD_TRIAL_BANNER), + reverseTrial: Boolean(config.FeatureFlags?.CloudReverseTrial), }; } diff --git a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx index b6a0a0b572..5c8ef4c5f1 100644 --- a/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx +++ b/webapp/channels/src/components/announcement_bar/configuration_bar/configuration_bar.tsx @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React from 'react'; +import React, {ReactNode} from 'react'; import {FormattedMessage, injectIntl, IntlShape} from 'react-intl'; import {Link} from 'react-router-dom'; @@ -395,7 +395,7 @@ const ConfigurationAnnouncementBar = (props: Props) => { defaultMessage = 'Please configure your site URL on the System Console.'; } - const values = { + const values: Record = { linkSite: (msg: string) => ( { style={barStyle} // eslint-disable-next-line react/no-unknown-property css={{gridArea: 'announcement'}} + data-testid={this.props.id} > { const {formatMessage} = useIntl(); @@ -48,10 +46,7 @@ const AppBarMarketplace = () => { aria-label={label} onClick={handleOpenMarketplace} > - + ); diff --git a/webapp/channels/src/components/apps_form/apps_form_component.tsx b/webapp/channels/src/components/apps_form/apps_form_component.tsx index a83eb11274..f682058ece 100644 --- a/webapp/channels/src/components/apps_form/apps_form_component.tsx +++ b/webapp/channels/src/components/apps_form/apps_form_component.tsx @@ -234,7 +234,7 @@ export class AppsForm extends React.PureComponent { const errorResponse = res.error; const errMsg = errorResponse.text || intl.formatMessage({ id: 'apps.error.unknown', - defaultMessage: 'Unknown error.', + defaultMessage: 'Unknown error occurred.', }); this.setState({ fieldErrors: { @@ -256,7 +256,7 @@ export class AppsForm extends React.PureComponent { case AppCallResponseTypes.NAVIGATE: { const errMsg = intl.formatMessage({ id: 'apps.error.responses.unexpected_type', - defaultMessage: 'App response type was not expected. Response type: {type}.', + defaultMessage: 'App response type was not expected. Response type: {type}', }, { type: callResp.type, }, @@ -338,7 +338,7 @@ export class AppsForm extends React.PureComponent { case AppCallResponseTypes.NAVIGATE: this.updateErrors([], undefined, this.props.intl.formatMessage({ id: 'apps.error.responses.unexpected_type', - defaultMessage: 'App response type was not expected. Response type: {type}.', + defaultMessage: 'App response type was not expected. Response type: {type}', }, { type: callResponse.type, })); diff --git a/webapp/channels/src/components/apps_form/apps_form_container.tsx b/webapp/channels/src/components/apps_form/apps_form_container.tsx index 2a816bb5d8..3e018f2e81 100644 --- a/webapp/channels/src/components/apps_form/apps_form_container.tsx +++ b/webapp/channels/src/components/apps_form/apps_form_container.tsx @@ -48,7 +48,7 @@ class AppsFormContainer extends React.PureComponent { }; const {form} = this.state; if (!form) { - const errMsg = this.props.intl.formatMessage({id: 'apps.error.form.no_form', defaultMessage: '`form` is not defined'}); + const errMsg = this.props.intl.formatMessage({id: 'apps.error.form.no_form', defaultMessage: '`form` is not defined.'}); return {error: makeCallErrorResponse(makeErrorMsg(errMsg))}; } if (!form.submit) { @@ -97,7 +97,7 @@ class AppsFormContainer extends React.PureComponent { refreshOnSelect = async (field: AppField, values: AppFormValues): Promise> => { const makeErrMsg = (message: string) => this.props.intl.formatMessage( { - id: 'apps.error.form.refresh', + id: 'apps.error.form.update', defaultMessage: 'There has been an error updating the modal. Contact the app developer. Details: {details}', }, {details: message}, @@ -144,7 +144,7 @@ class AppsFormContainer extends React.PureComponent { case AppCallResponseTypes.NAVIGATE: return {error: makeCallErrorResponse(makeErrMsg(this.props.intl.formatMessage({ id: 'apps.error.responses.unexpected_type', - defaultMessage: 'App response type was not expected. Response type: {type}.', + defaultMessage: 'App response type was not expected. Response type: {type}', }, { type: callResp.type, }, diff --git a/webapp/channels/src/components/at_mention/at_mention.tsx b/webapp/channels/src/components/at_mention/at_mention.tsx index 4bb914369f..e8e51ca423 100644 --- a/webapp/channels/src/components/at_mention/at_mention.tsx +++ b/webapp/channels/src/components/at_mention/at_mention.tsx @@ -12,9 +12,10 @@ import {Group} from '@mattermost/types/groups'; import ProfilePopover from 'components/profile_popover'; import {popOverOverlayPosition} from 'utils/position_utils'; +import {isKeyPressed} from 'utils/keyboard'; import {getUserOrGroupFromMentionName} from 'utils/post_utils'; import Constants from 'utils/constants'; -import {getViewportSize, isKeyPressed} from 'utils/utils'; +import {getViewportSize} from 'utils/utils'; import AtMentionGroup from 'components/at_mention/at_mention_group'; diff --git a/webapp/channels/src/components/at_mention/at_mention_group.tsx b/webapp/channels/src/components/at_mention/at_mention_group.tsx index aaa449eef9..fa1fd3abd5 100644 --- a/webapp/channels/src/components/at_mention/at_mention_group.tsx +++ b/webapp/channels/src/components/at_mention/at_mention_group.tsx @@ -12,8 +12,9 @@ import ProfilePopover from 'components/profile_popover'; import UserGroupPopover from 'components/user_group_popover'; import Constants, {A11yCustomEventTypes, A11yFocusEventDetail} from 'utils/constants'; +import {isKeyPressed} from 'utils/keyboard'; import {popOverOverlayPosition} from 'utils/position_utils'; -import {getViewportSize, isKeyPressed} from 'utils/utils'; +import {getViewportSize} from 'utils/utils'; import {MAX_LIST_HEIGHT, getListHeight, VIEWPORT_SCALE_FACTOR} from 'components/user_group_popover/group_member_list/group_member_list'; diff --git a/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx b/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx index 9bcf5d106e..5bcec33c60 100644 --- a/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx +++ b/webapp/channels/src/components/channel_groups_manage_modal/channel_groups_manage_modal.tsx @@ -145,7 +145,7 @@ class ChannelGroupsManageModal extends React.PureComponent { const {formatMessage} = this.props.intl; return ( { + const btnText = (status: TrialLoadStatus) => { switch (status) { case TrialLoadStatus.Started: return formatMessage({id: 'start_cloud_trial.modal.gettingTrial', defaultMessage: 'Getting Trial...'}); @@ -138,7 +139,22 @@ const CloudStartTrialButton = ({ case TrialLoadStatus.Failed: return formatMessage({id: 'start_cloud_trial.modal.failed', defaultMessage: 'Failed'}); case TrialLoadStatus.Embargoed: - return formatMessage({id: 'admin.license.trial-request.embargoed'}); + return formatMessage( + { + id: 'admin.license.trial-request.embargoed', + defaultMessage: 'We were unable to process the request due to limitations for embargoed countries. Learn more in our documentation, or reach out to legal@mattermost.com for questions around export limitations.', + }, + { + link: (text: string) => ( + + {text} + + ), + }, + ); default: return message; } diff --git a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap index acaf5d5d19..11d2ecaa22 100644 --- a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap +++ b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/error.test.tsx.snap @@ -29,9 +29,11 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot forwardedRef={null} intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -58,6 +60,7 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, diff --git a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap index 10328e6da5..42691638be 100644 --- a/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap +++ b/webapp/channels/src/components/cloud_subscribe_result_modal/__snapshots__/success.test.tsx.snap @@ -29,9 +29,11 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot forwardedRef={null} intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -58,6 +60,7 @@ exports[`components/pricing_modal/downgrade_team_removal_modal matches snapshot "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, diff --git a/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap b/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap index ad8a1dc2ce..5dd6346344 100644 --- a/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap +++ b/webapp/channels/src/components/code_block/__snapshots__/code_block.test.tsx.snap @@ -4,10 +4,12 @@ exports[`codeBlock should render html code block with proper indentation after s { id="copyButton" intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -321,6 +330,7 @@ const myFunction = () => { "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": Symbol(react.fragment), "timeZone": undefined, "wrapRichTextChunksInFragment": undefined, @@ -452,10 +462,12 @@ exports[`codeBlock should render unknown language after syntax highlighting 1`] { const isShiftKeyPressed = e.shiftKey; switch (true) { - case Utils.isKeyPressed(e, Constants.KeyCodes.R): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.R): this.handleCommentClick(e); this.handleDropdownOpened(false); break; // edit post - case Utils.isKeyPressed(e, Constants.KeyCodes.E): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.E): this.handleEditMenuItemActivated(e); this.handleDropdownOpened(false); break; // follow thread - case Utils.isKeyPressed(e, Constants.KeyCodes.F) && !isShiftKeyPressed: + case Keyboard.isKeyPressed(e, Constants.KeyCodes.F) && !isShiftKeyPressed: this.handleSetThreadFollow(e); this.handleDropdownOpened(false); break; // forward post - case Utils.isKeyPressed(e, Constants.KeyCodes.F) && isShiftKeyPressed: + case Keyboard.isKeyPressed(e, Constants.KeyCodes.F) && isShiftKeyPressed: this.handleForwardMenuItemActivated(e); this.handleDropdownOpened(false); break; // copy link - case Utils.isKeyPressed(e, Constants.KeyCodes.K): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.K): this.copyLink(e); this.handleDropdownOpened(false); break; // copy text - case Utils.isKeyPressed(e, Constants.KeyCodes.C): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.C): this.copyText(e); this.handleDropdownOpened(false); break; // delete post - case Utils.isKeyPressed(e, Constants.KeyCodes.DELETE): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.DELETE): this.handleDeleteMenuItemActivated(e); this.handleDropdownOpened(false); break; // pin / unpin - case Utils.isKeyPressed(e, Constants.KeyCodes.P): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.P): this.handlePinMenuItemActivated(e); this.handleDropdownOpened(false); break; // save / unsave - case Utils.isKeyPressed(e, Constants.KeyCodes.S): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.S): this.handleFlagMenuItemActivated(e); this.handleDropdownOpened(false); break; // mark as unread - case Utils.isKeyPressed(e, Constants.KeyCodes.U): + case Keyboard.isKeyPressed(e, Constants.KeyCodes.U): this.handleMarkPostAsUnread(e); this.handleDropdownOpened(false); break; @@ -496,7 +497,7 @@ export class DotMenuClass extends React.PureComponent { class: classNames('post-menu__item', { 'post-menu__item--active': this.props.isMenuOpen, }), - 'aria-label': formatMessage({id: 'post_info.dot_menu.tooltip.more_actions', defaultMessage: 'Actions'}), + 'aria-label': formatMessage({id: 'post_info.dot_menu.tooltip.actions', defaultMessage: 'Actions'}), children: , }} menu={{ @@ -509,7 +510,7 @@ export class DotMenuClass extends React.PureComponent { }} menuButtonTooltip={{ id: `PostDotMenu-ButtonTooltip-${this.props.post.id}`, - text: formatMessage({id: 'post_info.dot_menu.tooltip.more_actions', defaultMessage: 'More'}), + text: formatMessage({id: 'post_info.dot_menu.tooltip.more', defaultMessage: 'More'}), class: 'hidden-xs', }} > diff --git a/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap b/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap index cde2a61f2c..e3407af6f6 100644 --- a/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap +++ b/webapp/channels/src/components/drafts/__snapshots__/draft_row.test.tsx.snap @@ -39,6 +39,7 @@ exports[`components/drafts/drafts_row should match snapshot for channel draft 1` "type": "channel", } } + isRemote={false} status={Object {}} user={Object {}} /> @@ -84,6 +85,7 @@ exports[`components/drafts/drafts_row should match snapshot for thread draft 1`] "type": "thread", } } + isRemote={false} status={Object {}} user={Object {}} /> diff --git a/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap b/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap index c77a7d5c70..c95826930d 100644 --- a/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap +++ b/webapp/channels/src/components/drafts/__snapshots__/drafts.test.tsx.snap @@ -34,6 +34,7 @@ exports[`components/drafts/drafts should match snapshot 1`] = ` > { type: 'channel' as 'channel' | 'thread', user: {} as UserProfile, value: {} as PostDraft, + isRemote: false, }; it('should match snapshot for channel draft', () => { diff --git a/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx b/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx index 4ac7c15608..3ec5dd72d1 100644 --- a/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx +++ b/webapp/channels/src/components/drafts/channel_draft/channel_draft.tsx @@ -29,6 +29,7 @@ type Props = { type: 'channel' | 'thread'; user: UserProfile; value: PostDraft; + isRemote: boolean; } function ChannelDraft({ @@ -40,6 +41,7 @@ function ChannelDraft({ type, user, value, + isRemote, }: Props) { const dispatch = useDispatch(); const history = useHistory(); @@ -101,7 +103,7 @@ function ChannelDraft({ /> )} timestamp={value.updateAt} - remote={value.remote || false} + remote={isRemote || false} /> { user: {} as UserProfile, status: {} as UserStatus['status'], displayName: 'test', + isRemote: false, }; it('should match snapshot for channel draft', () => { diff --git a/webapp/channels/src/components/drafts/draft_row.tsx b/webapp/channels/src/components/drafts/draft_row.tsx index 18913dd03e..004dbfb554 100644 --- a/webapp/channels/src/components/drafts/draft_row.tsx +++ b/webapp/channels/src/components/drafts/draft_row.tsx @@ -14,9 +14,10 @@ type Props = { status: UserStatus['status']; displayName: string; draft: Draft; + isRemote: boolean; } -function DraftRow({draft, user, status, displayName}: Props) { +function DraftRow({draft, user, status, displayName, isRemote}: Props) { switch (draft.type) { case 'channel': return ( @@ -26,6 +27,7 @@ function DraftRow({draft, user, status, displayName}: Props) { user={user} status={status} displayName={displayName} + isRemote={isRemote} /> ); case 'thread': @@ -37,6 +39,7 @@ function DraftRow({draft, user, status, displayName}: Props) { user={user} status={status} displayName={displayName} + isRemote={isRemote} /> ); default: diff --git a/webapp/channels/src/components/drafts/drafts.test.tsx b/webapp/channels/src/components/drafts/drafts.test.tsx index 0c5527c743..3453780f41 100644 --- a/webapp/channels/src/components/drafts/drafts.test.tsx +++ b/webapp/channels/src/components/drafts/drafts.test.tsx @@ -20,6 +20,7 @@ describe('components/drafts/drafts', () => { displayName: 'display_name', status: {} as UserStatus['status'], localDraftsAreEnabled: true, + draftRemotes: {}, }; it('should match snapshot', () => { diff --git a/webapp/channels/src/components/drafts/drafts.tsx b/webapp/channels/src/components/drafts/drafts.tsx index b929e1cd17..a2f499fe11 100644 --- a/webapp/channels/src/components/drafts/drafts.tsx +++ b/webapp/channels/src/components/drafts/drafts.tsx @@ -27,11 +27,13 @@ type Props = { displayName: string; status: UserStatus['status']; localDraftsAreEnabled: boolean; + draftRemotes: Record; } function Drafts({ displayName, drafts, + draftRemotes, status, user, localDraftsAreEnabled, @@ -75,6 +77,7 @@ function Drafts({ key={d.key} displayName={displayName} draft={d} + isRemote={draftRemotes[d.key]} user={user} status={status} /> diff --git a/webapp/channels/src/components/drafts/index.ts b/webapp/channels/src/components/drafts/index.ts index 201f6102c1..11347f4d12 100644 --- a/webapp/channels/src/components/drafts/index.ts +++ b/webapp/channels/src/components/drafts/index.ts @@ -22,6 +22,7 @@ function makeMapStateToProps() { return { displayName: displayUsername(user, getTeammateNameDisplaySetting(state)), drafts: getDrafts(state), + draftRemotes: state.views.drafts.remotes, status, user, localDraftsAreEnabled: localDraftsAreEnabled(state), diff --git a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap index 3026f7a40e..45e0bcc69f 100644 --- a/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap +++ b/webapp/channels/src/components/drafts/panel/__snapshots__/panel_body.test.tsx.snap @@ -73,9 +73,11 @@ exports[`components/drafts/panel/panel_body should have called handleFormattedTe hide={[Function]} intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -102,6 +104,7 @@ exports[`components/drafts/panel/panel_body should have called handleFormattedTe "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, @@ -351,9 +354,11 @@ exports[`components/drafts/panel/panel_body should match snapshot 1`] = ` hide={[Function]} intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -380,6 +385,7 @@ exports[`components/drafts/panel/panel_body should match snapshot 1`] = ` "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, @@ -635,9 +641,11 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1 hide={[Function]} intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -664,6 +672,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1 "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, @@ -777,7 +786,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1 @@ -809,7 +818,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for priority 1 - IMPORTANT + Important
@@ -989,9 +998,11 @@ exports[`components/drafts/panel/panel_body should match snapshot for requested_ hide={[Function]} intl={ Object { + "$t": [Function], "defaultFormats": Object {}, "defaultLocale": "en", "defaultRichTextElements": undefined, + "fallbackOnEmptyString": true, "formatDate": [Function], "formatDateTimeRange": [Function], "formatDateToParts": [Function], @@ -1018,6 +1029,7 @@ exports[`components/drafts/panel/panel_body should match snapshot for requested_ "locale": "en", "messages": Object {}, "onError": [Function], + "onWarn": [Function], "textComponent": "span", "timeZone": "Etc/UTC", "wrapRichTextChunksInFragment": undefined, diff --git a/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap b/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap index 8881d2f961..b4e4330511 100644 --- a/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap +++ b/webapp/channels/src/components/drafts/thread_draft/__snapshots__/thread_draft.test.tsx.snap @@ -42,6 +42,7 @@ exports[`components/drafts/drafts_row should match snapshot for channel draft 1` displayName="" draftId="" id={Object {}} + isRemote={false} rootId="" status={Object {}} thread={ @@ -98,6 +99,7 @@ exports[`components/drafts/drafts_row should match snapshot for undefined thread displayName="" draftId="" id={Object {}} + isRemote={false} rootId="" status={Object {}} thread={null} diff --git a/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx b/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx index f35378ab58..30635e4aa9 100644 --- a/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx +++ b/webapp/channels/src/components/drafts/thread_draft/thread_draft.test.tsx @@ -31,6 +31,7 @@ describe('components/drafts/drafts_row', () => { type: 'thread' as 'channel' | 'thread', user: {} as UserProfile, value: {} as PostDraft, + isRemote: false, }; it('should match snapshot for channel draft', () => { diff --git a/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx b/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx index 6856e135bf..e789ddc243 100644 --- a/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx +++ b/webapp/channels/src/components/drafts/thread_draft/thread_draft.tsx @@ -33,6 +33,7 @@ type Props = { type: 'channel' | 'thread'; user: UserProfile; value: PostDraft; + isRemote: boolean; } function ThreadDraft({ @@ -45,6 +46,7 @@ function ThreadDraft({ type, user, value, + isRemote, }: Props) { const dispatch = useDispatch(); @@ -107,7 +109,7 @@ function ThreadDraft({ /> )} timestamp={value.updateAt} - remote={value.remote || false} + remote={isRemote || false} /> { if (Utils.isUnhandledLineBreakKeyCombo(e)) { e.preventDefault(); this.setState({purpose: Utils.insertLineBreakFromKeyEvent(e as React.KeyboardEvent)}); - } else if (ctrlSend && Utils.isKeyPressed(e, Constants.KeyCodes.ENTER) && e.ctrlKey) { + } else if (ctrlSend && Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) && e.ctrlKey) { e.preventDefault(); this.handleSave(); - } else if (!ctrlSend && Utils.isKeyPressed(e, Constants.KeyCodes.ENTER) && !e.shiftKey && !e.altKey) { + } else if (!ctrlSend && Keyboard.isKeyPressed(e, Constants.KeyCodes.ENTER) && !e.shiftKey && !e.altKey) { e.preventDefault(); this.handleSave(); } diff --git a/webapp/channels/src/components/edit_post/edit_post.tsx b/webapp/channels/src/components/edit_post/edit_post.tsx index 9a467ebbbf..81c9ea4667 100644 --- a/webapp/channels/src/components/edit_post/edit_post.tsx +++ b/webapp/channels/src/components/edit_post/edit_post.tsx @@ -10,6 +10,7 @@ import {Post} from '@mattermost/types/posts'; import {Emoji, SystemEmoji} from '@mattermost/types/emojis'; import {AppEvents, Constants, ModalIdentifiers, StoragePrefixes} from 'utils/constants'; +import * as Keyboard from 'utils/keyboard'; import { formatGithubCodePaste, formatMarkdownMessage, @@ -220,7 +221,13 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft, actions.unsetEditingPost(); }; - const handleAutomatedRefocusAndExit = () => handleRefocusAndExit(editingPost.refocusId || null); + const handleAutomatedRefocusAndExit = () => { + draftRef.current = { + ...draftRef.current, + message: '', + }; + handleRefocusAndExit(editingPost.refocusId || null); + }; const handleEdit = async () => { if (!editingPost.post || isSaveDisabled()) { @@ -302,13 +309,13 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft, const {ctrlSend, codeBlockOnCtrlEnter} = rest; const ctrlOrMetaKeyPressed = e.ctrlKey || e.metaKey; - const ctrlKeyCombo = Utils.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey; - const ctrlAltCombo = Utils.cmdOrCtrlPressed(e, true) && e.altKey; + const ctrlKeyCombo = Keyboard.cmdOrCtrlPressed(e) && !e.altKey && !e.shiftKey; + const ctrlAltCombo = Keyboard.cmdOrCtrlPressed(e, true) && e.altKey; const ctrlEnterKeyCombo = (ctrlSend || codeBlockOnCtrlEnter) && - Utils.isKeyPressed(e, KeyCodes.ENTER) && + Keyboard.isKeyPressed(e, KeyCodes.ENTER) && ctrlOrMetaKeyPressed; - const markdownLinkKey = Utils.isKeyPressed(e, KeyCodes.K); + const markdownLinkKey = Keyboard.isKeyPressed(e, KeyCodes.K); // listen for line break key combo and insert new line character if (Utils.isUnhandledLineBreakKeyCombo(e)) { @@ -316,7 +323,7 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft, setEditText(Utils.insertLineBreakFromKeyEvent(e as React.KeyboardEvent)); } else if (ctrlEnterKeyCombo) { handleEdit(); - } else if (Utils.isKeyPressed(e, KeyCodes.ESCAPE) && !showEmojiPicker) { + } else if (Keyboard.isKeyPressed(e, KeyCodes.ESCAPE) && !showEmojiPicker) { handleAutomatedRefocusAndExit(); } else if (ctrlAltCombo && markdownLinkKey) { applyHotkeyMarkdown({ @@ -325,14 +332,14 @@ const EditPost = ({editingPost, actions, canEditPost, config, channelId, draft, selectionEnd: e.currentTarget.selectionEnd, message: e.currentTarget.value, }); - } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.B)) { + } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.B)) { applyHotkeyMarkdown({ markdownMode: 'bold', selectionStart: e.currentTarget.selectionStart, selectionEnd: e.currentTarget.selectionEnd, message: e.currentTarget.value, }); - } else if (ctrlKeyCombo && Utils.isKeyPressed(e, KeyCodes.I)) { + } else if (ctrlKeyCombo && Keyboard.isKeyPressed(e, KeyCodes.I)) { applyHotkeyMarkdown({ markdownMode: 'italic', selectionStart: e.currentTarget.selectionStart, diff --git a/webapp/channels/src/components/edit_post/edit_post_footer.tsx b/webapp/channels/src/components/edit_post/edit_post_footer.tsx index 12971eb2cc..432c27eebe 100644 --- a/webapp/channels/src/components/edit_post/edit_post_footer.tsx +++ b/webapp/channels/src/components/edit_post/edit_post_footer.tsx @@ -8,7 +8,7 @@ import {FormattedMessage} from 'react-intl'; import {getBool} from 'mattermost-redux/selectors/entities/preferences'; import {Preferences} from 'mattermost-redux/constants'; -import {isMac} from 'utils/utils'; +import {isMac} from 'utils/user_agent'; import {GlobalState} from 'types/store'; type Props = { diff --git a/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx b/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx index 12e0905332..b52a3a8ace 100644 --- a/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx +++ b/webapp/channels/src/components/emoji_picker/components/emoji_picker_preview.tsx @@ -18,7 +18,7 @@ function EmojiPickerPreview({emoji}: Props) { return (
diff --git a/webapp/channels/src/components/error_page/error_page.tsx b/webapp/channels/src/components/error_page/error_page.tsx index 349f978d7c..d180549721 100644 --- a/webapp/channels/src/components/error_page/error_page.tsx +++ b/webapp/channels/src/components/error_page/error_page.tsx @@ -79,7 +79,7 @@ export default class ErrorPage extends React.PureComponent { backButton = ( { backButton = ( void; @@ -28,23 +28,35 @@ const DowngradeFeedbackModal = (props: Props) => { defaultMessage: 'Downgrade', }); - const downgradeFeedbackOptions = [ - props.intl.formatMessage({ - id: 'feedback.downgradeWorkspace.technicalIssues', - defaultMessage: 'Experienced technical issues', - }), - props.intl.formatMessage({ - id: 'feedback.downgradeWorkspace.noLongerNeeded', - defaultMessage: 'No longer need Cloud Professional features', - }), - props.intl.formatMessage({ - id: 'feedback.downgradeWorkspace.exploringOptions', - defaultMessage: 'Exploring other solutions', - }), - props.intl.formatMessage({ - id: 'feedback.downgradeWorkspace.tooExpensive', - defaultMessage: 'Too expensive', - }), + const downgradeFeedbackOptions: FeedbackOption[] = [ + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.downgradeWorkspace.technicalIssues', + defaultMessage: 'Experienced technical issues', + }), + submissionValue: 'Experienced technical issues', + }, + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.downgradeWorkspace.noLongerNeeded', + defaultMessage: 'No longer need Cloud Professional features', + }), + submissionValue: 'No longer need Cloud Professional features', + }, + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.downgradeWorkspace.exploringOptions', + defaultMessage: 'Exploring other solutions', + }), + submissionValue: 'Exploring other solutions', + }, + { + translatedMessage: props.intl.formatMessage({ + id: 'feedback.downgradeWorkspace.tooExpensive', + defaultMessage: 'Too expensive', + }), + submissionValue: 'Too expensive', + }, ]; return ( diff --git a/webapp/channels/src/components/feedback_modal/feedback.tsx b/webapp/channels/src/components/feedback_modal/feedback.tsx index af8daaac91..3f612017be 100644 --- a/webapp/channels/src/components/feedback_modal/feedback.tsx +++ b/webapp/channels/src/components/feedback_modal/feedback.tsx @@ -15,18 +15,23 @@ import {ModalIdentifiers} from 'utils/constants'; import './feedback.scss'; +export interface FeedbackOption { + translatedMessage: string; + submissionValue: string; +} + type Props = { onSubmit: (deleteFeedback: Feedback) => void; title: string; submitText: string; - feedbackOptions: string[]; + feedbackOptions: FeedbackOption[]; freeformTextPlaceholder: string; } & WrappedComponentProps function FeedbackModal(props: Props) { const maxFreeFormTextLength = 500; - const optionOther = props.intl.formatMessage({id: 'feedback.other', defaultMessage: 'Other'}); - const feedbackModalOptions: string[] = [ + const optionOther = {translatedMessage: props.intl.formatMessage({id: 'feedback.other', defaultMessage: 'Other'}), submissionValue: 'Other'}; + const feedbackModalOptions: FeedbackOption[] = [ ...props.feedbackOptions, optionOther, ]; @@ -34,9 +39,9 @@ function FeedbackModal(props: Props) { const [reason, setReason] = useState(''); const [comments, setComments] = useState(''); const reasonNotSelected = reason === ''; - const reasonOther = reason === optionOther; + const reasonOther = reason === optionOther.submissionValue; const commentsNotProvided = comments.trim() === ''; - const submitDisabled = reasonNotSelected || (reason === optionOther && commentsNotProvided); + const submitDisabled = reasonNotSelected || (reasonOther && commentsNotProvided); const dispatch = useDispatch(); @@ -71,15 +76,15 @@ function FeedbackModal(props: Props) { testId='FeedbackModalRadioGroup' values={feedbackModalOptions.map((option) => { return { - value: option, - key: option, - testId: option, + value: option.submissionValue, + key: option.translatedMessage, + testId: option.submissionValue, }; })} value={reason} onChange={(e) => setReason(e.target.value)} /> - {reason === optionOther && + {reasonOther && <>