From c5f23493abe7bef0f080323731e171df42f29f6c Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 5 Jun 2023 10:24:06 +0200 Subject: [PATCH] chore: update linter --- .github/workflows/validate.yaml | 2 +- .golangci.yml | 12 ++++++--- integration/healthcheck_test.go | 26 +++++++++---------- pkg/middlewares/auth/basic_auth_test.go | 2 +- pkg/middlewares/auth/digest_auth_test.go | 2 +- pkg/middlewares/capture/capture_test.go | 2 +- .../redirect/redirect_scheme_test.go | 2 +- pkg/provider/file/file_test.go | 2 +- pkg/server/router/tcp/router_test.go | 2 +- 9 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 483085825..e40e51dbb 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -7,7 +7,7 @@ on: env: GO_VERSION: '1.20' - GOLANGCI_LINT_VERSION: v1.52.2 + GOLANGCI_LINT_VERSION: v1.53.1 MISSSPELL_VERSION: v0.4.0 IN_DOCKER: "" diff --git a/.golangci.yml b/.golangci.yml index cd0093d85..ba3ce50a3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -26,10 +26,13 @@ linters-settings: - ^spew\.Print(f|ln)?$ - ^spew\.Dump$ depguard: - list-type: denylist - include-go-root: false - packages: - - github.com/pkg/errors + rules: + main: + deny: + - pkg: "github.com/instana/testify" + desc: not allowed + - pkg: "github.com/pkg/errors" + desc: Should be replaced by standard lib errors package godox: keywords: - FIXME @@ -199,6 +202,7 @@ linters: - containedctx # too many false-positive - maintidx # kind of duplicate of gocyclo - nonamedreturns # Too strict + - gosmopolitan # not relevant issues: exclude-use-default: false diff --git a/integration/healthcheck_test.go b/integration/healthcheck_test.go index 128a447e8..c6ab99809 100644 --- a/integration/healthcheck_test.go +++ b/integration/healthcheck_test.go @@ -61,7 +61,7 @@ func (s *HealthCheckSuite) TestSimpleConfiguration(c *check.C) { client := &http.Client{} whoamiHosts := []string{s.whoami1IP, s.whoami2IP} for _, whoami := range whoamiHosts { - statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBuffer([]byte("500"))) + statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBufferString("500")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerErrorReq) c.Assert(err, checker.IsNil) @@ -72,7 +72,7 @@ func (s *HealthCheckSuite) TestSimpleConfiguration(c *check.C) { c.Assert(err, checker.IsNil) // Change one whoami health to 200 - statusOKReq1, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBuffer([]byte("200"))) + statusOKReq1, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBufferString("200")) c.Assert(err, checker.IsNil) _, err = client.Do(statusOKReq1) c.Assert(err, checker.IsNil) @@ -138,7 +138,7 @@ func (s *HealthCheckSuite) TestMultipleEntrypoints(c *check.C) { client := &http.Client{} whoamiHosts := []string{s.whoami1IP, s.whoami2IP} for _, whoami := range whoamiHosts { - statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBuffer([]byte("500"))) + statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBufferString("500")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerErrorReq) c.Assert(err, checker.IsNil) @@ -149,7 +149,7 @@ func (s *HealthCheckSuite) TestMultipleEntrypoints(c *check.C) { c.Assert(err, checker.IsNil) // reactivate the whoami2 - statusInternalServerOkReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami2IP+"/health", bytes.NewBuffer([]byte("200"))) + statusInternalServerOkReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami2IP+"/health", bytes.NewBufferString("200")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerOkReq) c.Assert(err, checker.IsNil) @@ -174,7 +174,7 @@ func (s *HealthCheckSuite) TestMultipleEntrypoints(c *check.C) { func (s *HealthCheckSuite) TestPortOverload(c *check.C) { // Set one whoami health to 200 client := &http.Client{} - statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBuffer([]byte("200"))) + statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBufferString("200")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerErrorReq) c.Assert(err, checker.IsNil) @@ -203,7 +203,7 @@ func (s *HealthCheckSuite) TestPortOverload(c *check.C) { c.Assert(err, checker.IsNil) // Set one whoami health to 500 - statusInternalServerErrorReq, err = http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBuffer([]byte("500"))) + statusInternalServerErrorReq, err = http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBufferString("500")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerErrorReq) c.Assert(err, checker.IsNil) @@ -232,7 +232,7 @@ func (s *HealthCheckSuite) TestMultipleRoutersOnSameService(c *check.C) { // Set whoami health to 200 to be sure to start with the wanted status client := &http.Client{} - statusOkReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBuffer([]byte("200"))) + statusOkReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBufferString("200")) c.Assert(err, checker.IsNil) _, err = client.Do(statusOkReq) c.Assert(err, checker.IsNil) @@ -253,7 +253,7 @@ func (s *HealthCheckSuite) TestMultipleRoutersOnSameService(c *check.C) { c.Assert(err, checker.IsNil) // Set whoami health to 500 - statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBuffer([]byte("500"))) + statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBufferString("500")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerErrorReq) c.Assert(err, checker.IsNil) @@ -266,7 +266,7 @@ func (s *HealthCheckSuite) TestMultipleRoutersOnSameService(c *check.C) { c.Assert(err, checker.IsNil) // Change one whoami health to 200 - statusOKReq1, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBuffer([]byte("200"))) + statusOKReq1, err := http.NewRequest(http.MethodPost, "http://"+s.whoami1IP+"/health", bytes.NewBufferString("200")) c.Assert(err, checker.IsNil) _, err = client.Do(statusOKReq1) c.Assert(err, checker.IsNil) @@ -312,7 +312,7 @@ func (s *HealthCheckSuite) TestPropagate(c *check.C) { whoamiHosts := []string{s.whoami1IP, s.whoami3IP} for _, whoami := range whoamiHosts { - statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBuffer([]byte("500"))) + statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBufferString("500")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerErrorReq) c.Assert(err, checker.IsNil) @@ -394,7 +394,7 @@ func (s *HealthCheckSuite) TestPropagate(c *check.C) { // Bring whoami2 and whoami4 down whoamiHosts = []string{s.whoami2IP, s.whoami4IP} for _, whoami := range whoamiHosts { - statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBuffer([]byte("500"))) + statusInternalServerErrorReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBufferString("500")) c.Assert(err, checker.IsNil) _, err = client.Do(statusInternalServerErrorReq) c.Assert(err, checker.IsNil) @@ -420,7 +420,7 @@ func (s *HealthCheckSuite) TestPropagate(c *check.C) { // Bring everything back up. whoamiHosts = []string{s.whoami1IP, s.whoami2IP, s.whoami3IP, s.whoami4IP} for _, whoami := range whoamiHosts { - statusOKReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBuffer([]byte("200"))) + statusOKReq, err := http.NewRequest(http.MethodPost, "http://"+whoami+"/health", bytes.NewBufferString("200")) c.Assert(err, checker.IsNil) _, err = client.Do(statusOKReq) c.Assert(err, checker.IsNil) @@ -585,7 +585,7 @@ func (s *HealthCheckSuite) TestPropagateReload(c *check.C) { client := http.Client{ Timeout: 10 * time.Second, } - statusOKReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami2IP+"/health", bytes.NewBuffer([]byte("500"))) + statusOKReq, err := http.NewRequest(http.MethodPost, "http://"+s.whoami2IP+"/health", bytes.NewBufferString("500")) c.Assert(err, checker.IsNil) _, err = client.Do(statusOKReq) c.Assert(err, checker.IsNil) diff --git a/pkg/middlewares/auth/basic_auth_test.go b/pkg/middlewares/auth/basic_auth_test.go index 9e1b92ad1..893443b96 100644 --- a/pkg/middlewares/auth/basic_auth_test.go +++ b/pkg/middlewares/auth/basic_auth_test.go @@ -218,7 +218,7 @@ func TestBasicAuthUsersFromFile(t *testing.T) { usersFile, err := os.CreateTemp(t.TempDir(), "auth-users") require.NoError(t, err) - _, err = usersFile.Write([]byte(test.userFileContent)) + _, err = usersFile.WriteString(test.userFileContent) require.NoError(t, err) // Creates the configuration for our Authenticator diff --git a/pkg/middlewares/auth/digest_auth_test.go b/pkg/middlewares/auth/digest_auth_test.go index 066f80e0f..a972223b4 100644 --- a/pkg/middlewares/auth/digest_auth_test.go +++ b/pkg/middlewares/auth/digest_auth_test.go @@ -96,7 +96,7 @@ func TestDigestAuthUsersFromFile(t *testing.T) { usersFile, err := os.CreateTemp(t.TempDir(), "auth-users") require.NoError(t, err) - _, err = usersFile.Write([]byte(test.userFileContent)) + _, err = usersFile.WriteString(test.userFileContent) require.NoError(t, err) // Creates the configuration for our Authenticator diff --git a/pkg/middlewares/capture/capture_test.go b/pkg/middlewares/capture/capture_test.go index 9d8f91fcf..f8652e423 100644 --- a/pkg/middlewares/capture/capture_test.go +++ b/pkg/middlewares/capture/capture_test.go @@ -177,7 +177,7 @@ func generateBytes(length int) []byte { } func TestRequestReader(t *testing.T) { - buff := bytes.NewBuffer([]byte("foo")) + buff := bytes.NewBufferString("foo") rr := readCounter{source: io.NopCloser(buff)} assert.Equal(t, int64(0), rr.size) diff --git a/pkg/middlewares/redirect/redirect_scheme_test.go b/pkg/middlewares/redirect/redirect_scheme_test.go index 07ae54246..8de531a2c 100644 --- a/pkg/middlewares/redirect/redirect_scheme_test.go +++ b/pkg/middlewares/redirect/redirect_scheme_test.go @@ -333,7 +333,7 @@ func TestRedirectSchemeHandler(t *testing.T) { schemeRegex := `^(https?):\/\/(\[[\w:.]+\]|[\w\._-]+)?(:\d+)?(.*)$` re, _ := regexp.Compile(schemeRegex) - if re.Match([]byte(test.url)) { + if re.MatchString(test.url) { match := re.FindStringSubmatch(test.url) req.RequestURI = match[4] diff --git a/pkg/provider/file/file_test.go b/pkg/provider/file/file_test.go index 76fb49282..20d74d2d9 100644 --- a/pkg/provider/file/file_test.go +++ b/pkg/provider/file/file_test.go @@ -56,7 +56,7 @@ func TestTLSCertificateContent(t *testing.T) { keyFile = "` + fileTLSKey.Name() + `" ` - _, err = fileConfig.Write([]byte(content)) + _, err = fileConfig.WriteString(content) require.NoError(t, err) provider := &Provider{} diff --git a/pkg/server/router/tcp/router_test.go b/pkg/server/router/tcp/router_test.go index 26e799837..64753a0ea 100644 --- a/pkg/server/router/tcp/router_test.go +++ b/pkg/server/router/tcp/router_test.go @@ -840,7 +840,7 @@ func checkTCPTLS(addr string, timeout time.Duration, tlsVersion uint16) (err err err = conn.SetReadDeadline(time.Now().Add(timeout)) if err != nil { - return + return err } var buf bytes.Buffer