diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-21 17:34:13 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-21 17:34:13 -0700 |
commit | 0529a494ae6b541f917522a20de92e3d36615f65 (patch) | |
tree | 401c6faf7ca0eb90fdc9a88910d792c28b82ac02 /api/file_test.go | |
parent | e863096358dd64ecf2de6efeec3db132cdc8d6b9 (diff) | |
download | chat-0529a494ae6b541f917522a20de92e3d36615f65.tar.gz chat-0529a494ae6b541f917522a20de92e3d36615f65.tar.bz2 chat-0529a494ae6b541f917522a20de92e3d36615f65.zip |
Adding image properties
Diffstat (limited to 'api/file_test.go')
-rw-r--r-- | api/file_test.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/api/file_test.go b/api/file_test.go index eb1fcf2ce..a62bdc83e 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -81,11 +81,11 @@ func TestUploadFile(t *testing.T) { fileId := strings.Split(filename, ".")[0] var auth aws.Auth - auth.AccessKey = utils.Cfg.AWSSettings.S3AccessKeyId - auth.SecretKey = utils.Cfg.AWSSettings.S3SecretAccessKey + auth.AccessKey = utils.Cfg.AWSSettings.AmazonS3AccessKeyId + auth.SecretKey = utils.Cfg.AWSSettingsAmazonS3SecretAccessKey - s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettings.S3Region]) - bucket := s.Bucket(utils.Cfg.AWSSettings.S3Bucket) + s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettingsAmazonS3Region]) + bucket := s.Bucket(utils.Cfg.AWSSettingsAmazonS3Bucket) // wait a bit for files to ready time.Sleep(5 * time.Second) @@ -264,11 +264,11 @@ func TestGetFile(t *testing.T) { if utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage { var auth aws.Auth - auth.AccessKey = utils.Cfg.AWSSettings.S3AccessKeyId - auth.SecretKey = utils.Cfg.AWSSettings.S3SecretAccessKey + auth.AccessKey = utils.Cfg.AWSSettings.AmazonS3AccessKeyId + auth.SecretKey = utils.Cfg.AWSSettingsAmazonS3SecretAccessKey - s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettings.S3Region]) - bucket := s.Bucket(utils.Cfg.AWSSettings.S3Bucket) + s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettingsAmazonS3Region]) + bucket := s.Bucket(utils.Cfg.AWSSettingsAmazonS3Bucket) filenames := strings.Split(resp.Data.(*model.FileUploadResponse).Filenames[0], "/") filename := filenames[len(filenames)-2] + "/" + filenames[len(filenames)-1] @@ -413,11 +413,11 @@ func TestGetPublicLink(t *testing.T) { if utils.IsS3Configured() && !utils.Cfg.ServiceSettings.UseLocalStorage { // perform clean-up on s3 var auth aws.Auth - auth.AccessKey = utils.Cfg.AWSSettings.S3AccessKeyId - auth.SecretKey = utils.Cfg.AWSSettings.S3SecretAccessKey + auth.AccessKey = utils.Cfg.AWSSettings.AmazonS3AccessKeyId + auth.SecretKey = utils.Cfg.AWSSettingsAmazonS3SecretAccessKey - s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettings.S3Region]) - bucket := s.Bucket(utils.Cfg.AWSSettings.S3Bucket) + s := s3.New(auth, aws.Regions[utils.Cfg.AWSSettingsAmazonS3Region]) + bucket := s.Bucket(utils.Cfg.AWSSettingsAmazonS3Bucket) filenames := strings.Split(resp.Data.(*model.FileUploadResponse).Filenames[0], "/") filename := filenames[len(filenames)-2] + "/" + filenames[len(filenames)-1] |