ci: lock golangci-lint to v1.59 (#172)

* ci: lock golangci-lint to v1.59

* ci: fix golangci-lint warnings

.github/workflows/test.yaml

@@ -16,6 +16,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
+          version: v1.59
           skip-go-installation: true
   test:
     strategy:

.golangci.yaml

@@ -1,14 +1,13 @@
 run:
   timeout: 5m
-  skip-dirs:
-    - api/proto
 output:
-  format: line-number
+  formats:
+    - format: line-number
 linters:
   enable-all: false
   disable-all: true
   enable:
-    - vet
+    - govet
     - goimports
     - thelper
     - tparallel
@@ -25,5 +24,7 @@ linters-settings:
     severity: warning
 issues:
   fix: true
+  exclude-dirs:
+    - api/proto
 severity:
   default-severity: error

Makefile

@@ -80,4 +80,5 @@ setup:
 	go get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.5.0
 	go get github.com/bufbuild/buf/cmd/buf@v1.15.1
 	go get github.com/vektra/mockery/v2@v2.33.0
+	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
 

core/appeal/service_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -25,7 +26,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"io"
 )
 
 var (
@@ -4411,7 +4411,6 @@ func (s *ServiceTestSuite) TestPatch() {
 			})
 		}
 	})
-
 }
 
 func (s *ServiceTestSuite) TestUpdateApproval() {

internal/store/postgres/model/grant.go

@@ -103,7 +103,6 @@ func (m *Grant) FromDomain(g domain.Grant) error {
 			Time:  *g.RestoredAt,
 			Valid: true,
 		}
-
 	}
 
 	m.Status = string(g.Status)

pkg/http/http.go

@@ -5,12 +5,13 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
+	"net/http"
+
 	validator "github.com/go-playground/validator/v10"
 	defaults "github.com/mcuadros/go-defaults"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/idtoken"
-	"net/http"
 )
 
 type HTTPAuthConfig struct {

pkg/http/http_test.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
 func TestMakeRequestForGet(t *testing.T) {