Linter issues fixed

.golangci.yml

@@ -1,13 +1,13 @@
-service:
-  golangci-lint-version: v1.55.1
-
 run:
   tests: false
-  skip-dirs:
+
+issues:
+  exclude-files:
+    - ".*easyjson\\.go$"
+  exclude-dirs:
     - allure
     - mocks
-  skip-files:
-    - ".*easyjson\\.go$"
+
 output:
   print-issued-lines: false
 
@@ -32,6 +32,14 @@ linters-settings:
       # Should be enabled after fixing underscore package names.
       - name: var-naming
         disabled: true
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/lamoda/gonkey)
+    skip-generated: true
+    custom-order: false
+    no-lex-order: false
 
 linters:
   enable:
@@ -58,4 +66,5 @@ linters:
     - unconvert
     - unparam
     - unused
-    - gas
+    - gosec
+    - gci

checker/addons/openapi2_compliance/checker.go

@@ -4,14 +4,14 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/lamoda/gonkey/checker"
-	"github.com/lamoda/gonkey/models"
-
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/loads"
 	"github.com/go-openapi/spec"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/validate"
+
+	"github.com/lamoda/gonkey/checker"
+	"github.com/lamoda/gonkey/models"
 )
 
 type ResponseSchemaChecker struct {

checker/response_db/response_db.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/fatih/color"
+	"github.com/kylelemons/godebug/pretty"
+
 	"github.com/lamoda/gonkey/checker"
 	"github.com/lamoda/gonkey/compare"
 	"github.com/lamoda/gonkey/models"
-
-	"github.com/fatih/color"
-	"github.com/kylelemons/godebug/pretty"
 )
 
 type ResponseDbChecker struct {

checker/response_header/response_header_test.go

@@ -5,10 +5,10 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/lamoda/gonkey/models"
 	"github.com/lamoda/gonkey/testloader/yaml_file"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestCheckShouldMatchSubset(t *testing.T) {

examples/mock-based-on-request/main.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	urlpkg "net/url"
@@ -45,7 +44,7 @@ func Do(w http.ResponseWriter, r *http.Request) {
 		if res.StatusCode != http.StatusOK {
 			return 0, fmt.Errorf("backend response status code %d", res.StatusCode)
 		}
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		_ = res.Body.Close()
 		if err != nil {
 			return 0, fmt.Errorf("cannot read response body %w", err)

examples/mock-field-json-str/main.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -20,7 +20,7 @@ func initServer() {
 }
 
 func ProxyRequest(w http.ResponseWriter, r *http.Request) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		log.Print(err)
 		w.Write([]byte("{\"status\": \"error\"}"))

examples/traffic-lights-demo/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"sync"
@@ -54,7 +54,7 @@ func initServer() {
 		lights.mutex.Lock()
 		defer lights.mutex.Unlock()
 
-		request, err := ioutil.ReadAll(r.Body)
+		request, err := io.ReadAll(r.Body)
 		if err != nil {
 			log.Fatal(err)
 		}

examples/with-cases-example/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 )
@@ -34,7 +34,7 @@ func Do(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	jsonRequest, _ := ioutil.ReadAll(r.Body)
+	jsonRequest, _ := io.ReadAll(r.Body)
 	request := buildRequest(jsonRequest)
 
 	if request.Name == "a" {

fixtures/postgres/postgres.go

@@ -379,7 +379,7 @@ func (f *LoaderPostgres) buildInsertQuery(ctx *loadContext, t tableName, rows ta
 	fieldPresence := make(map[string]bool)
 	for _, row := range rows {
 		for name := range row {
-			if len(name) > 0 && name[0] == '$' {
+			if name != "" && name[0] == '$' {
 				continue
 			}
 			if _, ok := fieldPresence[name]; !ok {

fixtures/redis/redis.go

@@ -3,8 +3,9 @@ package redis
 import (
 	"context"
 
-	"github.com/lamoda/gonkey/fixtures/redis/parser"
 	"github.com/redis/go-redis/v9"
+
+	"github.com/lamoda/gonkey/fixtures/redis/parser"
 )
 
 type Loader struct {

mocks/request_constraint.go

@@ -5,17 +5,18 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"reflect"
 	"regexp"
 	"sort"
 	"strings"
 
+	"github.com/tidwall/gjson"
+
 	"github.com/lamoda/gonkey/compare"
 	"github.com/lamoda/gonkey/xmlparsing"
-	"github.com/tidwall/gjson"
 )
 
 type verifier interface {
@@ -47,12 +48,12 @@ func newBodyMatchesXMLConstraint(expected string, params compare.Params) (verifi
 }
 
 func (c *bodyMatchesXMLConstraint) Verify(r *http.Request) []error {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return []error{err}
 	}
 	// write body for future reusing
-	r.Body = ioutil.NopCloser(bytes.NewReader(body))
+	r.Body = io.NopCloser(bytes.NewReader(body))
 	if len(body) == 0 {
 		return []error{errors.New("request is empty")}
 	}
@@ -84,12 +85,12 @@ func newBodyMatchesJSONConstraint(expected string, params compare.Params) (verif
 }
 
 func (c *bodyMatchesJSONConstraint) Verify(r *http.Request) []error {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return []error{err}
 	}
 	// write body for future reusing
-	r.Body = ioutil.NopCloser(bytes.NewReader(body))
+	r.Body = io.NopCloser(bytes.NewReader(body))
 	if len(body) == 0 {
 		return []error{errors.New("request is empty")}
 	}
@@ -122,13 +123,13 @@ func newBodyJSONFieldMatchesJSONConstraint(path, expected string, params compare
 }
 
 func (c *bodyJSONFieldMatchesJSONConstraint) Verify(r *http.Request) []error {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return []error{err}
 	}
 
 	// write body for future reusing
-	r.Body = ioutil.NopCloser(bytes.NewReader(body))
+	r.Body = io.NopCloser(bytes.NewReader(body))
 
 	value := gjson.Get(string(body), c.path)
 	if !value.Exists() {
@@ -338,13 +339,13 @@ func newBodyMatchesTextConstraint(body, re string) (verifier, error) {
 }
 
 func (c *bodyMatchesTextConstraint) Verify(r *http.Request) []error {
-	ioBody, err := ioutil.ReadAll(r.Body)
+	ioBody, err := io.ReadAll(r.Body)
 	if err != nil {
 		return []error{err}
 	}
 
 	// write body for future reusing
-	r.Body = ioutil.NopCloser(bytes.NewReader(ioBody))
+	r.Body = io.NopCloser(bytes.NewReader(ioBody))
 
 	body := string(ioBody)
 

output/allure_report/allure.go

@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"encoding/xml"
 	"errors"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"time"
 
 	"github.com/google/uuid"
+
 	"github.com/lamoda/gonkey/output/allure_report/beans"
 )
 
@@ -119,7 +120,7 @@ func getBufferInfo(buf bytes.Buffer, typ string) (string, string) {
 
 func writeBuffer(pathDir string, buf bytes.Buffer, ext string) (string, error) {
 	fileName := uuid.New().String() + `-attachment.` + ext
-	err := ioutil.WriteFile(filepath.Join(pathDir, fileName), buf.Bytes(), 0o644)
+	err := os.WriteFile(filepath.Join(pathDir, fileName), buf.Bytes(), 0o644)
 
 	return fileName, err
 }
@@ -129,7 +130,7 @@ func writeSuite(pathDir string, suite *beans.Suite) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(filepath.Join(pathDir, uuid.New().String()+`-testsuite.xml`), b, 0o644)
+	err = os.WriteFile(filepath.Join(pathDir, uuid.New().String()+`-testsuite.xml`), b, 0o644)
 	if err != nil {
 		return err
 	}

output/console_colored/console_colored.go

@@ -5,6 +5,7 @@ import (
 	"text/template"
 
 	"github.com/fatih/color"
+
 	"github.com/lamoda/gonkey/models"
 )
 

runner/request.go

@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"net/url"
@@ -181,7 +180,7 @@ func request(test models.TestInterface, b *bytes.Buffer, host string) (*http.Req
 func actualRequestBody(req *http.Request) string {
 	if req.Body != nil {
 		reqBodyStream, _ := req.GetBody()
-		reqBody, _ := ioutil.ReadAll(reqBodyStream)
+		reqBody, _ := io.ReadAll(reqBodyStream)
 
 		return string(reqBody)
 	}

runner/runner.go

@@ -3,7 +3,7 @@ package runner
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -170,7 +170,7 @@ func (r *Runner) executeTest(v models.TestInterface) (*models.Result, error) {
 		return nil, err
 	}
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 
 	_ = resp.Body.Close()
 

runner/runner_upload_file_test.go

@@ -2,7 +2,7 @@ package runner
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"path/filepath"
@@ -58,7 +58,7 @@ func formFile(t *testing.T, r *http.Request, field string) (string, string) {
 
 	defer func() { _ = file.Close() }()
 
-	contents, err := ioutil.ReadAll(file)
+	contents, err := io.ReadAll(file)
 	require.NoError(t, err)
 
 	return header.Filename, string(contents)

testloader/yaml_file/parser.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/lamoda/gonkey/models"
-
 	"gopkg.in/yaml.v2"
+
+	"github.com/lamoda/gonkey/models"
 )
 
 const (

testloader/yaml_file/parser_test.go

@@ -2,7 +2,6 @@ package yaml_file
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -55,7 +54,7 @@ var testsYAMLData = `
 `
 
 func TestParseTestsWithCases(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("../..", "tmpfile_")
+	tmpfile, err := os.CreateTemp("../..", "tmpfile_")
 	if err != nil {
 		t.Fatal(err)
 	}