Merge pull request #112 from jacobbednarz/dependabot/github_actions/golangci/golangci-lint-action-7

Bump golangci/golangci-lint-action from 6 to 7

Author: jacobbednarz

.github/workflows/lint.yml

@@ -11,13 +11,10 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - name: setup go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.19
       - uses: actions/checkout@v4
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+      - uses: golangci/golangci-lint-action@v7
         with:
           version: latest
-          args: "--config .golintci.yaml"

.github/workflows/test.yml

@@ -3,17 +3,11 @@ name: Test
 
 jobs:
   test:
-    strategy:
-      matrix:
-        go-version: [1.18, 1.19]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
-      - name: setup go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go-version }}
-      - name: checkout code
-        uses: actions/checkout@v4
+          go-version-file: "go.mod"
       - name: test
         run: go test -v -race ./...

.golangci.yml

@@ -0,0 +1,38 @@
+# $schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json
+version: "2"
+run:
+  modules-download-mode: readonly
+  issues-exit-code: 1
+  tests: true
+linters:
+  enable:
+    - bodyclose
+    - contextcheck
+    - errname
+    - errorlint
+    - godot
+    - misspell
+    - nilerr
+    - tparallel
+    - unparam
+    - whitespace
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.golintci.yaml

@@ -1,14 +1,17 @@
 module github.com/jacobbednarz/go-csp-collector
 
-go 1.19
+go 1.23.0
+
+toolchain go1.23.4
 
 require (
+	github.com/davidmytton/url-verifier v1.0.1
 	github.com/gorilla/mux v1.8.1
 	github.com/sirupsen/logrus v1.9.3
 )
 
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/davidmytton/url-verifier v1.0.1 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 )

go.mod

@@ -12,11 +12,13 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.sum

@@ -42,7 +42,7 @@ var invalidBlockedURIs = []string{
 func TestValidateViolationWithInvalidBlockedURIs(t *testing.T) {
 	for _, blockedURI := range invalidBlockedURIs {
 		// Makes the test name more readable for the output.
-		testName := strings.Replace(blockedURI, "://", "", -1)
+		testName := strings.ReplaceAll(blockedURI, "://", "")
 
 		t.Run(testName, func(t *testing.T) {
 			rawReport := []byte(fmt.Sprintf(`{

internal/handler/csp_test.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
-	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -28,18 +27,18 @@ var (
 
 	// Shared defaults for the logger output. This ensures that we are
 	// using the same keys for the `FieldKey` values across both formatters.
-	logFieldMapDefaults = log.FieldMap{
-		log.FieldKeyTime:  "timestamp",
-		log.FieldKeyLevel: "level",
-		log.FieldKeyMsg:   "message",
+	logFieldMapDefaults = logrus.FieldMap{
+		logrus.FieldKeyTime:  "timestamp",
+		logrus.FieldKeyLevel: "level",
+		logrus.FieldKeyMsg:   "message",
 	}
 )
 
 var logger = logrus.New()
 
 func init() {
 	logger.SetOutput(os.Stdout)
-	logger.SetLevel(log.InfoLevel)
+	logger.SetLevel(logrus.InfoLevel)
 }
 
 func main() {
@@ -64,15 +63,15 @@ func main() {
 	}
 
 	if *debugFlag {
-		logger.SetLevel(log.DebugLevel)
+		logger.SetLevel(logrus.DebugLevel)
 	}
 
 	if *outputFormat == "json" {
-		logger.SetFormatter(&log.JSONFormatter{
+		logger.SetFormatter(&logrus.JSONFormatter{
 			FieldMap: logFieldMapDefaults,
 		})
 	} else {
-		logger.SetFormatter(&log.TextFormatter{
+		logger.SetFormatter(&logrus.TextFormatter{
 			FullTimestamp:          true,
 			DisableLevelTruncation: true,
 			QuoteEmptyFields:       true,
@@ -88,7 +87,7 @@ func main() {
 
 		content, err := os.ReadFile(*blockedURIFile)
 		if err != nil {
-			log.Fatalf("error reading Blocked File list: %s", *blockedURIFile)
+			logrus.Fatalf("error reading Blocked File list: %s", *blockedURIFile)
 		}
 		ignoredBlockedURIs = utils.TrimEmptyAndComments(strings.Split(string(content), "\n"))
 	} else {