feat: Update golanci-lint version and fix warnings (#990)

* feat: Update golanci-lint version and fix warnings

* feat: Add go version 1.23 to matrix in CI

* feat: Only lint for one of the go versions, test with all

Author: joaopalet

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        go-version: ["1.18", "1.19", "1.20", "1.21", "1.22"]
+        go-version: ["1.18", "1.19", "1.20", "1.21", "1.22", "1.23"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -18,20 +18,19 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
       - name: Install project tools and dependencies
-        if: ${{ matrix.go-version != '1.18' }}
+        if: ${{ matrix.go-version == '1.23' }}
         run: make project-tools
       - name: Lint
-        if: ${{ matrix.go-version != '1.18' }}
+        if: ${{ matrix.go-version == '1.23' }}
         run: |
           make lint
           scripts/check-sync-tidy.sh
       - name: Lint scripts
-        if: ${{ matrix.go-version == '1.22' }}
+        if: ${{ matrix.go-version == '1.23' }}
         run: |
           make lint-scripts
       - name: Test
         run: make test
       - name: Test scripts
-        if: ${{ matrix.go-version == '1.22' }}
-        run: |
-          make test-scripts
+        if: ${{ matrix.go-version >= '1.22' }}
+        run: make test-scripts

core/auth/auth.go

@@ -56,13 +56,12 @@ func SetupAuth(cfg *config.Configuration) (rt http.RoundTripper, err error) {
 			return nil, fmt.Errorf("configuring token authentication: %w", err)
 		}
 		return tokenRoundTripper, nil
-	} else {
-		authRoundTripper, err := DefaultAuth(cfg)
-		if err != nil {
-			return nil, fmt.Errorf("configuring default authentication: %w", err)
-		}
-		return authRoundTripper, nil
 	}
+	authRoundTripper, err := DefaultAuth(cfg)
+	if err != nil {
+		return nil, fmt.Errorf("configuring default authentication: %w", err)
+	}
+	return authRoundTripper, nil
 }
 
 // DefaultAuth will search for a valid service account key or token in several locations.

core/clients/key_flow_continuous_refresh_test.go

@@ -100,7 +100,7 @@ func TestContinuousRefreshToken(t *testing.T) {
 			}
 
 			numberDoCalls := 0
