From 7f77d9e0a9c30cc5689159c1b12753a03f5c8781 Mon Sep 17 00:00:00 2001 From: withchao Date: Thu, 14 Sep 2023 10:33:12 +0000 Subject: [PATCH] cicd: robot automated Change --- pkg/common/db/s3/minio/minio.go | 5 ++++- pkg/common/db/s3/oss/oss.go | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index bb9d593ab..037c933bb 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -140,7 +140,10 @@ func (m *Minio) initMinio(ctx context.Context) error { } } if conf.PublicRead { - policy := fmt.Sprintf(`{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject","s3:PutObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::%s/*"],"Sid": ""}]}`, conf.Bucket) + policy := fmt.Sprintf( + `{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject","s3:PutObject"],"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::%s/*"],"Sid": ""}]}`, + conf.Bucket, + ) if err := m.core.Client.SetBucketPolicy(ctx, conf.Bucket, policy); err != nil { return err } diff --git a/pkg/common/db/s3/oss/oss.go b/pkg/common/db/s3/oss/oss.go index a0a23ce3e..49358e45f 100644 --- a/pkg/common/db/s3/oss/oss.go +++ b/pkg/common/db/s3/oss/oss.go @@ -18,7 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/aliyun/aliyun-oss-go-sdk/oss" "net/http" "net/url" "reflect" @@ -26,6 +25,8 @@ import ( "strings" "time" + "github.com/aliyun/aliyun-oss-go-sdk/oss" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" )