aboutsummaryrefslogtreecommitdiff
path: root/weed/filer/s3iam_conf.go
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2022-06-20 13:18:11 -0700
committerchrislu <chris.lu@gmail.com>2022-06-20 13:18:11 -0700
commitbf5a5abfb1925ee981306d8e49bc52bcded2279b (patch)
tree3aa2d7aef0639134219c323a67f81ca93642ab29 /weed/filer/s3iam_conf.go
parent69a2e503ab51b3350388525fa778cb0b20cc82ac (diff)
parent0d22877df9177aa51b495314b138d7a9e75eb4a2 (diff)
downloadseaweedfs-bf5a5abfb1925ee981306d8e49bc52bcded2279b.tar.xz
seaweedfs-bf5a5abfb1925ee981306d8e49bc52bcded2279b.zip
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
Diffstat (limited to 'weed/filer/s3iam_conf.go')
-rw-r--r--weed/filer/s3iam_conf.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/weed/filer/s3iam_conf.go b/weed/filer/s3iam_conf.go
index 55c976915..891bf925b 100644
--- a/weed/filer/s3iam_conf.go
+++ b/weed/filer/s3iam_conf.go
@@ -2,13 +2,12 @@ package filer
import (
"bytes"
- "github.com/chrislusf/seaweedfs/weed/pb/iam_pb"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"io"
)
-func ParseS3ConfigurationFromBytes(content []byte, config *iam_pb.S3ApiConfiguration) error {
+func ParseS3ConfigurationFromBytes[T proto.Message](content []byte, config T) error {
if err := jsonpb.Unmarshal(bytes.NewBuffer(content), config); err != nil {
return err
}