golangci-lint version updated (#67)

Author: bakhterets

.github/workflows/ci.yaml

@@ -21,9 +21,9 @@ jobs:
         with:
           go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64.4
+          version: v2.1.5
 
   test:
     name: go-test

.golangci.bck.yaml

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # Create a stage for building the application.
-ARG GO_VERSION=1.23
+ARG GO_VERSION=1.24
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS build
 WORKDIR /usr/src/app
 

.golangci.yaml

@@ -1,13 +1,13 @@
 module github.com/stackmon/otc-status-dashboard
 
-go 1.23.0
-
-toolchain go1.23.5
+go 1.24.2
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2
 	github.com/coreos/go-oidc/v3 v3.12.0
 	github.com/gin-gonic/gin v1.10.0
+	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/gorilla/feeds v1.2.0
 	github.com/joho/godotenv v1.5.1
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/stretchr/testify v1.10.0
@@ -29,7 +29,6 @@ require (
 	github.com/bytedance/sonic/loader v0.2.3 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/cpuguy83/dockercfg v0.3.2 // indirect
@@ -50,9 +49,7 @@ require (
 	github.com/go-playground/validator/v10 v10.24.0 // indirect
 	github.com/goccy/go-json v0.10.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/feeds v1.2.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgx/v5 v5.7.2 // indirect
@@ -62,7 +59,6 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/magiconair/properties v1.8.9 // indirect
@@ -82,7 +78,6 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect

Dockerfile

@@ -17,7 +17,7 @@ import (
 const generalTitle = "Incidents | Status Dashboard"
 const maxIncidents = 10
 
-var errRSSWrongParams = fmt.Errorf( //nolint:stylecheck
+var errRSSWrongParams = fmt.Errorf( //nolint:staticcheck
 	"Status Dashboard RSS feed\nPlease read the documentation to\nmake the correct request",
 )
 

app

@@ -302,13 +302,14 @@ func checkIncidentsDataAfterMoveV1(t *testing.T, r *gin.Engine) {
 	incidents := getIncidentsAPIV1(t, r)
 
 	for _, inc := range incidents {
-		if inc.ID == 4 {
+		switch inc.ID {
+		case 4:
 			assert.Nil(t, inc.EndDate)
 			assert.Equal(t, 3, *inc.Impact)
 			assert.Len(t, inc.Updates, 1)
 			assert.Equal(t, "SYSTEM", inc.Updates[0].Status)
 			assert.Equal(t, "Distributed Cache Service (Database, EU-NL, dcs) moved from <a href='/incidents/2'>Test incident for dcs</a>", inc.Updates[0].Text)
-		} else if inc.ID == 2 {
+		case 2:
 			assert.Nil(t, inc.EndDate)
 			assert.Equal(t, 2, *inc.Impact)
 			assert.Len(t, inc.Updates, 3)
@@ -323,12 +324,13 @@ func checkIncidentsDataAfterMovingComponentBetweenIncidentsV1(t *testing.T, r *g
 	incidents := getIncidentsAPIV1(t, r)
 
 	for _, inc := range incidents {
-		if inc.ID == 4 {
+		switch inc.ID {
+		case 4:
 			assert.Nil(t, inc.EndDate)
 			assert.Equal(t, 2, *inc.Impact)
 			assert.Len(t, inc.Updates, 3)
 			assert.Equal(t, "Distributed Cache Service (Database, EU-NL, dcs) moved to <a href='/incidents/5'>Test incident for moving component between incidents</a>", inc.Updates[2].Text)
-		} else if inc.ID == 5 {
+		case 5:
 			assert.Nil(t, inc.EndDate)
 			assert.Equal(t, 3, *inc.Impact)
 			assert.Len(t, inc.Updates, 2)
@@ -351,15 +353,16 @@ func checkIncidentsDataAfterMoveAndClosedIncidentV1(t *testing.T, r *gin.Engine)
 	incidents := getIncidentsAPIV1(t, r)
 
 	for _, inc := range incidents {
-		if inc.ID == 4 {
+		switch inc.ID {
+		case 4:
 			assert.Nil(t, inc.EndDate)
 			assert.Equal(t, 3, *inc.Impact)
 			assert.Len(t, inc.Updates, 2)
 			assert.Equal(t, "SYSTEM", inc.Updates[0].Status)
 			assert.Equal(t, "SYSTEM", inc.Updates[1].Status)
 			assert.Equal(t, "Distributed Cache Service (Database, EU-NL, dcs) moved from <a href='/incidents/2'>Test incident for dcs</a>", inc.Updates[0].Text)
 			assert.Equal(t, "Cloud Container Engine (Container, EU-NL, cce) moved from <a href='/incidents/2'>Test incident for dcs</a>", inc.Updates[1].Text)
-		} else if inc.ID == 2 {
+		case 2:
 			assert.NotNil(t, inc.EndDate)
 			assert.Equal(t, 2, *inc.Impact)
 			assert.Len(t, inc.Updates, 4)

go.mod

@@ -187,8 +187,8 @@ func TestV2PostIncidentsHandler(t *testing.T) {
 	result := v2CreateIncident(t, r, &incidentCreateData)
 
 	assert.Len(t, result.Result, len(incidentCreateData.Components))
-	assert.Equal(t, "", result.Result[0].Error)
-	assert.Equal(t, "", result.Result[1].Error)
+	assert.Empty(t, result.Result[0].Error)
+	assert.Empty(t, result.Result[1].Error)
 	assert.Equal(t, len(incidents)+1, result.Result[0].IncidentID)
 	assert.Equal(t, len(incidents)+1, result.Result[1].IncidentID)
 
@@ -528,7 +528,7 @@ func v2PatchIncident(t *testing.T, r *gin.Engine, inc *v2.Incident) {
 	d, err := json.Marshal(patch)
 	require.NoError(t, err)
 
-	url := fmt.Sprintf("/v2/incidents/%d", inc.IncidentID.ID)
+	url := fmt.Sprintf("/v2/incidents/%d", inc.ID)
 	w := httptest.NewRecorder()
 	req, _ := http.NewRequest(http.MethodPatch, url, bytes.NewReader(d))
 
@@ -583,7 +583,7 @@ func TestV2CreateComponentAndList(t *testing.T) {
 	err := json.Unmarshal(w.Body.Bytes(), &createdComponent)
 	require.NoError(t, err)
 	assert.Equal(t, newComponent.Name, createdComponent.Name)
-	assert.Equal(t, len(newComponent.Attributes), len(createdComponent.Attributes))
+	assert.Len(t, newComponent.Attributes, len(createdComponent.Attributes))
 
 	// Test case 2: Try to create the same component again
 	t.Log("Test case 2: Try to create duplicate component")
@@ -706,7 +706,7 @@ func TestV2GetComponentsAvailability(t *testing.T) {
 	targetMonths := map[int]bool{10: true, 11: true, 12: true}
 
 	for _, compAvail := range availability.Data {
-		if compAvail.ComponentID.ID == 7 {
+		if compAvail.ID == 7 {
 			checkComponentAvailability(t, compAvail, targetMonths)
 		}
 	}