alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Logs should support specifying region when using S3-compatible object store (#645)

Browse Source 
Logs should support specifying region when using S3-compatible object store
This commit is contained in:
Gerardo Viedma
2018-01-05 17:34:32 +00:00
committed by GitHub
parent ed9e71ea5b
commit 6b91351ed8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/logs/s3/s3.go
View File

@@ -30,6 +30,7 @@ type store struct {
} }
// s3://access_key_id:secret_access_key@host/location/bucket_name?ssl=true // s3://access_key_id:secret_access_key@host/location/bucket_name?ssl=true
// Note that access_key_id and secret_access_key must be URL encoded if they contain unsafe characters!
func New(u *url.URL) (models.LogStore, error) { func New(u *url.URL) (models.LogStore, error) {
endpoint := u.Host endpoint := u.Host
@@ -54,7 +55,7 @@ func New(u *url.URL) (models.LogStore, error) {
logrus.WithFields(logrus.Fields{"bucketName": bucketName, "location": location, "endpoint": endpoint, "access_key_id": accessKeyID, "useSSL": useSSL}).Info("checking / creating s3 bucket") logrus.WithFields(logrus.Fields{"bucketName": bucketName, "location": location, "endpoint": endpoint, "access_key_id": accessKeyID, "useSSL": useSSL}).Info("checking / creating s3 bucket")
client, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL) client, err := minio.NewWithRegion(endpoint, accessKeyID, secretAccessKey, useSSL, location)
if err != nil { if err != nil {
return nil, err return nil, err
} }