associate Account and Identity by accountId (#3754)

2022-09-29 04:25:59 +08:00
parent aacdcc4cad
commit e00a12b099
3 changed files with 36 additions and 21 deletions
--- a/weed/filer/s3iam_conf.go
+++ b/weed/filer/s3iam_conf.go
@@ -10,7 +10,11 @@ import (
 )

 func ParseS3ConfigurationFromBytes[T proto.Message](content []byte, config T) error {
-	if err := jsonpb.Unmarshal(content, config); err != nil {
+	options := &jsonpb.UnmarshalOptions{
+		DiscardUnknown: true,
+		AllowPartial:   true,
+	}
+	if err := options.Unmarshal(content, config); err != nil {
 		return err
 	}
 	return nil