mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-29 16:30:44 +01:00
shell: s3.* commands always output JSON, connection messages to stderr (#8976)
* shell: s3.* commands output JSON, connection messages to stderr
All s3.user.* and s3.policy.attach|detach commands now output structured
JSON to stdout instead of human-readable text:
- s3.user.create: {"name","access_key"} (secret key to stderr only)
- s3.user.list: [{name,status,policies,keys}]
- s3.user.show: {name,status,source,account,policies,credentials,...}
- s3.user.delete: {"name"}
- s3.user.enable/disable: {"name","status"}
- s3.policy.attach/detach: {"policy","user"}
Connection startup messages (master/filer) moved to stderr so they
don't pollute structured output when piping.
Closes #8962 (partial — covers merged s3.user/policy commands).
* shell: fix secret leak, duplicate JSON output, and non-interactive prompt
- s3.user.create: only echo secret key to stderr when auto-generated,
never echo caller-supplied secrets
- s3.user.enable/disable: fix duplicate JSON output — remove inner
write in early-return path, keep single write site after gRPC call
- shell_liner: use bufio.Scanner when stdin is not a terminal instead
of liner.Prompt, suppressing the "> " prompt in piped mode
* shell: check scanner error, idempotent enable output, history errors to stderr
- Check scanner.Err() after non-interactive input loop to surface read errors
- s3.user.enable: always emit JSON regardless of current state (idempotent)
- saveHistory: write error messages to stderr instead of stdout
This commit is contained in:
1 parent
df619ec3f6
commit
74905c4b5d
10 files changed
+146
-100
No files matched your search
@@ -2,9 +2,11 @@ package shell
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/iam"
|
||||
@@ -34,6 +36,8 @@ func (c *commandS3UserCreate) Help() string {
|
||||
are omitted, they are generated automatically.
|
||||
|
||||
After creating a user, attach policies with s3.policy.attach.
|
||||
|
||||
Output: JSON to stdout. Secret key is printed to stderr only.
|
||||
`
|
||||
}
|
||||
|
||||
@@ -56,8 +60,10 @@ func (c *commandS3UserCreate) Do(args []string, commandEnv *CommandEnv, writer i
|
||||
|
||||
ak := *accessKey
|
||||
sk := *secretKey
|
||||
generated := false
|
||||
|
||||
if ak == "" && sk == "" {
|
||||
generated = true
|
||||
var err error
|
||||
ak, err = iam.GenerateRandomString(iam.AccessKeyIdLength, iam.CharsetUpper)
|
||||
if err != nil {
|
||||
@@ -93,10 +99,13 @@ func (c *commandS3UserCreate) Do(args []string, commandEnv *CommandEnv, writer i
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Fprintf(writer, "Created user %q\n", *name)
|
||||
fmt.Fprintf(writer, "Access Key: %s\n", ak)
|
||||
fmt.Fprintf(writer, "Secret Key: %s\n", sk)
|
||||
fmt.Fprintln(writer)
|
||||
fmt.Fprintln(writer, "Save these credentials - the secret key cannot be retrieved later.")
|
||||
return nil
|
||||
if generated {
|
||||
fmt.Fprintf(os.Stderr, "Secret Key: %s\n", sk)
|
||||
fmt.Fprintf(os.Stderr, "Save this secret key - it cannot be retrieved later.\n")
|
||||
}
|
||||
|
||||
return json.NewEncoder(writer).Encode(map[string]string{
|
||||
"name": *name,
|
||||
"access_key": ak,
|
||||
})
|
||||
}
|
||||
Reference in new issue
Block a user