all: fix linter warnings reported by revive

There are some reports that I disagree with revive, in example, code
should not declare the type after variables.
In my opinion, on some cases, declaring the type make the code more
readable and explicit.
Since I did not want to add new configuration file, we changes it and
follow revive for now.

6 files changed, 66 insertions, 65 deletions

diff --git a/lib/ssh/config/config.go b/lib/ssh/config/config.go
index f8c92ea8..856bd6c8 100644
--- a/lib/ssh/config/config.go
+++ b/lib/ssh/config/config.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	envSshAuthSock = "SSH_AUTH_SOCK"
+	envSSHAuthSock = `SSH_AUTH_SOCK`
 )
 
 const (
diff --git a/lib/ssh/config/parser.go b/lib/ssh/config/parser.go
index 5f9e57bc..8e0d6b03 100644
--- a/lib/ssh/config/parser.go
+++ b/lib/ssh/config/parser.go
@@ -135,10 +135,11 @@ func isIncludeDirective(line string) bool {
 
 func parseInclude(line string) (patterns []string) {
 	var (
-		useQuote bool
-		x        int = len(keyInclude)
+		x = len(keyInclude)
+
 		start    int
 		end      int
+		useQuote bool
 	)
 
 	for ; x < len(line); x++ {
diff --git a/lib/ssh/config/section.go b/lib/ssh/config/section.go
index 70ed8969..baeeb344 100644
--- a/lib/ssh/config/section.go
+++ b/lib/ssh/config/section.go
@@ -358,8 +358,8 @@ func (section *Section) IdentityAgent() string {
 	if value == `none` {
 		return ``
 	}
-	if len(value) == 0 || value == envSshAuthSock {
-		return os.Getenv(envSshAuthSock)
+	if len(value) == 0 || value == envSSHAuthSock {
+		return os.Getenv(envSSHAuthSock)
 	}
 	if value[0] == '$' {
 		// Read the socket from environment variable defined by
diff --git a/lib/ssh/sftp/client.go b/lib/ssh/sftp/client.go
index ea8c4ae8..aec6751d 100644
--- a/lib/ssh/sftp/client.go
+++ b/lib/ssh/sftp/client.go
@@ -25,13 +25,13 @@ type Client struct {
 	pipeOut io.Reader
 	pipeErr io.Reader
 
-	// The requestId is unique number that will be incremented by client,
+	// The requestID is unique number that will be incremented by client,
 	// to prevent the same ID generated on concurrent operations.
-	requestId uint32
+	requestID uint32
 
 	version uint32
 
-	mtxId sync.Mutex
+	mtxID sync.Mutex
 }
 
 // NewClient create and initialize new client for SSH file transfer protocol.
@@ -69,7 +69,7 @@ func NewClient(sshc *ssh.Client) (cl *Client, err error) {
 		return nil, fmt.Errorf("%s: RequestSubsystem: %w", logp, err)
 	}
 
-	cl.requestId = uint32(time.Now().Unix())
+	cl.requestID = uint32(time.Now().Unix())
 
 	err = cl.init()
 	if err != nil {
@@ -83,7 +83,7 @@ func NewClient(sshc *ssh.Client) (cl *Client, err error) {
 func (cl *Client) Close() (err error) {
 	err = cl.sess.Close()
 
-	cl.requestId = 0
+	cl.requestID = 0
 	cl.pipeErr = nil
 	cl.pipeOut = nil
 	cl.pipeIn = nil
@@ -647,12 +647,12 @@ func (cl *Client) Write(fh *FileHandle, offset uint64, data []byte) (err error)
 }
 
 func (cl *Client) generatePacket() (pac *packet) {
-	cl.mtxId.Lock()
-	cl.requestId++
+	cl.mtxID.Lock()
+	cl.requestID++
 	pac = &packet{
-		requestId: cl.requestId,
+		requestID: cl.requestID,
 	}
-	cl.mtxId.Unlock()
+	cl.mtxID.Unlock()
 	return pac
 }
 
diff --git a/lib/ssh/sftp/file_attrs.go b/lib/ssh/sftp/file_attrs.go
index a5e8c870..12b69590 100644
--- a/lib/ssh/sftp/file_attrs.go
+++ b/lib/ssh/sftp/file_attrs.go
@@ -27,29 +27,29 @@ const (
 
 // List of valid values for FileAttrs.flags.
 const (
-	attr_SIZE        uint32 = 0x00000001
-	attr_UIDGID      uint32 = 0x00000002
-	attr_PERMISSIONS uint32 = 0x00000004
-	attr_ACMODTIME   uint32 = 0x00000008
-	attr_EXTENDED    uint32 = 0x80000000
+	attrSize        uint32 = 0x00000001
+	attrUIDGID      uint32 = 0x00000002
+	attrPermissions uint32 = 0x00000004
+	attrAcModtime   uint32 = 0x00000008
+	attrExtended    uint32 = 0x80000000
 )
 
 // FileAttrs define the attributes for opening or creating file on the remote.
 type FileAttrs struct {
-	exts extensions // attr_EXTENDED
+	exts extensions // attrExtended
 
 	name string
 
 	fsMode fs.FileMode
 
-	size uint64 // attr_SIZE
+	size uint64 // attrSize
 
 	flags       uint32
-	uid         uint32 // attr_UIDGID
-	gid         uint32 // attr_UIDGID
-	permissions uint32 // attr_PERMISSIONS
-	atime       uint32 // attr_ACMODTIME
-	mtime       uint32 // attr_ACMODTIME
+	uid         uint32 // attrUIDGID
+	gid         uint32 // attrUIDGID
+	permissions uint32 // attrPermissions
+	atime       uint32 // attrAcModtime
+	mtime       uint32 // attrAcModtime
 }
 
 // NewFileAttrs create and initialize FileAttrs from FileInfo.
@@ -79,12 +79,12 @@ func unpackFileAttrs(payload []byte) (fa *FileAttrs, length int) {
 	payload = payload[4:]
 	length += 4
 
-	if fa.flags&attr_SIZE != 0 {
+	if fa.flags&attrSize != 0 {
 		fa.size = binary.BigEndian.Uint64(payload)
 		payload = payload[8:]
 		length += 8
 	}
-	if fa.flags&attr_UIDGID != 0 {
+	if fa.flags&attrUIDGID != 0 {
 		fa.uid = binary.BigEndian.Uint32(payload)
 		payload = payload[4:]
 		length += 4
@@ -92,13 +92,13 @@ func unpackFileAttrs(payload []byte) (fa *FileAttrs, length int) {
 		payload = payload[4:]
 		length += 4
 	}
-	if fa.flags&attr_PERMISSIONS != 0 {
+	if fa.flags&attrPermissions != 0 {
 		fa.permissions = binary.BigEndian.Uint32(payload)
 		payload = payload[4:]
 		length += 4
 		fa.updateFsmode()
 	}
-	if fa.flags&attr_ACMODTIME != 0 {
+	if fa.flags&attrAcModtime != 0 {
 		fa.atime = binary.BigEndian.Uint32(payload)
 		payload = payload[4:]
 		length += 4
@@ -106,7 +106,7 @@ func unpackFileAttrs(payload []byte) (fa *FileAttrs, length int) {
 		payload = payload[4:]
 		length += 4
 	}
-	if fa.flags&attr_EXTENDED != 0 {
+	if fa.flags&attrExtended != 0 {
 		n := binary.BigEndian.Uint32(payload)
 		payload = payload[4:]
 		length += 4
@@ -138,21 +138,21 @@ func unpackFileAttrs(payload []byte) (fa *FileAttrs, length int) {
 func (fa *FileAttrs) pack(w io.Writer) {
 	_ = binary.Write(w, binary.BigEndian, fa.flags)
 
-	if fa.flags&attr_SIZE != 0 {
+	if fa.flags&attrSize != 0 {
 		_ = binary.Write(w, binary.BigEndian, fa.size)
 	}
-	if fa.flags&attr_UIDGID != 0 {
+	if fa.flags&attrUIDGID != 0 {
 		_ = binary.Write(w, binary.BigEndian, fa.uid)
 		_ = binary.Write(w, binary.BigEndian, fa.gid)
 	}
-	if fa.flags&attr_PERMISSIONS != 0 {
+	if fa.flags&attrPermissions != 0 {
 		_ = binary.Write(w, binary.BigEndian, fa.permissions)
 	}
-	if fa.flags&attr_ACMODTIME != 0 {
+	if fa.flags&attrAcModtime != 0 {
 		_ = binary.Write(w, binary.BigEndian, fa.atime)
 		_ = binary.Write(w, binary.BigEndian, fa.mtime)
 	}
-	if fa.flags&attr_EXTENDED != 0 {
+	if fa.flags&attrExtended != 0 {
 		n := uint32(len(fa.exts))
 		_ = binary.Write(w, binary.BigEndian, n)
 		for k, v := range fa.exts {
@@ -207,7 +207,7 @@ func (fa *FileAttrs) Permissions() uint32 {
 
 // SetAccessTime set the file attribute access time.
 func (fa *FileAttrs) SetAccessTime(v uint32) {
-	fa.flags |= attr_ACMODTIME
+	fa.flags |= attrAcModtime
 	fa.atime = v
 }
 
@@ -216,38 +216,38 @@ func (fa *FileAttrs) SetExtension(name, data string) {
 	if fa.exts == nil {
 		fa.exts = extensions{}
 	}
-	fa.flags |= attr_EXTENDED
+	fa.flags |= attrExtended
 	fa.exts[name] = data
 }
 
 // SetGid set the file attribute group ID.
 func (fa *FileAttrs) SetGid(gid uint32) {
-	fa.flags |= attr_UIDGID
+	fa.flags |= attrUIDGID
 	fa.gid = gid
 }
 
 // SetModifiedTime set the file attribute modified time.
 func (fa *FileAttrs) SetModifiedTime(v uint32) {
-	fa.flags |= attr_ACMODTIME
+	fa.flags |= attrAcModtime
 	fa.mtime = v
 }
 
 // SetPermissions set the remote file permission.
 func (fa *FileAttrs) SetPermissions(v uint32) {
-	fa.flags |= attr_PERMISSIONS
+	fa.flags |= attrPermissions
 	fa.permissions = v
 	fa.updateFsmode()
 }
 
 // SetSize set the remote file size.
 func (fa *FileAttrs) SetSize(v uint64) {
-	fa.flags |= attr_SIZE
+	fa.flags |= attrSize
 	fa.size = v
 }
 
 // SetUid set the file attribute user ID.
-func (fa *FileAttrs) SetUid(uid uint32) {
-	fa.flags |= attr_UIDGID
+func (fa *FileAttrs) SetUid(uid uint32) { //revive:disable-line
+	fa.flags |= attrUIDGID
 	fa.uid = uid
 }
 
@@ -262,7 +262,7 @@ func (fa *FileAttrs) Sys() interface{} {
 }
 
 // Uid return the user ID of file.
-func (fa *FileAttrs) Uid() uint32 {
+func (fa *FileAttrs) Uid() uint32 { //revive:disable-line
 	return fa.uid
 }
 
diff --git a/lib/ssh/sftp/packet.go b/lib/ssh/sftp/packet.go
index 4f7b24f3..2460e1dd 100644
--- a/lib/ssh/sftp/packet.go
+++ b/lib/ssh/sftp/packet.go
@@ -67,7 +67,7 @@ type packet struct {
 	version   uint32 // from FxpVersion.
 	code      uint32 // from FxpStatus
 	length    uint32
-	requestId uint32
+	requestID uint32
 
 	kind byte
 }
@@ -96,7 +96,7 @@ func unpackPacket(payload []byte) (pac *packet, err error) {
 		return pac, nil
 	}
 
-	pac.requestId = v
+	pac.requestID = v
 
 	switch pac.kind {
 	case packetKindFxpStatus:
@@ -161,7 +161,7 @@ func (pac *packet) fxpClose(fh *FileHandle) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpClose)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(fh.v)))
 	_ = binary.Write(&buf, binary.BigEndian, fh.v)
 
@@ -172,7 +172,7 @@ func (pac *packet) fxpFsetstat(fh *FileHandle, fa *FileAttrs) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpFsetstat)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(fh.v)))
 	_ = binary.Write(&buf, binary.BigEndian, fh.v)
 	fa.pack(&buf)
@@ -184,7 +184,7 @@ func (pac *packet) fxpFstat(fh *FileHandle) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpFstat)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(fh.v)))
 	_ = binary.Write(&buf, binary.BigEndian, fh.v)
 
@@ -207,7 +207,7 @@ func (pac *packet) fxpLstat(remoteFile string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpLstat)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(remoteFile)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(remoteFile))
 
@@ -218,7 +218,7 @@ func (pac *packet) fxpMkdir(path string, fa *FileAttrs) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpMkdir)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(path)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(path))
 	fa.pack(&buf)
@@ -230,7 +230,7 @@ func (pac *packet) fxpOpen(filename string, pflags uint32, fa *FileAttrs) []byte
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpOpen)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(filename)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(filename))
 	_ = binary.Write(&buf, binary.BigEndian, pflags)
@@ -243,7 +243,7 @@ func (pac *packet) fxpOpendir(path string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpOpendir)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(path)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(path))
 
@@ -254,7 +254,7 @@ func (pac *packet) fxpRead(fh *FileHandle, offset uint64, length uint32) []byte
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpRead)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(fh.v)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(fh.v))
 	_ = binary.Write(&buf, binary.BigEndian, offset)
@@ -267,7 +267,7 @@ func (pac *packet) fxpReaddir(fh *FileHandle) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpReaddir)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(fh.v)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(fh.v))
 
@@ -278,7 +278,7 @@ func (pac *packet) fxpReadlink(linkPath string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpReadlink)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(linkPath)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(linkPath))
 
@@ -289,7 +289,7 @@ func (pac *packet) fxpRealpath(path string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpRealpath)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(path)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(path))
 
@@ -300,7 +300,7 @@ func (pac *packet) fxpRemove(remoteFile string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpRemove)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(remoteFile)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(remoteFile))
 
@@ -311,7 +311,7 @@ func (pac *packet) fxpRename(oldPath, newPath string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpRename)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(oldPath)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(oldPath))
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(newPath)))
@@ -324,7 +324,7 @@ func (pac *packet) fxpRmdir(path string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpRmdir)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(path)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(path))
 
@@ -335,7 +335,7 @@ func (pac *packet) fxpSetstat(remoteFile string, fa *FileAttrs) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpSetstat)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(remoteFile)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(remoteFile))
 	fa.pack(&buf)
@@ -347,7 +347,7 @@ func (pac *packet) fxpStat(remoteFile string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpStat)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(remoteFile)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(remoteFile))
 
@@ -358,7 +358,7 @@ func (pac *packet) fxpSymlink(linkPath, targetPath string) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpSymlink)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(linkPath)))
 	_ = binary.Write(&buf, binary.BigEndian, []byte(linkPath))
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(targetPath)))
@@ -371,7 +371,7 @@ func (pac *packet) fxpWrite(fh *FileHandle, offset uint64, data []byte) []byte {
 	var buf bytes.Buffer
 
 	_ = binary.Write(&buf, binary.BigEndian, packetKindFxpWrite)
-	_ = binary.Write(&buf, binary.BigEndian, pac.requestId)
+	_ = binary.Write(&buf, binary.BigEndian, pac.requestID)
 	_ = binary.Write(&buf, binary.BigEndian, uint32(len(fh.v)))
 	_ = binary.Write(&buf, binary.BigEndian, fh.v)
 	_ = binary.Write(&buf, binary.BigEndian, offset)