-			mockDo := func(req *http.Request) (resp *http.Response, err error) {
+			mockDo := func(_ *http.Request) (resp *http.Response, err error) {
 				numberDoCalls++
 
 				if tt.doError != nil {

core/clients/key_flow_test.go

@@ -268,7 +268,7 @@ func TestRequestToken(t *testing.T) {
 
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
-			mockDo := func(req *http.Request) (resp *http.Response, err error) {
+			mockDo := func(_ *http.Request) (resp *http.Response, err error) {
 				return tt.mockResponse, tt.mockError
 			}
 

core/clients/no_auth_flow_test.go

@@ -66,10 +66,10 @@ func TestNoAuthFlow_Do(t *testing.T) {
 			c := &NoAuthFlow{
 				client: tt.fields.client,
 			}
-			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 				w.Header().Set("Content-Type", "application/json")
 				w.WriteHeader(http.StatusOK)
-				fmt.Fprintln(w, `{"status":"ok"}`)
+				_, _ = fmt.Fprintln(w, `{"status":"ok"}`)
 			})
 			server := httptest.NewServer(handler)
 			defer server.Close()

core/clients/token_flow_test.go

@@ -71,10 +71,10 @@ func TestTokenFlow_Do(t *testing.T) {
 				client: tt.fields.client,
 				config: tt.fields.config,
 			}
-			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 				w.Header().Set("Content-Type", "application/json")
 				w.WriteHeader(http.StatusOK)
-				fmt.Fprintln(w, `{"status":"ok"}`)
+				_, _ = fmt.Fprintln(w, `{"status":"ok"}`)
 			})
 			server := httptest.NewServer(handler)
 			defer server.Close()

core/config/config.go

@@ -237,21 +237,21 @@ func WithToken(token string) ConfigurationOption {
 
 // Deprecated: retry options were removed to reduce complexity of the client. If this functionality is needed, you can provide your own custom HTTP client. This option has no effect, and will be removed in a later update
 func WithMaxRetries(_ int) ConfigurationOption {
-	return func(config *Configuration) error {
+	return func(_ *Configuration) error {
 		return nil
 	}
 }
 
 // Deprecated: retry options were removed to reduce complexity of the client. If this functionality is needed, you can provide your own custom HTTP client. This option has no effect, and will be removed in a later update
 func WithWaitBetweenCalls(_ time.Duration) ConfigurationOption {
-	return func(config *Configuration) error {
+	return func(_ *Configuration) error {
 		return nil
 	}
 }
 
 // Deprecated: retry options were removed to reduce complexity of the client. If this functionality is needed, you can provide your own custom HTTP client. This option has no effect, and will be removed in a later update
 func WithRetryTimeout(_ time.Duration) ConfigurationOption {
-	return func(config *Configuration) error {
+	return func(_ *Configuration) error {
 		return nil
 	}
 }

golang-ci.yaml

@@ -14,13 +14,12 @@ linters-settings:
     # it's a comma-separated list of prefixes
     local-prefixes: github.com/freiheit-com/nmww
   depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - github.com/stretchr/testify
-    packages-with-error-message:
-      # specify an error message to output when a blacklisted package is used
-      - github.com/stretchr/testify: "do not use a testing framework"
+    rules:
+        main:
+          list-mode: lax # Everything is allowed unless it is denied
+          deny:
+            - pkg: "github.com/stretchr/testify"
+              desc: Do not use a testing framework
   misspell:
     # Correct spellings using locale preferences for US or UK.
     # Default is to use a neutral variety of English.
@@ -75,7 +74,6 @@ linters:
     - unused
     # additional linters
     - errorlint
-    - exportloopref
     - gochecknoinits
     - gocritic
     - gofmt
@@ -91,9 +89,6 @@ linters:
     - forcetypeassert
     - errcheck
   disable:
-    - structcheck # deprecated
-    - deadcode # deprecated
-    - varcheck # deprecated
     - noctx # false positive: finds errors with http.NewRequest that dont make sense
     - unparam # false positives
 issues:

scripts/project.sh

@@ -16,7 +16,7 @@ elif [ "$action" = "tools" ]; then
 
     go mod download
 
-    go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2
+    go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.0
 else
     echo "Invalid action: '$action', please use $0 help for help"
 fi

services/dns/wait/wait_test.go

@@ -94,7 +94,7 @@ func TestCreateZoneWaitHandler(t *testing.T) {
 			if tt.wantResp {
 				wantRes = &dns.ZoneResponse{
 					Zone: &dns.Zone{
-						State: &tt.resourceState,
+						State: utils.Ptr(tt.resourceState),
 						Id:    utils.Ptr("zid"),
 					},
 				}
@@ -162,7 +162,7 @@ func TestUpdateZoneWaitHandler(t *testing.T) {
 			if tt.wantResp {
 				wantRes = &dns.ZoneResponse{
 					Zone: &dns.Zone{
-						State: &tt.resourceState,
+						State: utils.Ptr(tt.resourceState),
 						Id:    utils.Ptr("zid"),
 					},
 				}
@@ -230,7 +230,7 @@ func TestDeleteZoneWaitHandler(t *testing.T) {
 			if tt.wantResp {
 				wantRes = &dns.ZoneResponse{
 					Zone: &dns.Zone{
-						State: &tt.resourceState,
+						State: utils.Ptr(tt.resourceState),
 						Id:    utils.Ptr("zid"),
 					},
 				}
@@ -300,7 +300,7 @@ func TestCreateRecordSetWaitHandler(t *testing.T) {
 			if tt.wantResp {
 				wantRes = &dns.RecordSetResponse{
 					Rrset: &dns.RecordSet{
-						State: &tt.resourceState,
+						State: utils.Ptr(tt.resourceState),
 						Id:    utils.Ptr("rid"),
 					},
 				}
@@ -368,7 +368,7 @@ func TestUpdateRecordSetWaitHandler(t *testing.T) {
 			if tt.wantResp {
 				wantRes = &dns.RecordSetResponse{
 					Rrset: &dns.RecordSet{
-						State: &tt.resourceState,
+						State: utils.Ptr(tt.resourceState),
 						Id:    utils.Ptr("rid"),
 					},
 				}
@@ -436,7 +436,7 @@ func TestDeleteRecordSetWaitHandler(t *testing.T) {
 			if tt.wantResp {
 				wantRes = &dns.RecordSetResponse{
 					Rrset: &dns.RecordSet{
-						State: &tt.resourceState,
+						State: utils.Ptr(tt.resourceState),
 						Id:    utils.Ptr("rid"),
 					},
 				}