Merge pull request #3683 from MichaelEischer/fix-golangci-lint-warnings

Fix golangci lint warnings

.golangci.yml

@@ -24,7 +24,7 @@ linters:
     - govet
 
     # make sure names and comments are used according to the conventions
-    - golint
+    - revive
 
     # detect when assignments to existing variables are not used
     - ineffassign
@@ -51,7 +51,7 @@ issues:
 
   # list of things to not warn about
   exclude:
-    # golint: do not warn about missing comments for exported stuff
-    - exported (function|method|var|type|const) `.*` should have comment or be unexported
-    # golint: ignore constants in all caps
+    # revive: do not warn about missing comments for exported stuff
+    - exported (function|method|var|type|const) .* should have comment or be unexported
+    # revive: ignore constants in all caps
     - don't use ALL_CAPS in Go names; use CamelCase

cmd/restic/cmd_debug.go

@@ -1,3 +1,4 @@
+//go:build debug
 // +build debug
 
 package main

cmd/restic/cmd_mount.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux
 // +build darwin freebsd linux
 
 package main

cmd/restic/global.go

@@ -37,7 +37,7 @@ import (
 
 	"os/exec"
 
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 var version = "0.13.0-dev (compiled manually)"
@@ -145,13 +145,13 @@ func checkErrno(err error) error {
 }
 
 func stdinIsTerminal() bool {
-	return terminal.IsTerminal(int(os.Stdin.Fd()))
+	return term.IsTerminal(int(os.Stdin.Fd()))
 }
 
 func stdoutIsTerminal() bool {
 	// mintty on windows can use pipes which behave like a posix terminal,
 	// but which are not a terminal handle
-	return terminal.IsTerminal(int(os.Stdout.Fd())) || stdoutCanUpdateStatus()
+	return term.IsTerminal(int(os.Stdout.Fd())) || stdoutCanUpdateStatus()
 }
 
 func stdoutCanUpdateStatus() bool {
@@ -159,7 +159,7 @@ func stdoutCanUpdateStatus() bool {
 }
 
 func stdoutTerminalWidth() int {
-	w, _, err := terminal.GetSize(int(os.Stdout.Fd()))
+	w, _, err := term.GetSize(int(os.Stdout.Fd()))
 	if err != nil {
 		return 0
 	}
@@ -172,12 +172,12 @@ func stdoutTerminalWidth() int {
 // program execution must revert changes to the terminal configuration itself.
 // The terminal configuration is only restored while reading a password.
 func restoreTerminal() {
-	if !terminal.IsTerminal(int(os.Stdout.Fd())) {
+	if !term.IsTerminal(int(os.Stdout.Fd())) {
 		return
 	}
 
 	fd := int(os.Stdout.Fd())
-	state, err := terminal.GetState(fd)
+	state, err := term.GetState(fd)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "unable to get terminal state: %v\n", err)
 		return
@@ -192,7 +192,7 @@ func restoreTerminal() {
 		if !isReadingPassword {
 			return nil
 		}
-		err := checkErrno(terminal.Restore(fd, state))
+		err := checkErrno(term.Restore(fd, state))
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "unable to restore terminal state: %v\n", err)
 		}
@@ -322,7 +322,7 @@ func readPassword(in io.Reader) (password string, err error) {
 func readPasswordTerminal(in *os.File, out io.Writer, prompt string) (password string, err error) {
 	fmt.Fprint(out, prompt)
 	isReadingPassword = true
-	buf, err := terminal.ReadPassword(int(in.Fd()))
+	buf, err := term.ReadPassword(int(in.Fd()))
 	isReadingPassword = false
 	fmt.Fprintln(out)
 	if err != nil {

cmd/restic/global_debug.go

@@ -1,3 +1,4 @@
+//go:build debug || profile
 // +build debug profile
 
 package main

cmd/restic/global_release.go

@@ -1,3 +1,4 @@
+//go:build !debug && !profile
 // +build !debug,!profile
 
 package main

cmd/restic/integration_fuse_test.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux
 // +build darwin freebsd linux
 
 package main

cmd/restic/integration_helpers_unix_test.go

@@ -1,4 +1,5 @@
-//+build !windows
+//go:build !windows
+// +build !windows
 
 package main
 

cmd/restic/integration_helpers_windows_test.go

@@ -1,4 +1,5 @@
-//+build windows
+//go:build windows
+// +build windows
 
 package main
 

go.mod

@@ -31,6 +31,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
 	golang.org/x/text v0.3.6
 	google.golang.org/api v0.50.0
 	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637

internal/archiver/archiver_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package archiver

internal/archiver/archiver_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package archiver

internal/backend/foreground_sysv.go

@@ -1,3 +1,4 @@
+//go:build aix || solaris
 // +build aix solaris
 
 package backend

internal/backend/foreground_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package backend_test

internal/backend/foreground_unix.go

@@ -1,3 +1,4 @@
+//go:build !aix && !solaris && !windows
 // +build !aix,!solaris,!windows
 
 package backend

internal/backend/local/local_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package local

internal/bloblru/cache.go

@@ -22,7 +22,7 @@ type Cache struct {
 	free, size int // Current and max capacity, in bytes.
 }
 
-// Construct a blob cache that stores at most size bytes worth of blobs.
+// New constructs a blob cache that stores at most size bytes worth of blobs.
 func New(size int) *Cache {
 	c := &Cache{
 		free: size,

internal/debug/debug.go

@@ -1,3 +1,4 @@
+//go:build debug
 // +build debug
 
 package debug

internal/debug/debug_release.go

@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package debug

internal/debug/hooks.go

@@ -1,3 +1,4 @@
+//go:build debug
 // +build debug
 
 package debug

internal/debug/hooks_release.go

@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package debug

internal/debug/round_tripper_debug.go

@@ -1,3 +1,4 @@
+//go:build debug
 // +build debug
 
 package debug

internal/debug/round_tripper_release.go

@@ -1,3 +1,4 @@
+//go:build !debug
 // +build !debug
 
 package debug

internal/fs/const_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package fs

internal/fs/const_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package fs

internal/fs/deviceid_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package fs

internal/fs/deviceid_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package fs

internal/fs/file_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package fs

internal/fs/fs_local_vss.go

@@ -117,7 +117,7 @@ func (fs *LocalVss) snapshotPath(path string) string {
 			fs.msgMessage("creating VSS snapshot for [%s]\n", vssVolume)
 
 			if snapshot, err := NewVssSnapshot(vssVolume, 120, fs.msgError); err != nil {
-				_ = fs.msgError(vssVolume, errors.Errorf("failed to create snapshot for [%s]: %s\n",
+				_ = fs.msgError(vssVolume, errors.Errorf("failed to create snapshot for [%s]: %s",
 					vssVolume, err))
 				fs.failedSnapshots[volumeNameLower] = struct{}{}
 			} else {

internal/fs/stat_bsd.go

@@ -1,3 +1,4 @@
+//go:build freebsd || darwin || netbsd
 // +build freebsd darwin netbsd
 
 package fs

internal/fs/stat_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows && !darwin && !freebsd && !netbsd
 // +build !windows,!darwin,!freebsd,!netbsd
 
 package fs

internal/fs/stat_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package fs

internal/fs/vss.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package fs

internal/fs/vss_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package fs

internal/fuse/dir.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux
 // +build darwin freebsd linux
 
 package fuse

internal/fuse/file.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux
 // +build darwin freebsd linux
 
 package fuse

internal/fuse/meta_dir.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux
 // +build darwin freebsd linux
 
 package fuse

internal/fuse/other.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux
 // +build darwin freebsd linux
 
 package fuse

internal/fuse/snapshots_dir.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux
 // +build darwin freebsd linux
 
 package fuse

internal/limiter/static_limiter_test.go

@@ -56,7 +56,7 @@ func TestRoundTripperReader(t *testing.T) {
 	_, err := io.ReadFull(rand.Reader, data)
 	test.OK(t, err)
 
-	var send *tracedReadCloser = newTracedReadCloser(bytes.NewReader(data))
+	send := newTracedReadCloser(bytes.NewReader(data))
 	var recv *tracedReadCloser
 
 	rt := limiter.Transport(roundTripper(func(req *http.Request) (*http.Response, error) {

internal/restic/lock_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package restic

internal/restic/mknod_unix.go

@@ -1,3 +1,4 @@
+//go:build !freebsd && !windows
 // +build !freebsd,!windows
 
 package restic

internal/restic/node.go

@@ -166,7 +166,7 @@ func (node *Node) CreateAt(ctx context.Context, path string, repo Repository) er
 	case "socket":
 		return nil
 	default:
-		return errors.Errorf("filetype %q not implemented!\n", node.Type)
+		return errors.Errorf("filetype %q not implemented", node.Type)
 	}
 
 	return nil

internal/restic/node_aix.go

@@ -1,3 +1,4 @@
+//go:build aix
 // +build aix
 
 package restic

internal/restic/node_freebsd.go

@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 package restic

internal/restic/node_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package restic

internal/restic/node_unix_test.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package restic

internal/restorer/preallocate_other.go

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin
 // +build !linux,!darwin
 
 package restorer

internal/restorer/restorer_unix_test.go

@@ -1,4 +1,5 @@
-//+build !windows
+//go:build !windows
+// +build !windows
 
 package restorer
 

internal/ui/progress/counter_test.go

@@ -61,7 +61,7 @@ func TestCounter(t *testing.T) {
 
 func TestCounterNil(t *testing.T) {
 	// Shouldn't panic.
-	var c *progress.Counter = nil
+	var c *progress.Counter
 	c.Add(1)
 	c.Done()
 }

internal/ui/signals/signals_bsd.go

@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || netbsd || openbsd
 // +build darwin dragonfly freebsd netbsd openbsd
 
 package signals

internal/ui/signals/signals_sysv.go

@@ -1,3 +1,4 @@
+//go:build aix || linux || solaris
 // +build aix linux solaris
 
 package signals

internal/ui/termstatus/background.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package termstatus

internal/ui/termstatus/status.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"unicode"
 
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 	"golang.org/x/text/width"
 )
 
@@ -321,7 +321,7 @@ func (t *Terminal) SetStatus(lines []string) {
 	var width int
 	if t.canUpdateStatus {
 		var err error
-		width, _, err = terminal.GetSize(int(t.fd))
+		width, _, err = term.GetSize(int(t.fd))
 		if err != nil || width <= 0 {
 			// use 80 columns by default
 			width = 80

internal/ui/termstatus/terminal_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package termstatus
@@ -6,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 // clearCurrentLine removes all characters from the current line and resets the
@@ -23,7 +24,7 @@ func moveCursorUp(wr io.Writer, fd uintptr) func(io.Writer, uintptr, int) {
 // CanUpdateStatus returns true if status lines can be printed, the process
 // output is not redirected to a file or pipe.
 func CanUpdateStatus(fd uintptr) bool {
-	if !terminal.IsTerminal(int(fd)) {
+	if !term.IsTerminal(int(fd)) {
 		return false
 	}
 	term := os.Getenv("TERM")

internal/ui/termstatus/terminal_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package termstatus