Upgrade linter and fix linting problems

Signed-off-by: Pedro Tanaka <pedro.tanaka@shopify.com>
Shopify · Nov 17, 2023 · 9e2da93 · 9e2da93
1 parent 9921908
commit 9e2da93
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -64,10 +64,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@v3
 
     - name: Setup go
-      uses: actions/setup-go@v3.3.0
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -13,17 +13,14 @@ output:
 
 linters:
   enable:
-    - depguard
     - dupl
     - goconst
     - gocritic
     - gofmt
     - goimports
-    - golint
     - gosec
     - govet
     - lll
-    - maligned
     - megacheck
     - misspell
     - nakedret
@@ -37,7 +34,7 @@ linters-settings:
     threshold: 100
   goconst:
     min-len: 2
-    min-occurrences: 2
+    min-occurrences: 3 # now is inclusive
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes

diff --git a/bin/style b/bin/style
@@ -8,7 +8,7 @@ class Style
   class << self
     INSTALLER_URL = 'https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh'
     EXECUTABLE = 'golangci-lint'
-    VERSION = '1.49.0'
+    VERSION = '1.55.2'
     VERSION_TAG = "v#{VERSION}"
 
     def call

diff --git a/srvutil/metrics_test.go b/srvutil/metrics_test.go
@@ -22,6 +22,8 @@ import (
 	"github.com/Shopify/goose/statsd"
 )
 
+const httpScheme = "http://"
+
 func TestRequestMetricsMiddleware(t *testing.T) {
 	var recordedTags []string
 	statsd.SetBackend(statsd.NewForwardingBackend(func(_ context.Context, mType string, name string, value interface{}, tags []string, _ float64) error {
@@ -58,7 +60,7 @@ func TestRequestMetricsMiddleware(t *testing.T) {
 	defer s.Tomb().Kill(nil)
 	safely.Run(s)
 
-	u := "http://" + s.Addr().String() + "/hello/world"
+	u := httpScheme + s.Addr().String() + "/hello/world"
 
 	req, err := http.NewRequest("GET", u, nil)
 	req.Header.Set("Authorization", "secret")

diff --git a/srvutil/server_test.go b/srvutil/server_test.go
@@ -38,7 +38,7 @@ func ExampleNewServer() {
 	defer s.Tomb().Kill(nil)
 	safely.Run(s)
 
-	u := "http://" + s.Addr().String() + "/hello/world"
+	u := httpScheme + s.Addr().String() + "/hello/world"
 
 	res, _ := http.Get(u)
 	io.Copy(os.Stdout, res.Body)
@@ -64,7 +64,7 @@ func TestNewServer(t *testing.T) {
 	defer s.Tomb().Kill(nil)
 	safely.Run(s)
 
-	u := "http://" + s.Addr().String()
+	u := httpScheme + s.Addr().String()
 	t.Logf("test server running on %s", u)
 
 	assert.Contains(t, logOutput.String(), "level=info msg=\"starting server\" bind=\"127.0.0.1:0\"")
@@ -127,7 +127,7 @@ func TestNewServerFromFactory(t *testing.T) {
 	defer s.Tomb().Kill(nil)
 	safely.Run(s)
 
-	u := "http://" + s.Addr().String()
+	u := httpScheme + s.Addr().String()
 	t.Logf("test server running on %s", u)
 
 	assert.Contains(t, logOutput.String(), "level=info msg=\"starting server\" bind=\"127.0.0.1:0\"")
@@ -205,7 +205,7 @@ func TestStoppableKeepaliveListener_Accept(t *testing.T) {
 	s := NewServer(tb, "127.0.0.1:0", sl)
 	safely.Run(s)
 
-	u := "http://" + s.Addr().String()
+	u := httpScheme + s.Addr().String()
 	t.Logf("test server running on %s", u)
 
 	done := make(chan struct{})