*: fix cli stdin (#121)

pingcap · Oct 24, 2022 · 544b0cc · 544b0cc
1 parent ff1f40a
commit 544b0cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/cli/config.go b/lib/cli/config.go
@@ -16,7 +16,6 @@ package cli
 
 import (
 	"fmt"
-	"io"
 	"net/http"
 	"os"
 
@@ -40,15 +39,14 @@ func getConfigCmd(ctx *Context, pathSuffix string) *cobra.Command {
 		}
 		input := setProxy.Flags().String("input", "", "specify the input json file for proxy config")
 		setProxy.RunE = func(cmd *cobra.Command, args []string) error {
-			var b io.Reader
+			b := cmd.InOrStdin()
 			if *input != "" {
 				f, err := os.Open(*input)
 				if err != nil {
 					return err
 				}
 				defer f.Close()
-			} else {
-				b = os.Stdin
+				b = f
 			}
 
 			resp, err := doRequest(cmd.Context(), ctx, http.MethodPut, path, b)

diff --git a/lib/cli/namespace.go b/lib/cli/namespace.go
@@ -130,10 +130,10 @@ func GetNamespaceCmd(ctx *Context) *cobra.Command {
 		putNamespace := &cobra.Command{
 			Use: "put",
 		}
-		ns := putNamespace.Flags().String("ns", "-", "file")
+		ns := putNamespace.Flags().String("ns", "", "file, or stdin")
 		putNamespace.RunE = func(cmd *cobra.Command, _ []string) error {
 			in := cmd.InOrStdin()
-			if *ns != "-" {
+			if *ns != "" {
 				f, err := os.Open(*ns)
 				if err != nil {
 					return err