Reducing the filestore dependencies from the rest of the source code (#16816)
* Reducing the filestore dependencies from the rest of the source code * Making more generic config conversion to FileBackendSettings * Fixing usage of the NewFileBackend function * Fixing more usages of the NewFileBackend function * Fix some linter errors * Fix more linter errors * Fixing some unit tests * Fixing linter problem * Addressing PR review comments * Simplifing the CopyFile for tests Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
a246104d04
Коммит
a3de71fba4
@@ -13,6 +13,7 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/mattermost/mattermost-server/v5/model"
|
||||
"github.com/mattermost/mattermost-server/v5/services/filesstore"
|
||||
"github.com/mattermost/mattermost-server/v5/utils"
|
||||
"github.com/mattermost/mattermost-server/v5/utils/fileutils"
|
||||
)
|
||||
@@ -117,6 +118,17 @@ func getTestResourcesToSetup() []testResourceDetails {
|
||||
return testResourcesToSetup
|
||||
}
|
||||
|
||||
func CopyFile(src, dst string) error {
|
||||
fileBackend, err := filesstore.NewFileBackend(filesstore.FileBackendSettings{DriverName: "local", Directory: ""})
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to copy file %s to %s", src, dst)
|
||||
}
|
||||
if err = fileBackend.CopyFile(src, dst); err != nil {
|
||||
return errors.Wrapf(err, "failed to copy file %s to %s", src, dst)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func SetupTestResources() (string, error) {
|
||||
testResourcesToSetup := getTestResourcesToSetup()
|
||||
|
||||
@@ -151,9 +163,8 @@ func SetupTestResources() (string, error) {
|
||||
|
||||
if testResource.action == actionCopy {
|
||||
if testResource.resType == resourceTypeFile {
|
||||
err = utils.CopyFile(testResource.src, resourceDestInTemp)
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "failed to copy file %s to %s", testResource.src, resourceDestInTemp)
|
||||
if err = CopyFile(testResource.src, resourceDestInTemp); err != nil {
|
||||
return "", err
|
||||
}
|
||||
} else if testResource.resType == resourceTypeFolder {
|
||||
err = utils.CopyDir(testResource.src, resourceDestInTemp)
|
||||
|
||||
Ссылка в новой задаче
Block a user