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
@@ -295,7 +295,7 @@ func sendMailUsingConfigAdvanced(mail mailData, config *model.Config, enableComp
|
||||
defer c.Quit()
|
||||
defer c.Close()
|
||||
|
||||
fileBackend, nErr := filesstore.NewFileBackend(&config.FileSettings, enableComplianceFeatures)
|
||||
fileBackend, nErr := filesstore.NewFileBackend(config.FileSettings.ToFileBackendSettings(enableComplianceFeatures))
|
||||
if nErr != nil {
|
||||
return errors.Wrap(nErr, "unable to initialize file backend")
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ func TestSendMailUsingConfigAdvanced(t *testing.T) {
|
||||
//Delete all the messages before check the sample email
|
||||
DeleteMailBox("test2@example.com")
|
||||
|
||||
fileBackend, err := filesstore.NewFileBackend(&cfg.FileSettings, true)
|
||||
fileBackend, err := filesstore.NewFileBackend(cfg.FileSettings.ToFileBackendSettings(true))
|
||||
assert.NoError(t, err)
|
||||
|
||||
// create two files with the same name that will both be attached to the email
|
||||
@@ -398,7 +398,8 @@ func TestSendMail(t *testing.T) {
|
||||
DriverName: model.NewString(model.IMAGE_DRIVER_LOCAL),
|
||||
Directory: &dir,
|
||||
}
|
||||
mockBackend, err := filesstore.NewFileBackend(&settings, true)
|
||||
settings.SetDefaults(true)
|
||||
mockBackend, err := filesstore.NewFileBackend(settings.ToFileBackendSettings(true))
|
||||
require.NoError(t, err)
|
||||
mocm := &mockMailer{}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user