From f968c56890bd84295672ee0d46cc846cac2dbd47 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 7 Sep 2017 00:02:42 +0800 Subject: Revert "[PLT-7475] Add S3 region to system console and add S3 validation (#7373)" (#7387) This reverts commit 8d680cf64ec7fb6c8b242b8048989d0f0550cb68. Move to 4.3. Will discuss more if validation is necessary. --- api4/apitestlib.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'api4') diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 883b7b931..b634de0d4 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 } -- cgit v1.2.3-1-g7c22