Refactor: rename clearClipboardAfter and don't pass it to clip writer

It's not just the default value, it's non-configurable for the user.
Because we're using the same value everywhere, there isn't really
a point in having it be configurable.

What's more: we're using the value of the constant in some texts
that are displayed to the user, assuming that this "default" is
the value being used.
I believe it's clearer if we reflect this assumption in the name
of the constant.

Author: SimonBarendse

internals/secrethub/clear_clipboard.go

@@ -11,8 +11,8 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-// defaultClearClipboardAfter defines the default TTL for data written to the clipboard.
-const defaultClearClipboardAfter = 45 * time.Second
+// clearClipboardAfter defines the TTL for data written to the clipboard.
+const clearClipboardAfter = 45 * time.Second
 
 // ClearClipboardCommand is a command to clear the contents of the clipboard after some time passed.
 type ClearClipboardCommand struct {
@@ -67,7 +67,6 @@ type ClipboardWriter interface {
 }
 
 type ClipboardWriterAutoClear struct {
-	timeout time.Duration
 	clipper clip.Clipper
 }
 
@@ -85,7 +84,7 @@ func (clipWriter *ClipboardWriterAutoClear) Write(data []byte) error {
 
 	err = cloneproc.Spawn(
 		"clipboard-clear", hex.EncodeToString(hash),
-		"--timeout", clipWriter.timeout.String())
+		"--timeout", clearClipboardAfter.String())
 
 	return err
 }

internals/secrethub/generate.go

@@ -55,7 +55,6 @@ func NewGenerateSecretCommand(io ui.IO, newClient newClientFunc) *GenerateSecret
 		newClient: newClient,
 		clipWriter: &ClipboardWriterAutoClear{
 			clipper: clip.NewClipboard(),
-			timeout: defaultClearClipboardAfter,
 		},
 	}
 }
@@ -66,7 +65,7 @@ func (cmd *GenerateSecretCommand) Register(r cli.Registerer) {
 	clause.Flags().VarP(&cmd.lengthFlag, "length", "l", "The length of the generated secret.")
 	clause.Cmd.Flag("length").DefValue = strconv.Itoa(defaultLength)
 	clause.Flags().Var(&cmd.mins, "min", "<charset>:<n> Ensure that the resulting password contains at least n characters from the given character set. Note that adding constraints reduces the strength of the secret. When possible, avoid any constraints.")
-	clause.Flags().BoolVarP(&cmd.copyToClipboard, "clip", "c", false, "Copy the generated value to the clipboard. The clipboard is automatically cleared after "+units.HumanDuration(defaultClearClipboardAfter)+".")
+	clause.Flags().BoolVarP(&cmd.copyToClipboard, "clip", "c", false, "Copy the generated value to the clipboard. The clipboard is automatically cleared after "+units.HumanDuration(clearClipboardAfter)+".")
 	_ = cmd.charsetFlag.Set("alphanumeric")
 	clause.Flags().Var(&cmd.charsetFlag, "charset", "Define the set of characters to randomly generate a password from. Options are all, alphanumeric, numeric, lowercase, uppercase, letters, symbols and human-readable. Multiple character sets can be combined by supplying them in a comma separated list.")
 	clause.Cmd.Flag("charset").DefValue = "alphanumeric"
@@ -155,7 +154,7 @@ func (cmd *GenerateSecretCommand) run() error {
 		fmt.Fprintf(
 			cmd.io.Output(),
 			"The generated value has been copied to the clipboard. It will be cleared after %s.\n",
-			units.HumanDuration(defaultClearClipboardAfter),
+			units.HumanDuration(clearClipboardAfter),
 		)
 	}
 

internals/secrethub/inject.go

@@ -43,7 +43,6 @@ func NewInjectCommand(io ui.IO, newClient newClientFunc) *InjectCommand {
 	return &InjectCommand{
 		clipWriter: &ClipboardWriterAutoClear{
 			clipper: clip.NewClipboard(),
-			timeout: defaultClearClipboardAfter,
 		},
 		osEnv:        os.Environ(),
 		io:           io,
@@ -61,7 +60,7 @@ func (cmd *InjectCommand) Register(r cli.Registerer) {
 		"clip", "c", false,
 		fmt.Sprintf(
 			"Copy the injected template to the clipboard instead of stdout. The clipboard is automatically cleared after %s.",
-			units.HumanDuration(defaultClearClipboardAfter),
+			units.HumanDuration(clearClipboardAfter),
 		))
 	clause.Flags().StringVarP(&cmd.inFile, "in-file", "i", "", "The filename of a template file to inject.")
 	clause.Flags().StringVarP(&cmd.outFile, "out-file", "o", "", "Write the injected template to a file instead of stdout.")
@@ -136,7 +135,7 @@ func (cmd *InjectCommand) Run() error {
 			return err
 		}
 
-		_, err = fmt.Fprintf(cmd.io.Output(), "Copied injected template to clipboard. It will be cleared after %s.\n", units.HumanDuration(defaultClearClipboardAfter))
+		_, err = fmt.Fprintf(cmd.io.Output(), "Copied injected template to clipboard. It will be cleared after %s.\n", units.HumanDuration(clearClipboardAfter))
 		if err != nil {
 			return err
 		}

internals/secrethub/read.go

@@ -34,7 +34,6 @@ func NewReadCommand(io ui.IO, newClient newClientFunc) *ReadCommand {
 	return &ReadCommand{
 		clipWriter: &ClipboardWriterAutoClear{
 			clipper: clip.NewClipboard(),
-			timeout: defaultClearClipboardAfter,
 		},
 		io:            io,
 		newClient:     newClient,
@@ -51,7 +50,7 @@ func (cmd *ReadCommand) Register(r cli.Registerer) {
 		"clip", "c", false,
 		fmt.Sprintf(
 			"Copy the secret value to the clipboard. The clipboard is automatically cleared after %s.",
-			units.HumanDuration(defaultClearClipboardAfter),
+			units.HumanDuration(clearClipboardAfter),
 		),
 	)
 	clause.Flags().StringVarP(&cmd.outFile, "out-file", "o", "", "Write the secret value to this file.")
@@ -84,7 +83,7 @@ func (cmd *ReadCommand) Run() error {
 			cmd.io.Output(),
 			"Copied %s to clipboard. It will be cleared after %s.\n",
 			cmd.path,
-			units.HumanDuration(defaultClearClipboardAfter),
+			units.HumanDuration(clearClipboardAfter),
 		)
 	}
 

internals/secrethub/service_init.go

@@ -37,7 +37,6 @@ func NewServiceInitCommand(io ui.IO, newClient newClientFunc) *ServiceInitComman
 	return &ServiceInitCommand{
 		clipWriter: &ClipboardWriterAutoClear{
 			clipper: clip.NewClipboard(),
-			timeout: defaultClearClipboardAfter,
 		},
 		io:            io,
 		newClient:     newClient,