diff options
| author | LHHDZ <changlin.shi@ly.com> | 2022-10-10 21:44:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 06:44:29 -0700 |
| commit | 3550692afc3cad1166522c2eada46efd3b3a617d (patch) | |
| tree | efaf3604efab5aa6dc72a31c95829de0badc5bae /weed/s3api/s3api_server.go | |
| parent | 0711870f43e6c5eadd3df70f22478e6e9998e5a2 (diff) | |
| download | seaweedfs-3550692afc3cad1166522c2eada46efd3b3a617d.tar.xz seaweedfs-3550692afc3cad1166522c2eada46efd3b3a617d.zip | |
change s3_account.go package to avoid cycle dependency (#3813)
Diffstat (limited to 'weed/s3api/s3api_server.go')
| -rw-r--r-- | weed/s3api/s3api_server.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index 2163e557d..a8816424d 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/pb/s3_pb" + "github.com/seaweedfs/seaweedfs/weed/s3api/s3account" "net" "net/http" "strings" @@ -40,7 +41,7 @@ type S3ApiServer struct { randomClientId int32 filerGuard *security.Guard client *http.Client - accountManager *AccountManager + accountManager *s3account.AccountManager bucketRegistry *BucketRegistry } @@ -61,7 +62,7 @@ func NewS3ApiServer(router *mux.Router, option *S3ApiServerOption) (s3ApiServer filerGuard: security.NewGuard([]string{}, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec), cb: NewCircuitBreaker(option), } - s3ApiServer.accountManager = NewAccountManager(s3ApiServer) + s3ApiServer.accountManager = s3account.NewAccountManager(s3ApiServer) s3ApiServer.bucketRegistry = NewBucketRegistry(s3ApiServer) if option.LocalFilerSocket == "" { s3ApiServer.client = &http.Client{Transport: &http.Transport{ |