Up golangci linter to 1.33 version

Author: outdead

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       uses: golangci/golangci-lint-action@v2
       with:
         # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-        version: v1.31
+        version: v1.33
 
         # Optional: working directory, useful for monorepos
         # working-directory: somedir

.golangci.yml

@@ -127,4 +127,5 @@ issues:
     - "don't use ALL_CAPS in Go names; use CamelCase" # golint
     - "ST1003: should not use ALL_CAPS in Go names; use CamelCase instead" # stylecheck
     - "shadow: declaration of \"err\"" # govet
-    - "`DefaultSettings` is a global variable" # gochecknoglobals
+    - "DefaultSettings`? is a global variable" # gochecknoglobals
+    - "are|is missing in" # exhaustivestruct # v1.33

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [v1.3.1] - 2021-01-06
+### Updated
+- Updated golangci linter to 1.33 version
+
+### Changed
+- Changed errors handling - added wrapping.
+
 ## [v1.3.0] - 2020-12-02
 ### Fixed
 - Fixed wrong number of bytes written in Packet WriteTo function.
@@ -67,7 +74,8 @@ changed.
 ### Added
 - Initial implementation.
 
-[Unreleased]: https://github.com/gorcon/rcon/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/gorcon/rcon/compare/v1.3.1...HEAD
+[v1.3.1]: https://github.com/gorcon/rcon/compare/v1.3.0...v1.3.1
 [v1.3.0]: https://github.com/gorcon/rcon/compare/v1.2.4...v1.3.0
 [v1.2.4]: https://github.com/gorcon/rcon/compare/v1.2.3...v1.2.4
 [v1.2.3]: https://github.com/gorcon/rcon/compare/v1.2.2...v1.2.3

packet.go

@@ -3,6 +3,7 @@ package rcon
 import (
 	"bytes"
 	"encoding/binary"
+	"fmt"
 	"io"
 )
 
