MM-10658 Change config fields to pointers (#9033)
* MM 10658 Change config fields to pointers (#8898) * Change fields of config structs to pointers and set defaults MM-10658 https://github.com/mattermost/mattermost-server/issues/8841 * Fix tests that go broken during switching config structs to pointers MM-10658 https://github.com/mattermost/mattermost-server/issues/8841 * Apply changes of current master while switching config structs to pointers MM-10658 https://github.com/mattermost/mattermost-server/issues/8841 * Fix new config pointer uses * Fix app tests * Fix mail test * remove debugging statement * fix TestUpdateConfig * assign config consistently * initialize AmazonS3Region in TestS3TestConnection * initialize fields for TestEmailTest * fix TestCheckMandatoryS3Fields
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
0c981aa010
Коммит
2ca222033c
@@ -96,7 +96,7 @@ func setupTestHelper(enterprise bool, updateConfig func(*model.Config)) *TestHel
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
*cfg.TeamSettings.MaxUsersPerTeam = 50
|
||||
*cfg.RateLimitSettings.Enable = false
|
||||
cfg.EmailSettings.SendEmailNotifications = true
|
||||
*cfg.EmailSettings.SendEmailNotifications = true
|
||||
})
|
||||
prevListenAddress := *th.App.Config().ServiceSettings.ListenAddress
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
|
||||
@@ -514,7 +514,7 @@ func (me *TestHelper) AddUserToChannel(user *model.User, channel *model.Channel)
|
||||
}
|
||||
|
||||
func (me *TestHelper) GenerateTestEmail() string {
|
||||
if me.App.Config().EmailSettings.SMTPServer != "dockerhost" && os.Getenv("CI_INBUCKET_PORT") == "" {
|
||||
if *me.App.Config().EmailSettings.SMTPServer != "dockerhost" && os.Getenv("CI_INBUCKET_PORT") == "" {
|
||||
return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com")
|
||||
}
|
||||
return strings.ToLower(model.NewId() + "@dockerhost")
|
||||
@@ -674,17 +674,17 @@ func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool, regi
|
||||
func (me *TestHelper) cleanupTestFile(info *model.FileInfo) error {
|
||||
cfg := me.App.Config()
|
||||
if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 {
|
||||
endpoint := cfg.FileSettings.AmazonS3Endpoint
|
||||
accessKey := cfg.FileSettings.AmazonS3AccessKeyId
|
||||
secretKey := cfg.FileSettings.AmazonS3SecretAccessKey
|
||||
endpoint := *cfg.FileSettings.AmazonS3Endpoint
|
||||
accessKey := *cfg.FileSettings.AmazonS3AccessKeyId
|
||||
secretKey := *cfg.FileSettings.AmazonS3SecretAccessKey
|
||||
secure := *cfg.FileSettings.AmazonS3SSL
|
||||
signV2 := *cfg.FileSettings.AmazonS3SignV2
|
||||
region := cfg.FileSettings.AmazonS3Region
|
||||
region := *cfg.FileSettings.AmazonS3Region
|
||||
s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
bucket := cfg.FileSettings.AmazonS3Bucket
|
||||
bucket := *cfg.FileSettings.AmazonS3Bucket
|
||||
if err := s3Clnt.RemoveObject(bucket, info.Path); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -701,18 +701,18 @@ func (me *TestHelper) cleanupTestFile(info *model.FileInfo) error {
|
||||
}
|
||||
}
|
||||
} else if *cfg.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL {
|
||||
if err := os.Remove(cfg.FileSettings.Directory + info.Path); err != nil {
|
||||
if err := os.Remove(*cfg.FileSettings.Directory + info.Path); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if info.ThumbnailPath != "" {
|
||||
if err := os.Remove(cfg.FileSettings.Directory + info.ThumbnailPath); err != nil {
|
||||
if err := os.Remove(*cfg.FileSettings.Directory + info.ThumbnailPath); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if info.PreviewPath != "" {
|
||||
if err := os.Remove(cfg.FileSettings.Directory + info.PreviewPath); err != nil {
|
||||
if err := os.Remove(*cfg.FileSettings.Directory + info.PreviewPath); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user