Merge branch 'aquasecurity:main' into feat/add-altlinux-support

Author: Alex619829

.github/workflows/go.yml

@@ -15,9 +15,9 @@ jobs:
         go-version-file: go.mod
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v6.2.0
+      uses: golangci/golangci-lint-action@v7.0.0
       with:
-        version: v1.54
+        version: v2.0
         args : --verbose
 
     - name: Test

.golangci.yml

@@ -1,38 +1,52 @@
+version: "2"
 run:
-  go: 1.21
-  timeout: 5m
+  go: "1.21"
 linters:
   enable:
-    - gofmt
     - bodyclose
-    - staticcheck
-    - unused
-    - gci
     - gomodguard
-    - tenv
-    - gosimple
-    - govet
+    - staticcheck
   disable:
     - errcheck
     - ineffassign
-    - structcheck
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(github.com/aquasecurity/)
-      - blank
-      - dot
-  gomodguard:
-    blocked:
-      modules:
-        - github.com/hashicorp/go-version:
-            recommendations:
-              - github.com/aquasecurity/go-version
-            reason: "`aquasecurity/go-version` is degisned for our use-cases"
-        - github.com/Masterminds/semver:
-            recommendations:
-              - github.com/aquasecurity/go-version
-            reason: "`aquasecurity/go-version` is degisned for our use-cases"
-
+  settings:
+    gomodguard:
+      blocked:
+        modules:
+          - github.com/hashicorp/go-version:
+              recommendations:
+                - github.com/aquasecurity/go-version
+              reason: '`aquasecurity/go-version` is degisned for our use-cases'
+          - github.com/Masterminds/semver:
+              recommendations:
+                - github.com/aquasecurity/go-version
+              reason: '`aquasecurity/go-version` is degisned for our use-cases'
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/aquasecurity/)
+        - blank
+        - dot
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

arch/archlinux_test.go

@@ -1,7 +1,6 @@
 package arch_test
 
 import (
-	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -41,7 +40,7 @@ func TestUpdate(t *testing.T) {
 				b, err := os.ReadFile(tt.inputJSONFile)
 				require.NoError(t, err)
 
-				_, _ = io.WriteString(w, string(b))
+				_, _ = w.Write(b)
 			}))
 			defer ts.Close()
 

cwe/cwe_test.go

@@ -1,7 +1,6 @@
 package cwe
 
 import (
-	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -57,7 +56,7 @@ func TestUpdate(t *testing.T) {
 			} else {
 				ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 					b, _ := os.ReadFile(tc.inputZipFile)
-					_, _ = io.WriteString(w, string(b))
+					_, _ = w.Write(b)
 				}))
 				cweURL = ts.URL
 				defer func() {

ghsa/ghsa.go

@@ -131,7 +131,7 @@ func (c Config) update(ecosystem SecurityAdvisoryEcosystem) error {
 
 	bar := pb.StartNew(len(ghsaJsonMap))
 	for _, ghsaJson := range ghsaJsonMap {
-		pkgName := strings.Replace(ghsaJson.Package.Name, ":", "/", -1)
+		pkgName := strings.ReplaceAll(ghsaJson.Package.Name, ":", "/")
 		// Part Swift advisories have `https://` prefix or `.git` suffix
 		// e.g. https://github.com/github/advisory-database/blob/76f65b0d0fdac39c8b0e834ab03562b5f80d5b27/advisories/github-reviewed/2023/06/GHSA-r6ww-5963-7r95/GHSA-r6ww-5963-7r95.json#L21
 		// https://github.com/github/advisory-database/blob/76f65b0d0fdac39c8b0e834ab03562b5f80d5b27/advisories/github-reviewed/2023/07/GHSA-jq43-q8mx-r7mq/GHSA-jq43-q8mx-r7mq.json#L21

mariner/mariner.go

@@ -106,7 +106,7 @@ func (c Config) Update() error {
 			continue
 		}
 
-		if !(strings.HasPrefix(entry.Name(), marinerPrefix) || strings.HasPrefix(entry.Name(), azurePrefix)) {
+		if !strings.HasPrefix(entry.Name(), marinerPrefix) && !strings.HasPrefix(entry.Name(), azurePrefix) {
 			continue
 		}
 		if filepath.Ext(entry.Name()) != ".xml" {