Fixing the new lint issues in 1.61.0

Signed-off-by: Yolan Romailler <AnomalRoil@users.noreply.github.com>

.golangci.yml

@@ -36,7 +36,7 @@ linters:
   - errname
   - errorlint
   - exhaustive
-  - exportloopref
+  # - exportloopref # deprecated since Go 1.22
   - forcetypeassert
   - funlen
   - ginkgolinter

internal/action/show.go

@@ -197,7 +197,7 @@ func (s *Action) showHandleOutput(ctx context.Context, name string, sec gopass.S
 			out.Warning(ctx, "show.safecontent=true. Use -f to display password, if any")
 		}
 
-		return exit.Error(exit.NotFound, store.ErrEmptySecret, store.ErrEmptySecret.Error())
+		return exit.Error(exit.NotFound, store.ErrEmptySecret, "%v", store.ErrEmptySecret)
 	}
 
 	if IsPrintQR(ctx) && IsQRBody(ctx) {
@@ -244,7 +244,7 @@ func (s *Action) showGetContent(ctx context.Context, sec gopass.Secret) (string,
 		key := GetKey(ctx)
 		values, found := sec.Values(key)
 		if !found {
-			return "", "", exit.Error(exit.NotFound, store.ErrNoKey, store.ErrNoKey.Error())
+			return "", "", exit.Error(exit.NotFound, store.ErrNoKey, "%v", store.ErrNoKey)
 		}
 		val := strings.Join(values, "\n")
 
@@ -264,7 +264,7 @@ func (s *Action) showGetContent(ctx context.Context, sec gopass.Secret) (string,
 	}
 	if IsPasswordOnly(ctx) {
 		if pw == "" && fullBody != "" {
-			return "", "", exit.Error(exit.NotFound, store.ErrNoPassword, store.ErrNoPassword.Error())
+			return "", "", exit.Error(exit.NotFound, store.ErrNoPassword, "%v", store.ErrNoPassword)
 		}
 
 		return pw, pw, nil

internal/backend/crypto/gpg/key.go

@@ -74,7 +74,7 @@ func (k Key) String() string {
 
 	out += "\n      Key fingerprint = " + k.Fingerprint
 	for _, id := range k.Identities {
-		out += fmt.Sprintf("\n" + id.String())
+		out += fmt.Sprintf("\n%s", id)
 	}
 
 	return out

internal/store/leaf/recipients_test.go

@@ -137,7 +137,7 @@ func TestSaveRecipients(t *testing.T) {
 	sort.Strings(foundRecs)
 
 	ids := rs.IDs()
-	for i := range len(ids) {
+	for i := range ids {
 		if i >= len(foundRecs) {
 			t.Errorf("Read too few recipients")
 

pkg/clipboard/clipboard.go

@@ -18,7 +18,8 @@ var (
 	// -ldflags=='-X github.com/gopasspw/gopass/pkg/clipboard.Helpers=termux-api'.
 	Helpers = "xsel or xclip"
 	// ErrNotSupported is returned when the clipboard is not accessible.
-	ErrNotSupported = fmt.Errorf("WARNING: No clipboard available. Install " + Helpers + ", provide $GOPASS_CLIPBOARD_COPY_CMD and $GOPASS_CLIPBOARD_CLEAR_CMD or use -f to print to console")
+	ErrNotSupported = fmt.Errorf("WARNING: No clipboard available. "+
+		"Install %s, provide $GOPASS_CLIPBOARD_COPY_CMD and $GOPASS_CLIPBOARD_CLEAR_CMD or use -f to print to console", Helpers)
 )
 
 // CopyTo copies the given data to the clipboard and enqueues automatic

tests/tester.go

@@ -77,13 +77,13 @@ func newTester(t *testing.T) *tester {
 
 	// prepare ENVIRONMENT
 	ts.resetFn = gptest.UnsetVars("GNUPGHOME", "GOPASS_DEBUG", "NO_COLOR", "GOPASS_CONFIG", "GOPASS_NO_NOTIFY", "GOPASS_HOMEDIR")
-	require.NoError(t, os.Setenv("GNUPGHOME", ts.gpgDir()))
-	require.NoError(t, os.Setenv("GOPASS_DEBUG", ""))
-	require.NoError(t, os.Setenv("NO_COLOR", "true"))
-	require.NoError(t, os.Setenv("GOPASS_CONFIG_NOSYSTEM", "true"))
-	require.NoError(t, os.Setenv("GOPASS_CONFIG_NO_MIGRATE", "true"))
-	require.NoError(t, os.Setenv("GOPASS_NO_NOTIFY", "true"))
-	require.NoError(t, os.Setenv("GOPASS_HOMEDIR", td))
+	t.Setenv("GNUPGHOME", ts.gpgDir())
+	t.Setenv("GOPASS_DEBUG", "")
+	t.Setenv("NO_COLOR", "true")
+	t.Setenv("GOPASS_CONFIG_NOSYSTEM", "true")
+	t.Setenv("GOPASS_CONFIG_NO_MIGRATE", "true")
+	t.Setenv("GOPASS_NO_NOTIFY", "true")
+	t.Setenv("GOPASS_HOMEDIR", td)
 
 	// write config
 	require.NoError(t, os.MkdirAll(filepath.Dir(ts.gopassConfig()), 0o700))