diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2021-07-12 13:47:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 13:47:42 +0800 |
| commit | 272c7836c3a97c0ab8b31e335d7fa6efc769edc0 (patch) | |
| tree | b17792c1a77e0c2fdd07b371da64ca5a14a62f75 /weed/s3api/auth_credentials.go | |
| parent | ed57a55eaec2318bf21693582105660d7612118b (diff) | |
| parent | d013d6d9680296ba13c3f0da09f3bb3ae8550828 (diff) | |
| download | seaweedfs-272c7836c3a97c0ab8b31e335d7fa6efc769edc0.tar.xz seaweedfs-272c7836c3a97c0ab8b31e335d7fa6efc769edc0.zip | |
Merge pull request #1 from chrislusf/master
Diffstat (limited to 'weed/s3api/auth_credentials.go')
| -rw-r--r-- | weed/s3api/auth_credentials.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/weed/s3api/auth_credentials.go b/weed/s3api/auth_credentials.go index 3439b40df..44c3f7aa7 100644 --- a/weed/s3api/auth_credentials.go +++ b/weed/s3api/auth_credentials.go @@ -4,6 +4,8 @@ import ( "fmt" "github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/iam_pb" xhttp "github.com/chrislusf/seaweedfs/weed/s3api/http" "github.com/chrislusf/seaweedfs/weed/s3api/s3_constants" @@ -51,8 +53,12 @@ func NewIdentityAccessManagement(option *S3ApiServerOption) *IdentityAccessManag return iam } -func (iam *IdentityAccessManagement) loadS3ApiConfigurationFromFiler(option *S3ApiServerOption) error { - content, err := filer.ReadContent(option.Filer, filer.IamConfigDirecotry, filer.IamIdentityFile) +func (iam *IdentityAccessManagement) loadS3ApiConfigurationFromFiler(option *S3ApiServerOption) (err error) { + var content []byte + err = pb.WithFilerClient(option.Filer, option.GrpcDialOption, func(client filer_pb.SeaweedFilerClient) error { + content, err = filer.ReadInsideFiler(client, filer.IamConfigDirecotry, filer.IamIdentityFile) + return err + }) if err != nil { return fmt.Errorf("read S3 config: %v", err) } |