Happy linter is happy

gopasspw · Oct 2, 2024 · 931a3a8 · 931a3a8
1 parent 3e9a9de
commit 931a3a8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/internal/action/init.go b/internal/action/init.go
@@ -144,6 +144,7 @@ func (s *Action) init(ctx context.Context, alias, path string, keys ...string) e
 		nk, err := cui.AskForPrivateKey(ctx, crypto, "🎮 Please select a private key for encrypting secrets:")
 		if err != nil {
 			out.Noticef(ctx, "Hint: Use 'gopass setup --crypto %s' to be guided through an initial setup instead of 'gopass init'", crypto.Name())
+
 			return fmt.Errorf("failed to read user input: %w", err)
 		}
 		keys = []string{nk}

diff --git a/internal/backend/crypto/age/clientUI.go b/internal/backend/crypto/age/clientUI.go
@@ -12,9 +12,11 @@ import (
 var pluginTerminalUI = &plugin.ClientUI{
 	DisplayMessage: func(name, message string) error {
 		out.Printf(context.Background(), "%s plugin: %s", name, message)
+
 		return nil
 	},
-	RequestValue: func(name, message string, _ bool) (s string, err error) {
+	RequestValue: func(name, message string, _ bool) (string, error) {
+		var err error
 		defer func() {
 			if err != nil {
 				out.Warningf(context.Background(), "could not read value for age-plugin-%s: %v", name, err)
@@ -24,13 +26,15 @@ var pluginTerminalUI = &plugin.ClientUI{
 		if err != nil {
 			return "", err
 		}
+
 		return secret, nil
 	},
-	Confirm: func(name, message, yes, no string) (choseYes bool, err error) {
+	Confirm: func(name, message, yes, no string) (bool, error) {
 		rep, _ := cui.GetSelection(context.Background(), message, []string{yes, no})
 		if rep == yes {
 			return true, nil
 		}
+
 		return false, nil
 	},
 

diff --git a/internal/backend/crypto/age/commands.go b/internal/backend/crypto/age/commands.go
@@ -13,6 +13,7 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+//nolint:cyclop
 func (l loader) Commands() []*cli.Command {
 	return []*cli.Command{
 		{
@@ -152,6 +153,7 @@ func (l loader) Commands() []*cli.Command {
 									case *age.X25519Identity:
 										if x.Recipient().String() == victim {
 											debug.Log("removed X25519Identity %s", x.Recipient())
+
 											continue
 										}
 									case *wrappedIdentity:
@@ -164,6 +166,7 @@ func (l loader) Commands() []*cli.Command {
 										}
 										if skip {
 											debug.Log("removed Plugin Identity %s", x)
+
 											continue
 										}
 									}

diff --git a/internal/backend/crypto/age/identities.go b/internal/backend/crypto/age/identities.go
@@ -96,13 +96,15 @@ func parseIdentity(s string) (age.Identity, error) {
 		} else {
 			rec = id.Recipient()
 		}
+
 		return &wrappedIdentity{
 			id:       id,
 			encoding: s,
 			rec:      rec,
 		}, err
 	case strings.HasPrefix(s, "AGE-SECRET-KEY-1"):
 		sp := strings.Split(s, "|")
+
 		return age.ParseX25519Identity(sp[0])
 	default:
 		return nil, fmt.Errorf("unknown identity type")
@@ -134,6 +136,7 @@ func parseIdentities(f io.Reader) ([]age.Identity, error) {
 	if len(ids) == 0 {
 		return nil, fmt.Errorf("no secret keys found")
 	}
+
 	return ids, nil
 }
 
@@ -199,6 +202,7 @@ func IdentityToRecipient(id age.Identity) age.Recipient {
 		return id.Recipient()
 	default:
 		debug.Log("unexpected age identity type: %T", id)
+
 		return nil
 	}
 }
@@ -294,6 +298,7 @@ func (a *Age) addIdentity(ctx context.Context, id age.Identity) error {
 	ids, _ := a.Identities(ctx)
 
 	ids = append(ids, id)
+
 	return a.saveIdentities(ctx, identitiesToString(ids), true)
 }