lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-23 10:25:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use content field of entry

Browse Source
This commit is contained in:
Konstantin Lebedev
2020-12-02 17:19:05 +05:00
parent a3d4b50a49
commit 14699dfcef
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
weed/s3iam/s3iam_filer_store.go
View File

@@ -33,7 +33,7 @@ func (ifs *IAMFilerStore) LoadIAMConfig(config *iam_pb.S3ApiConfiguration) error
if err != nil { if err != nil {
return err return err
} }
err = ifs.loadIAMConfigFromEntry(resp.Entry.Content, config) err = ifs.loadIAMConfigFromEntry(resp.Entry, config)
if err != nil { if err != nil {
return err return err
} }
@@ -53,7 +53,7 @@ func (ifs *IAMFilerStore) SaveIAMConfig(config *iam_pb.S3ApiConfiguration) error
}, },
Content: []byte{}, Content: []byte{},
} }
err := ifs.saveIAMConfigToEntry(entry.Content, config) err := ifs.saveIAMConfigToEntry(entry, config)
if err != nil { if err != nil {
return err return err
} }
@@ -79,15 +79,15 @@ func (ifs *IAMFilerStore) SaveIAMConfig(config *iam_pb.S3ApiConfiguration) error
return nil return nil
} }
func (ifs *IAMFilerStore) loadIAMConfigFromEntry(content []byte, config *iam_pb.S3ApiConfiguration) error { func (ifs *IAMFilerStore) loadIAMConfigFromEntry(entry *filer_pb.Entry, config *iam_pb.S3ApiConfiguration) error {
if err := proto.Unmarshal(content, config); err != nil { if err := proto.Unmarshal(entry.Content, config); err != nil {
return err return err
} }
return nil return nil
} }
func (ifs *IAMFilerStore) saveIAMConfigToEntry(content []byte, config *iam_pb.S3ApiConfiguration) error { func (ifs *IAMFilerStore) saveIAMConfigToEntry(entry *filer_pb.Entry, config *iam_pb.S3ApiConfiguration) (err error) {
content, err := proto.Marshal(config) entry.Content, err = proto.Marshal(config)
if err != nil { if err != nil {
return err return err
} }

9
weed/s3iam/s3iam_filer_store_test.go
View File

@@ -3,6 +3,7 @@ package s3iam
import ( import (
"testing" "testing"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/pb/iam_pb" "github.com/chrislusf/seaweedfs/weed/pb/iam_pb"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -50,10 +51,12 @@ func TestS3Conf(t *testing.T) {
}, },
}, },
} }
content := []byte{} entry := filer_pb.Entry{}
_ = ifs.saveIAMConfigToEntry(content, s3Conf) err := ifs.saveIAMConfigToEntry(&entry, s3Conf)
assert.Equal(t, err, nil)
s3ConfSaved := &iam_pb.S3ApiConfiguration{} s3ConfSaved := &iam_pb.S3ApiConfiguration{}
_ = ifs.loadIAMConfigFromEntry(content, s3ConfSaved) err = ifs.loadIAMConfigFromEntry(&entry, s3ConfSaved)
assert.Equal(t, err, nil)
assert.Equal(t, "some_name", s3ConfSaved.Identities[0].Name) assert.Equal(t, "some_name", s3ConfSaved.Identities[0].Name)
assert.Equal(t, "some_read_only_user", s3ConfSaved.Identities[1].Name) assert.Equal(t, "some_read_only_user", s3ConfSaved.Identities[1].Name)