summaryrefslogtreecommitdiffstats
path: root/api/user_test.go
diff options
context:
space:
mode:
authorHarshavardhana <harsha@minio.io>2017-05-30 16:12:24 -0700
committerCorey Hulen <corey@hulen.com>2017-05-30 16:12:24 -0700
commitf520aa1f4d18a65919c22240a4d0352022d6ca1b (patch)
tree558e3b39bbc0e8c7ee9dccb51ca912789786e080 /api/user_test.go
parentd409c7c1c6a21de203c471134419726e1c7dcb12 (diff)
downloadchat-f520aa1f4d18a65919c22240a4d0352022d6ca1b.tar.gz
chat-f520aa1f4d18a65919c22240a4d0352022d6ca1b.tar.bz2
chat-f520aa1f4d18a65919c22240a4d0352022d6ca1b.zip
Support AWS Signature V2 for Mattermost for S3 storage. (#6462)
Certain S3 compatible servers only use Legacy Signature (AWS Signature V2), current code only supports signature v4. This PR adds facility to click a button on the UI to enable legacy signature with S3 compatible servers.
Diffstat (limited to 'api/user_test.go')
-rw-r--r--api/user_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/api/user_test.go b/api/user_test.go
index 484cf6495..49c031923 100644
--- a/api/user_test.go
+++ b/api/user_test.go
@@ -20,8 +20,6 @@ import (
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/store"
"github.com/mattermost/platform/utils"
-
- s3 "github.com/minio/minio-go"
)
func TestCreateUser(t *testing.T) {
@@ -696,7 +694,8 @@ func TestUserCreateImage(t *testing.T) {
accessKey := utils.Cfg.FileSettings.AmazonS3AccessKeyId
secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey
secure := *utils.Cfg.FileSettings.AmazonS3SSL
- s3Clnt, err := s3.New(endpoint, accessKey, secretKey, secure)
+ signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2
+ s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2)
if err != nil {
t.Fatal(err)
}
@@ -800,7 +799,8 @@ func TestUserUploadProfileImage(t *testing.T) {
accessKey := utils.Cfg.FileSettings.AmazonS3AccessKeyId
secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey
secure := *utils.Cfg.FileSettings.AmazonS3SSL
- s3Clnt, err := s3.New(endpoint, accessKey, secretKey, secure)
+ signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2
+ s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2)
if err != nil {
t.Fatal(err)
}