diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/s3iam/s3iam_filer_store.go | 6 | ||||
| -rw-r--r-- | weed/s3iam/s3iam_filer_store_test.go | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/weed/s3iam/s3iam_filer_store.go b/weed/s3iam/s3iam_filer_store.go index 4f84a0e54..4171ef143 100644 --- a/weed/s3iam/s3iam_filer_store.go +++ b/weed/s3iam/s3iam_filer_store.go @@ -33,7 +33,7 @@ func (ifs *IAMFilerStore) LoadIAMConfig(config *iam_pb.S3ApiConfiguration) error if err != nil { return err } - err = ifs.loadIAMConfigFromEntry(resp.Entry, config) + err = ifs.loadIAMConfigFromBytes(resp.Entry.Content, config) if err != nil { return err } @@ -79,8 +79,8 @@ func (ifs *IAMFilerStore) SaveIAMConfig(config *iam_pb.S3ApiConfiguration) error return nil } -func (ifs *IAMFilerStore) loadIAMConfigFromEntry(entry *filer_pb.Entry, config *iam_pb.S3ApiConfiguration) error { - if err := proto.Unmarshal(entry.Content, config); err != nil { +func (ifs *IAMFilerStore) loadIAMConfigFromBytes(content []byte, config *iam_pb.S3ApiConfiguration) error { + if err := proto.Unmarshal(content, config); err != nil { return err } return nil diff --git a/weed/s3iam/s3iam_filer_store_test.go b/weed/s3iam/s3iam_filer_store_test.go index 6c595134e..2945398ed 100644 --- a/weed/s3iam/s3iam_filer_store_test.go +++ b/weed/s3iam/s3iam_filer_store_test.go @@ -1,9 +1,9 @@ package s3iam import ( + "github.com/golang/protobuf/proto" "testing" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/iam_pb" "github.com/stretchr/testify/assert" @@ -51,11 +51,10 @@ func TestS3Conf(t *testing.T) { }, }, } - entry := filer_pb.Entry{} - err := ifs.saveIAMConfigToEntry(&entry, s3Conf) + content, _ := proto.Marshal(config) assert.Equal(t, err, nil) s3ConfSaved := &iam_pb.S3ApiConfiguration{} - err = ifs.loadIAMConfigFromEntry(&entry, s3ConfSaved) + err = ifs.loadIAMConfigFromBytes(content, s3ConfSaved) assert.Equal(t, err, nil) assert.Equal(t, "some_name", s3ConfSaved.Identities[0].Name) |