always use prompt for secret

flags/flags.go

@@ -1,7 +1,6 @@
 package flags
 
 import (
-	"bufio"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -32,15 +31,14 @@ type Flags struct {
 
 var EXTRA = `
 Commands:
-  save-secret <service> [secret [username]]
+  save-secret <service> [username]
     service      Service URL or name for secret.
-    secret       Secret to be saved for the service.
-    username     Username to associate with the service.
-  Save a secret into the secret store.  Requires wtf.secretStore
-  to be configured.  See individual modules for information on what
-  service, secret, and username means for their configuration. Not
-  all modules use secrets, and not all secrets require a username.
-  If secret or username is not provided, will prompt for them.
+    username     Username to associate with the service. Optional.
+  Save a secret into the secret store. The secret will be prompted for.
+  Requires wtf.secretStore to be configured.  See individual modules for
+  information on what service, secret, and username means for their
+  configuration. Not all modules use secrets, and not all secrets require
+  a username.
 `
 
 // NewFlags creates an instance of Flags
@@ -85,38 +83,29 @@ func (flags *Flags) RenderIf(version, date string, config *config.Config) {
 
 		service = args[0]
 
+		if len(args) > 2 {
+			fmt.Fprintf(os.Stderr, "save-secret: too many arguments, see `%s --help`\n", os.Args[0])
+			os.Exit(1)
+		}
+
 		if len(args) > 1 {
-			secret = args[1]
-		} else {
-			b, err := readline.Password("Secret (required): ")
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-				os.Exit(1)
-			}
-			secret = string(b)
+			username = args[1]
 		}
+
+		b, err := readline.Password("Secret: ")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+			os.Exit(1)
+		}
+		secret = string(b)
 		secret = strings.TrimSpace(secret)
 
 		if secret == "" {
 			fmt.Fprintf(os.Stderr, "save-secret: secret required, see `%s --help`\n", os.Args[0])
 			os.Exit(1)
 		}
 
-		if len(args) > 2 {
-			username = args[2]
-		} else {
-			fmt.Printf("Username (optional): ")
-			reader := bufio.NewReader(os.Stdin)
-			var err error
-			username, err = reader.ReadString('\n')
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-				os.Exit(1)
-			}
-		}
-		username = strings.TrimSpace(username)
-
-		err := cfg.StoreSecret(config, &cfg.Secret{
+		err = cfg.StoreSecret(config, &cfg.Secret{
 			Service:  service,
 			Secret:   secret,
 			Username: username,