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. --- api/file_test.go | 6 +++--- api/user_test.go | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'api') diff --git a/api/file_test.go b/api/file_test.go index bac8f2619..0d64608c3 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -875,17 +875,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 } diff --git a/api/user_test.go b/api/user_test.go index 8c68876d0..e11391434 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -690,17 +690,17 @@ func TestUserCreateImage(t *testing.T) { } 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 { t.Fatal(err) } - bucket := *utils.Cfg.FileSettings.AmazonS3Bucket + bucket := utils.Cfg.FileSettings.AmazonS3Bucket if err = s3Clnt.RemoveObject(bucket, "/users/"+user.Id+"/profile.png"); err != nil { t.Fatal(err) } @@ -796,17 +796,17 @@ func TestUserUploadProfileImage(t *testing.T) { Client.DoApiGet("/users/"+user.Id+"/image", "", "") 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 { t.Fatal(err) } - bucket := *utils.Cfg.FileSettings.AmazonS3Bucket + bucket := utils.Cfg.FileSettings.AmazonS3Bucket if err = s3Clnt.RemoveObject(bucket, "/users/"+user.Id+"/profile.png"); err != nil { t.Fatal(err) } -- cgit v1.2.3-1-g7c22