From eb1d7d5cc47318bda45ceb04c962d996ccb1281b Mon Sep 17 00:00:00 2001 From: "cai.zhang" Date: Mon, 28 Sep 2020 10:23:43 +0800 Subject: [PATCH] Read bucket name from config yaml Signed-off-by: cai.zhang --- conf/conf.go | 1 + conf/config.yaml | 1 + storage/internal/S3/s3_engine.go | 5 +++-- storage/internal/minio/minio_storeEngine.go | 5 +++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/conf/conf.go b/conf/conf.go index 8ac09d4642..9cd8860eed 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -71,6 +71,7 @@ type Writer struct { Parallelism int TopicStart int TopicEnd int + Bucket string } type ServerConfig struct { diff --git a/conf/config.yaml b/conf/config.yaml index 81046c4ee2..cbadaf8e3e 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -57,6 +57,7 @@ writer: parallelism: 100 topicstart: 0 topicend: 128 + bucket: "zilliz-hz" proxy: timezone: UTC+8 diff --git a/storage/internal/S3/s3_engine.go b/storage/internal/S3/s3_engine.go index 3e7f762277..eacd40f341 100644 --- a/storage/internal/S3/s3_engine.go +++ b/storage/internal/S3/s3_engine.go @@ -6,12 +6,13 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" -// "github.com/aws/aws-sdk-go/service/s3/s3manager" + "github.com/czs007/suvlim/conf" + // "github.com/aws/aws-sdk-go/service/s3/s3manager" . "github.com/czs007/suvlim/storage/pkg/types" "io" ) -var bucketName = "zilliz-hz" +var bucketName = conf.Config.Writer.Bucket type S3Store struct { client *s3.S3 diff --git a/storage/internal/minio/minio_storeEngine.go b/storage/internal/minio/minio_storeEngine.go index 0a62eb8dd4..7d68a9f0d4 100644 --- a/storage/internal/minio/minio_storeEngine.go +++ b/storage/internal/minio/minio_storeEngine.go @@ -3,12 +3,13 @@ package minio_driver import ( "bytes" "context" + "github.com/czs007/suvlim/conf" + . "github.com/czs007/suvlim/storage/pkg/types" "github.com/minio/minio-go/v7" "io" - . "github.com/czs007/suvlim/storage/pkg/types" ) -var bucketName = "zilliz" +var bucketName = conf.Config.Writer.Bucket type minioStore struct { client *minio.Client