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

s3 config changes

Browse Source
This commit is contained in:
Konstantin Lebedev
2020-11-26 03:50:53 +05:00
parent 52c8f2fc9a
commit 4e55baf5b1
1 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
weed/shell/command_s3_configure.go
View File

@@ -58,7 +58,7 @@ func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io
idx := 0 idx := 0
changed := false changed := false
if *user != "" && *buckets != "" { if *user != "" {
for i, identity := range s3cfg.Identities { for i, identity := range s3cfg.Identities {
if *user == identity.Name { if *user == identity.Name {
idx = i idx = i
@@ -68,9 +68,13 @@ func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io
} }
} }
var cmdActions []string var cmdActions []string
for _, bucket := range strings.Split(*buckets, ",") { for _, action := range strings.Split(*actions, ",") {
for _, action := range strings.Split(*actions, ",") { if *buckets == "" {
cmdActions = append(cmdActions, fmt.Sprintf("%s:%s", action, bucket)) cmdActions = append(cmdActions, action)
} else {
for _, bucket := range strings.Split(*buckets, ",") {
cmdActions = append(cmdActions, fmt.Sprintf("%s:%s", action, bucket))
}
} }
} }
if changed { if changed {
@@ -106,29 +110,58 @@ func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io
} }
} }
if *actions == "" && *accessKey == "" { if *actions == "" && *accessKey == "" && *buckets == "" {
s3cfg.Identities = append(s3cfg.Identities[:idx], s3cfg.Identities[idx+1:]...) s3cfg.Identities = append(s3cfg.Identities[:idx], s3cfg.Identities[idx+1:]...)
} }
} else { } else {
s3cfg.Identities[idx].Actions = append(s3cfg.Identities[idx].Actions, cmdActions...) if *actions != "" {
s3cfg.Identities[idx].Credentials = append(s3cfg.Identities[idx].Credentials, &iam_pb.Credential{ for _, cmdAction := range cmdActions {
AccessKey: *accessKey, found := false
SecretKey: *secretKey, for _, action := range s3cfg.Identities[idx].Actions {
}) if cmdAction == action {
found = true
break
}
}
if !found {
s3cfg.Identities[idx].Actions = append(s3cfg.Identities[idx].Actions, cmdAction)
}
}
}
if *accessKey != "" && *user != "anonymous" {
found := false
for _, credential := range s3cfg.Identities[idx].Credentials {
if credential.AccessKey == *accessKey {
found = true
credential.SecretKey = *secretKey
break
}
}
if !found {
s3cfg.Identities[idx].Credentials = append(s3cfg.Identities[idx].Credentials, &iam_pb.Credential{
AccessKey: *accessKey,
SecretKey: *secretKey,
})
}
}
} }
} else { } else if *user != "" && *actions != "" {
identity := iam_pb.Identity{ identity := iam_pb.Identity{
Name: *user, Name: *user,
Actions: cmdActions, Actions: cmdActions,
Credentials: []*iam_pb.Credential{},
}
if *user != "anonymous" {
identity.Credentials = append(identity.Credentials,
&iam_pb.Credential{AccessKey: *accessKey, SecretKey: *secretKey})
} }
identity.Credentials = append(identity.Credentials, &iam_pb.Credential{
AccessKey: *accessKey,
SecretKey: *secretKey,
})
s3cfg.Identities = append(s3cfg.Identities, &identity) s3cfg.Identities = append(s3cfg.Identities, &identity)
} }
fmt.Fprintf(writer, fmt.Sprintf("%+v\n", s3cfg.Identities)) for _, identity := range s3cfg.Identities {
fmt.Fprintf(writer, fmt.Sprintf("%+v\n", identity))
}
fmt.Fprintln(writer) fmt.Fprintln(writer)
if *apply { if *apply {