From 6b91351ed8dfcb8c8222eb7c9699ad02d985eaf2 Mon Sep 17 00:00:00 2001 From: Gerardo Viedma Date: Fri, 5 Jan 2018 17:34:32 +0000 Subject: [PATCH] Logs should support specifying region when using S3-compatible object store (#645) Logs should support specifying region when using S3-compatible object store --- api/logs/s3/s3.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/logs/s3/s3.go b/api/logs/s3/s3.go index fef8ca824..11b7dced6 100644 --- a/api/logs/s3/s3.go +++ b/api/logs/s3/s3.go @@ -30,6 +30,7 @@ type store struct { } // 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) { 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") - client, err := minio.New(endpoint, accessKeyID, secretAccessKey, useSSL) + client, err := minio.NewWithRegion(endpoint, accessKeyID, secretAccessKey, useSSL, location) if err != nil { return nil, err }