@@ -91,7 +92,7 @@ func (packet *Packet) WriteTo(w io.Writer) (n int64, err error) {
 // ReadFrom implements io.ReaderFrom for read a packet from r.
 func (packet *Packet) ReadFrom(r io.Reader) (n int64, err error) {
 	if err := binary.Read(r, binary.LittleEndian, &packet.Size); err != nil {
-		return n, err
+		return n, fmt.Errorf("rcon: read packet size %w", err)
 	}
 
 	n += 4
@@ -101,13 +102,13 @@ func (packet *Packet) ReadFrom(r io.Reader) (n int64, err error) {
 	}
 
 	if err := binary.Read(r, binary.LittleEndian, &packet.ID); err != nil {
-		return n, err
+		return n, fmt.Errorf("rcon: read packet id %w", err)
 	}
 
 	n += 4
 
 	if err := binary.Read(r, binary.LittleEndian, &packet.Type); err != nil {
-		return n, err
+		return n, fmt.Errorf("rcon: read packet type: %w", err)
 	}
 
 	n += 4
@@ -121,7 +122,7 @@ func (packet *Packet) ReadFrom(r io.Reader) (n int64, err error) {
 		var m int
 
 		if m, err = r.Read(packet.body[i:]); err != nil {
-			return n + int64(m) + int64(i), err
+			return n + int64(m) + int64(i), fmt.Errorf("rcon: %w", err)
 		}
 
 		i += int32(m)

rcon.go

@@ -104,18 +104,19 @@ func Dial(address string, password string, options ...Option) (*Conn, error) {
 	conn, err := net.DialTimeout("tcp", address, settings.dialTimeout)
 	if err != nil {
 		// Failed to open TCP connection to the server.
-		return nil, err
+		return nil, fmt.Errorf("rcon: %w", err)
 	}
 
 	client := Conn{conn: conn, settings: settings}
 
 	if err := client.auth(password); err != nil {
 		// Failed to auth conn with the server.
 		if err2 := client.Close(); err2 != nil {
+			//nolint:errorlint // TODO: Come up with the better wrapping
 			return &client, fmt.Errorf("%w: %v. Previous error: %v", ErrMultiErrorOccurred, err2, err)
 		}
 
-		return &client, err
+		return &client, fmt.Errorf("rcon: %w", err)
 	}
 
 	return &client, nil
@@ -174,7 +175,7 @@ func (c *Conn) auth(password string) error {
 
 	if c.settings.deadline != 0 {
 		if err := c.conn.SetReadDeadline(time.Now().Add(c.settings.deadline)); err != nil {
-			return err
+			return fmt.Errorf("rcon: %w", err)
 		}
 	}
 
@@ -200,7 +201,7 @@ func (c *Conn) auth(password string) error {
 	// We must to read response body.
 	buffer := make([]byte, response.Size-PacketHeaderSize)
 	if _, err := c.conn.Read(buffer); err != nil {
-		return err
+		return fmt.Errorf("rcon: %w", err)
 	}
 
 	if response.Type != SERVERDATA_AUTH_RESPONSE {
@@ -222,7 +223,7 @@ func (c *Conn) auth(password string) error {
 func (c *Conn) write(packetType int32, packetID int32, command string) error {
 	if c.settings.deadline != 0 {
 		if err := c.conn.SetWriteDeadline(time.Now().Add(c.settings.deadline)); err != nil {
-			return err
+			return fmt.Errorf("rcon: %w", err)
 		}
 	}
 
@@ -236,7 +237,7 @@ func (c *Conn) write(packetType int32, packetID int32, command string) error {
 func (c *Conn) read() (*Packet, error) {
 	if c.settings.deadline != 0 {
 		if err := c.conn.SetReadDeadline(time.Now().Add(c.settings.deadline)); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("rcon: %w", err)
 		}
 	}
 
@@ -270,15 +271,15 @@ func (c *Conn) read() (*Packet, error) {
 func (c *Conn) readHeader() (Packet, error) {
 	var packet Packet
 	if err := binary.Read(c.conn, binary.LittleEndian, &packet.Size); err != nil {
-		return packet, err
+		return packet, fmt.Errorf("rcon: read packet size: %w", err)
 	}
 
 	if err := binary.Read(c.conn, binary.LittleEndian, &packet.ID); err != nil {
-		return packet, err
+		return packet, fmt.Errorf("rcon: read packet id: %w", err)
 	}
 
 	if err := binary.Read(c.conn, binary.LittleEndian, &packet.Type); err != nil {
-		return packet, err
+		return packet, fmt.Errorf("rcon: read packet type: %w", err)
 	}
 
 	return packet, nil

rcontest/server.go

@@ -2,6 +2,7 @@
 package rcontest
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -144,9 +145,11 @@ func (s *Server) Addr() string {
 func (s *Server) NewContext(conn net.Conn) (*Context, error) {
 	ctx := Context{server: s, conn: conn, request: &rcon.Packet{}}
 
-	_, err := ctx.request.ReadFrom(conn)
+	if _, err := ctx.request.ReadFrom(conn); err != nil {
+		return &ctx, fmt.Errorf("rcontest: %w", err)
+	}
 
-	return &ctx, err
+	return &ctx, nil
 }
 
 // serve handles incoming requests until a stop signal is given with Close.
@@ -155,7 +158,7 @@ func (s *Server) serve() {
 		conn, err := s.Listener.Accept()
 		if err != nil {
 			if s.isRunning() {
-				panic(fmt.Errorf("serve error: %w", err))
+				panic(fmt.Errorf("rcontest: %w", err))
 			}
 
 			return
@@ -192,7 +195,7 @@ func (s *Server) handle(conn net.Conn) {
 	for {
 		ctx, err := s.NewContext(conn)
 		if err != nil {
-			if err != io.EOF {
+			if !errors.Is(err, io.EOF) {
 				panic(fmt.Errorf("failed read request: %w", err))
 			}