diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-06 03:42:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 03:42:18 +0800 |
| commit | 8d680cf64ec7fb6c8b242b8048989d0f0550cb68 (patch) | |
| tree | 700d39986d1973b51c875ab9bf50241762fc3e54 /api4 | |
| parent | 7405f66036537095b52c277d9b56969df33bfa57 (diff) | |
| download | chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.tar.gz chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.tar.bz2 chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.zip | |
[PLT-7475] Add S3 region to system console and add S3 validation (#7373)
* add S3 region to system console and add S3 validation
* update translation message
* add bool as return value to Validate* functions
* update Validate* functions to be pure
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/apitestlib.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index b634de0d4..883b7b931 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -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 } |