Merge pull request #263 from secrethub/feature/no-newline-flag-read

Add -n flag to read command to not print newline

Author: SimonBarendse

internals/secrethub/read.go

@@ -25,6 +25,7 @@ type ReadCommand struct {
 	clipper             clip.Clipper
 	outFile             string
 	fileMode            filemode.FileMode
+	noNewLine           bool
 	newClient           newClientFunc
 }
 
@@ -51,6 +52,7 @@ func (cmd *ReadCommand) Register(r command.Registerer) {
 	).Short('c').BoolVar(&cmd.useClipboard)
 	clause.Flag("out-file", "Write the secret value to this file.").Short('o').StringVar(&cmd.outFile)
 	clause.Flag("file-mode", "Set filemode for the output file. Defaults to 0600 (read and write for current user) and is ignored without the --out-file flag.").Default("0600").SetValue(&cmd.fileMode)
+	clause.Flag("no-newline", "Do not print a new line after the secret.").Short('n').BoolVar(&cmd.noNewLine)
 
 	command.BindAction(clause, cmd.Run)
 }
@@ -81,15 +83,20 @@ func (cmd *ReadCommand) Run() error {
 		)
 	}
 
+	secretData := secret.Data
+	if !cmd.noNewLine {
+		secretData = posix.AddNewLine(secretData)
+	}
+
 	if cmd.outFile != "" {
-		err = ioutil.WriteFile(cmd.outFile, posix.AddNewLine(secret.Data), cmd.fileMode.FileMode())
+		err = ioutil.WriteFile(cmd.outFile, secretData, cmd.fileMode.FileMode())
 		if err != nil {
 			return ErrCannotWrite(cmd.outFile, err)
 		}
 	}
 
 	if cmd.outFile == "" && !cmd.useClipboard {
-		fmt.Fprintf(cmd.io.Stdout(), "%s", string(posix.AddNewLine(secret.Data)))
+		fmt.Fprintf(cmd.io.Stdout(), "%s", string(secretData))
 	}
 
 	return nil