diff options
| author | chrislu <chris.lu@gmail.com> | 2022-07-14 12:16:51 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-07-14 12:16:51 -0700 |
| commit | 3e45d4bec497584ecace0417ed826cafd66af54b (patch) | |
| tree | 39d307b5b561813bc0058b99f4b9b49de701a017 /weed/shell | |
| parent | 9c0459685e4784d18c30105861e479af3aadb84f (diff) | |
| parent | fbd8f868a124af47d1c91b742d587c4fab6f2a32 (diff) | |
| download | seaweedfs-3e45d4bec497584ecace0417ed826cafd66af54b.tar.xz seaweedfs-3e45d4bec497584ecace0417ed826cafd66af54b.zip | |
Merge branch 'master' into messaging
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_s3_configure.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/weed/shell/command_s3_configure.go b/weed/shell/command_s3_configure.go index 0660b7889..422df2e75 100644 --- a/weed/shell/command_s3_configure.go +++ b/weed/shell/command_s3_configure.go @@ -2,14 +2,14 @@ package shell import ( "bytes" - "errors" "flag" "fmt" - "github.com/chrislusf/seaweedfs/weed/filer" "io" "sort" "strings" + "github.com/chrislusf/seaweedfs/weed/filer" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/iam_pb" ) @@ -165,15 +165,8 @@ func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io s3cfg.Identities = append(s3cfg.Identities, &identity) } - accessKeySet := make(map[string]string) - for _, ident := range s3cfg.Identities { - for _, cred := range ident.Credentials { - if userName, found := accessKeySet[cred.AccessKey]; !found { - accessKeySet[cred.AccessKey] = ident.Name - } else { - return errors.New(fmt.Sprintf("duplicate accessKey[%s], already configured in user[%s]", cred.AccessKey, userName)) - } - } + if err = filer.CheckDuplicateAccessKey(s3cfg); err != nil { + return err } buf.Reset() |