lockbox

commit 0e5b1bb919eb2c1d67b35078e964440d4cd61f6b
parent a153cb24ab6bdca9d949fefbacdcae4467fc63d0
Author: Sean Enck <sean@ttypty.com>
Date:   Sat,  4 Mar 2023 07:56:18 -0500

this is mostly not a useful wrapper

Diffstat:
M
internal/app/insert.go
 | 
10
+++-------
M
internal/app/insert_test.go
 | 
4
++--

2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/internal/app/insert.go b/internal/app/insert.go
@@ -32,10 +32,6 @@ type (
 	}
 )
 
-func insertError(message string, err error) error {
-	return fmt.Errorf("%s (%w)", message, err)
-}
-
 // ReadArgs will read and check insert args
 func (p InsertArgsOptions) ReadArgs(cmd InsertOptions, args []string) (InsertArgs, error) {
 	multi := false
@@ -88,7 +84,7 @@ func (p InsertArgsOptions) ReadArgs(cmd InsertOptions, args []string) (InsertArg
 func (args InsertArgs) Do(w io.Writer, t *backend.Transaction) error {
 	existing, err := t.Get(args.Entry, backend.BlankValue)
 	if err != nil {
-		return insertError("unable to check for existing entry", err)
+		return err
 	}
 	isPipe := args.Opts.IsPipe()
 	if existing != nil {
@@ -100,11 +96,11 @@ func (args InsertArgs) Do(w io.Writer, t *backend.Transaction) error {
 	}
 	password, err := args.Opts.Input(isPipe, args.Multi)
 	if err != nil {
-		return insertError("invalid input", err)
+		return fmt.Errorf("invalid input: %w", err)
 	}
 	p := strings.TrimSpace(string(password))
 	if err := t.Insert(args.Entry, p); err != nil {
-		return insertError("failed to insert", err)
+		return err
 	}
 	if !isPipe {
 		fmt.Fprintln(w)
diff --git a/internal/app/insert_test.go b/internal/app/insert_test.go
@@ -87,7 +87,7 @@ func TestInsertDo(t *testing.T) {
 	args.Opts.Input = func(bool, bool) ([]byte, error) {
 		return nil, errors.New("failure")
 	}
-	if err := args.Do(&buf, tx); err == nil || err.Error() != "invalid input (failure)" {
+	if err := args.Do(&buf, tx); err == nil || err.Error() != "invalid input: failure" {
 		t.Errorf("invalid error: %v", err)
 	}
 	args.Opts.Confirm = func(string) bool {
@@ -96,7 +96,7 @@ func TestInsertDo(t *testing.T) {
 	args.Opts.IsPipe = func() bool {
 		return true
 	}
-	if err := args.Do(&buf, tx); err == nil || err.Error() != "invalid input (failure)" {
+	if err := args.Do(&buf, tx); err == nil || err.Error() != "invalid input: failure" {
 		t.Errorf("invalid error: %v", err)
 	}
 	args.Opts.Input = func(bool, bool) ([]byte, error) {