[MM-19948] Set version on module file and internal paths (#13186)

* [MM-19948] Set version on module file and internal paths

* Fixes after merge

* Fix i18n checker error
Этот коммит содержится в:
Miguel de la Cruz
2019-11-28 14:39:38 +01:00
коммит произвёл GitHub
родитель 14bcd1f0a1
Коммит 2259b7f2a8
635 изменённых файлов: 1309 добавлений и 1307 удалений

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"strconv"
"strings"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
// GenerateClientConfig renders the given configuration for a client.

Просмотреть файл

@@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/mattermost/mattermost-server/config"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/config"
"github.com/mattermost/mattermost-server/v5/model"
)
func TestGetClientConfig(t *testing.T) {

Просмотреть файл

@@ -9,7 +9,7 @@ import (
"strings"
"sync"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/pkg/errors"
)

Просмотреть файл

@@ -4,11 +4,11 @@ import (
"os"
"testing"
"github.com/mattermost/mattermost-server/config"
"github.com/mattermost/mattermost-server/v5/config"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
var emptyConfig, readOnlyConfig, minimalConfig, invalidConfig, fixesRequiredConfig, ldapConfig, testConfig *model.Config

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"encoding/json"
"os"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
func GenerateDefaultConfig(outputFile *os.File) error {

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"fmt"
"os"
"github.com/mattermost/mattermost-server/config/config_generator/generator"
"github.com/mattermost/mattermost-server/v5/config/config_generator/generator"
)
func main() {

Просмотреть файл

@@ -12,8 +12,8 @@ import (
"github.com/jmoiron/sqlx"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
// Load the MySQL driver
_ "github.com/go-sql-driver/mysql"

Просмотреть файл

@@ -15,8 +15,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/config"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/config"
"github.com/mattermost/mattermost-server/v5/model"
)
func setupConfigDatabase(t *testing.T, cfg *model.Config, files map[string][]byte) (string, func()) {

Просмотреть файл

@@ -9,9 +9,9 @@ import (
"os"
"testing"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/config/config_generator/generator"
"github.com/mattermost/mattermost-server/v5/config/config_generator/generator"
"github.com/stretchr/testify/require"
)

Просмотреть файл

@@ -6,7 +6,7 @@ package config
import (
"sync"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
// emitter enables threadsafe registration and broadcasting to configuration listeners

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
func TestEmitter(t *testing.T) {

Просмотреть файл

@@ -6,7 +6,7 @@ package config
import (
"reflect"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
// removeEnvOverrides returns a new config without the given environment overrides.

Просмотреть файл

@@ -4,7 +4,7 @@ import (
"io"
"github.com/jmoiron/sqlx"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
// MarshalConfig exposes the internal marshalConfig to tests only.

Просмотреть файл

@@ -13,9 +13,9 @@ import (
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils/fileutils"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
)
var (

Просмотреть файл

@@ -15,9 +15,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/config"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
"github.com/mattermost/mattermost-server/v5/config"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils"
)
func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) {

Просмотреть файл

@@ -5,8 +5,8 @@ import (
"testing"
"github.com/go-sql-driver/mysql"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/testlib"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/testlib"
"github.com/stretchr/testify/require"
)

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
// memoryStore implements the Store interface. It is meant primarily for testing.

Просмотреть файл

@@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/config"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/config"
"github.com/mattermost/mattermost-server/v5/model"
)
func setupConfigMemory(t *testing.T) {

Просмотреть файл

@@ -2,7 +2,7 @@ package config
import (
"fmt"
"github.com/mattermost/mattermost-server/testlib"
"github.com/mattermost/mattermost-server/v5/testlib"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"testing"

Просмотреть файл

@@ -6,7 +6,7 @@ package config
import (
"strings"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)
// Listener is a callback function invoked when the configuration changes.

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"path/filepath"
"testing"
"github.com/mattermost/mattermost-server/config"
"github.com/mattermost/mattermost-server/v5/config"
"github.com/stretchr/testify/require"
)

Просмотреть файл

@@ -14,9 +14,9 @@ import (
"github.com/mattermost/viper"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils/jsonutils"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils/jsonutils"
)
// newViper creates an instance of viper.Viper configured for parsing a configuration.

Просмотреть файл

@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils"
)
func TestGetDefaultsFromStruct(t *testing.T) {

Просмотреть файл

@@ -6,9 +6,9 @@ package config
import (
"strings"
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils"
)
// desanitize replaces fake settings with their actual values.

Просмотреть файл

@@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/utils"
)
func TestDesanitize(t *testing.T) {

Просмотреть файл

@@ -9,7 +9,7 @@ import (
"github.com/fsnotify/fsnotify"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/v5/mlog"
)
// watcher monitors a file for changes