gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Chris Lu
2020-12-06 21:54:34 -08:00
parent 9acda432fe
commit 78f3ab439c
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/s3iam/s3iam_filer_store.go
View File

@@ -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