CI improvements and fix deprecations (#235)

* update test matrix, drop 1.18 and 1.19, adds 1.23

Signed-off-by: Pedro Tanaka <[email protected]>

* Update golangci and fix deprecation problems

Signed-off-by: Pedro Tanaka <[email protected]>

* update golanglint-ci to latest

Signed-off-by: Pedro Tanaka <[email protected]>

* fixing test

Signed-off-by: Pedro Tanaka <[email protected]>

---------

Signed-off-by: Pedro Tanaka <[email protected]>

Author: pedro-stanaka

.github/workflows/go.yml

@@ -21,7 +21,7 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v5
       with:
-        version: v1.55.2
+        version: v1.61.0
 
   mod-tidy:
     name: Go Mod Tidy
@@ -57,10 +57,10 @@ jobs:
     strategy:
       matrix:
         go-version:
-        - 1.18.x # EOL: 01 Feb 2023
-        - 1.19.x # EOL: 08 Aug 2023
-        - 1.20.x
-        - 1.21.x
+        - 1.20.x # EOL: 06 Feb 2024
+        - 1.21.x # EOL: 13 Aug 2024
+        - 1.22.x
+        - 1.23.x
 
     steps:
     - name: Checkout

.golangci.yml

@@ -3,13 +3,10 @@
 run:
   timeout: 5m
 
-  skip-files:
-    - ".*_mock\\.go$"
-    - "\\.pb\\.go$"
-
 output:
-  # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
+      path: stdout
 
 linters:
   enable:
@@ -21,13 +18,15 @@ linters:
     - gosec
     - govet
     - lll
-    - megacheck
     - misspell
     - nakedret
     - prealloc
     - stylecheck
     - unconvert
     - unparam
+    - gosimple
+    - staticcheck
+    - unused
 
 linters-settings:
   dupl:
@@ -45,8 +44,14 @@ linters-settings:
     line-length: 140
   maligned:
     suggest-new: true
-
+  gosec:
+    excludes:
+      - G115
 issues:
+  exclude-files:
+    - ".*_mock\\.go$"
+    - "\\.pb\\.go$"
+
   exclude-rules:
     - path: _test\.go
       linters:
@@ -64,4 +69,4 @@ issues:
 
     - linters:
         - lll
-      source: "^//go:generate "
+      source: "^//go:generate "

logrusbugsnag/bugsnag_test.go

@@ -3,7 +3,7 @@ package logrusbugsnag
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"sync"
 	"testing"
@@ -25,15 +25,15 @@ type nilRoundTripper struct{}
 
 func (rt *nilRoundTripper) RoundTrip(_ *http.Request) (*http.Response, error) {
 	return &http.Response{
-		Body:       ioutil.NopCloser(bytes.NewReader(nil)),
+		Body:       io.NopCloser(bytes.NewReader(nil)),
 		StatusCode: http.StatusOK,
 	}, nil
 }
 
 func setup(record bool) {
 	testOnce.Do(func() {
 		l := logrus.New()
-		l.Out = ioutil.Discard
+		l.Out = io.Discard
 
 		bugsnag.Configure(bugsnag.Configuration{
 			APIKey: testAPIKey,
@@ -57,7 +57,7 @@ func BenchmarkHook_Fire(b *testing.B) {
 	setup(false)
 
 	l := logrus.New()
-	l.Out = ioutil.Discard
+	l.Out = io.Discard
 
 	hook, err := NewBugsnagHook(nil)
 	assert.NoError(b, err)
@@ -89,7 +89,7 @@ func TestNewBugsnagHook(t *testing.T) {
 	setup(true)
 
 	l := logrus.New()
-	l.Out = ioutil.Discard
+	l.Out = io.Discard
 
 	hook, err := NewBugsnagHook(nil)
 	assert.NoError(t, err)

profiler/ui.go

@@ -3,7 +3,6 @@ package profiler
 import (
 	"context"
 	"errors"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	httppprof "net/http/pprof"
@@ -19,7 +18,7 @@ func pprofUIHandler(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	vars := mux.Vars(r)
 
-	f, err := ioutil.TempFile("", "pprof.*.pb")
+	f, err := os.CreateTemp("", "pprof.*.pb")
 	if err != nil {
 		log(ctx, err).Error("error creating temporary file")
 		http.Error(w, err.Error(), http.StatusInternalServerError)

shell/shell_test.go

@@ -5,14 +5,13 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
-	"path/filepath"
 	"sync"
 	"syscall"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func ExampleSupervisor_Wait() {
@@ -25,7 +24,7 @@ func ExampleSupervisor_Wait() {
 	stdin.Write([]byte("foo"))
 	stdin.Close()
 
-	output, _ := ioutil.ReadAll(stdout)
+	output, _ := io.ReadAll(stdout)
 
 	// Must call Wait _after_ interacting with pipes
 	cmd.Wait()
@@ -142,7 +141,7 @@ func TestCommandRunPipe(t *testing.T) {
 	assert.NotEqual(t, 0, c.Process.Pid) // But the process exists
 
 	// Calling ReadAll will wait for the pipe to close, so all the output is there.
-	output, err := ioutil.ReadAll(pipe)
+	output, err := io.ReadAll(pipe)
 	assert.NoError(t, err)
 	assert.Equal(t, []byte("foo"), output)
 
@@ -172,21 +171,20 @@ func TestCommandRunWaitPipeFails(t *testing.T) {
 	assert.True(t, c.ProcessState.Exited())
 
 	// Calling ReadAll will wait for the pipe to close, so all the output is there.
-	_, err = ioutil.ReadAll(pipe)
+	_, err = io.ReadAll(pipe)
 	assert.Error(t, err, "read |0: file already closed")
 }
 
 func TestCommandWithWorkingDir(t *testing.T) {
+	tempDir := t.TempDir()
 	ctx := context.Background()
 	stdout, _, err := NewBuilder(ctx, "pwd").
-		WithWorkingDir("/tmp").
+		WithWorkingDir(tempDir).
 		Prepare().
 		RunAndGetOutput()
 
-	assert.NoError(t, err)
-	expected, err := filepath.EvalSymlinks("/tmp")
-	assert.NoError(t, err)
-	assert.Equal(t, []byte(expected+"\n"), stdout)
+	require.NoError(t, err)
+	assert.Equal(t, []byte(tempDir+"\n"), stdout)
 }
 
 func TestCommandEnvDoesNotEval(t *testing.T) {

srvutil/metrics_test.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -72,7 +72,7 @@ func TestRequestMetricsMiddleware(t *testing.T) {
 	res, err := http.DefaultClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, res.StatusCode)
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	assert.NoError(t, err)
 	assert.Equal(t, "hello world", string(body))
 

srvutil/server_test.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
@@ -73,7 +72,7 @@ func TestNewServer(t *testing.T) {
 	res, err := http.Get(u)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, res.StatusCode)
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	assert.NoError(t, err)
 	assert.Equal(t, "great success", string(body))
 
@@ -136,7 +135,7 @@ func TestNewServerFromFactory(t *testing.T) {
 	res, err := http.Get(u)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, res.StatusCode)
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	assert.NoError(t, err)
 	assert.Equal(t, "great success", string(body))
 
@@ -214,7 +213,7 @@ func TestStoppableKeepaliveListener_Accept(t *testing.T) {
 		res, err := http.Get(u) // This will block on tb.Dying()
 		assert.NoError(t, err)
 		assert.Equal(t, http.StatusOK, res.StatusCode)
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		assert.NoError(t, err)
 		assert.Equal(t, "great success", string(body))
 		close(done)