IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[PLT-7475] Add S3 region to system console and add S3 validation (#7373)" (#7387)

Browse Source 
This reverts commit 8d680cf64e.

Move to 4.3.
Will discuss more if validation is necessary.
This commit is contained in:
Saturnino Abril
2017-09-07 00:02:42 +08:00
committed by Chris
parent 90da40b54c
commit f968c56890
10 changed files with 38 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api4/apitestlib.go
View File

@@ -659,17 +659,17 @@ func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool, regi
func cleanupTestFile(info *model.FileInfo) error {
if *utils.Cfg.FileSettings.DriverName == model.IMAGE_DRIVER_S3 {
endpoint := *utils.Cfg.FileSettings.AmazonS3Endpoint
endpoint := utils.Cfg.FileSettings.AmazonS3Endpoint
accessKey := utils.Cfg.FileSettings.AmazonS3AccessKeyId
secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey
secure := *utils.Cfg.FileSettings.AmazonS3SSL
signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2
region := *utils.Cfg.FileSettings.AmazonS3Region
region := utils.Cfg.FileSettings.AmazonS3Region
s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region)
if err != nil {
return err
}
bucket := *utils.Cfg.FileSettings.AmazonS3Bucket
bucket := utils.Cfg.FileSettings.AmazonS3Bucket
if err := s3Clnt.RemoveObject(bucket, info.Path); err != nil {
return err
}