Merge branch 'main' of github.com:DmitriyLewen/trivy into deps/go-containerregistry

# Conflicts:
#	go.mod
#	go.sum

Author: DmitriyLewen

.github/workflows/backport.yaml

@@ -42,6 +42,8 @@ jobs:
         with:
           client-id: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_CLIENT_ID }}
           private-key: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_PRIVATE_KEY }}
+          permission-contents: write
+          permission-pull-requests: write
 
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/mkdocs-latest.yaml

@@ -55,6 +55,7 @@ jobs:
           private-key: ${{ secrets.TRIVY_WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
           repositories: trivy-www
+          permission-actions: write
       - name: Trigger build-docs workflow in trivy-www
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/publish-chart.yaml

@@ -71,6 +71,7 @@ jobs:
           private-key: ${{ secrets.TRIVY_WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
           repositories: helm-charts
+          permission-actions: write
       - name: Trigger publish-chart workflow in helm-charts
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/release-please.yaml

@@ -25,6 +25,8 @@ jobs:
         with:
           client-id: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_CLIENT_ID }}
           private-key: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_PRIVATE_KEY }}
+          permission-contents: write
+          permission-pull-requests: write
 
       - name: Release Please
         id: release
@@ -45,6 +47,8 @@ jobs:
         with:
           client-id: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_CLIENT_ID }}
           private-key: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_PRIVATE_KEY }}
+          permission-contents: write
+          permission-pull-requests: write
 
       - name: Install Release Please CLI
         run: npm install release-please -g
@@ -84,6 +88,7 @@ jobs:
         with:
           client-id: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_CLIENT_ID }}
           private-key: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_PRIVATE_KEY }}
+          permission-contents: write
 
       - name: Tag release
         if: ${{ steps.extract_info.outputs.version }}

.github/workflows/release.yaml

@@ -34,6 +34,7 @@ jobs:
           private-key: ${{ secrets.TRIVY_WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
           repositories: trivy-repo
+          permission-actions: write
       - name: Trigger deploy-packages workflow in trivy-repo
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
@@ -56,6 +57,8 @@ jobs:
         with:
           client-id: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_CLIENT_ID }}
           private-key: ${{ secrets.REPO_TRIVY_WRITE_GH_APP_PRIVATE_KEY }}
+          permission-contents: write
+          permission-pull-requests: write
 
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -99,6 +102,7 @@ jobs:
             trivy-downloads
             trivy-chocolatey
             trivy-action
+          permission-actions: write
       - name: Trigger update_version workflow in trivy-telemetry
         if: always()
         env:

.golangci.yaml

@@ -46,20 +46,19 @@ linters:
     gocyclo:
       # Next highest complexity candidate: ApplyLayers in pkg/fanal/applier/docker.go (score: 28)
       min-complexity: 20
-    gomodguard:
+    gomodguard_v2:
       blocked:
-        modules:
-          - github.com/hashicorp/go-version:
-              recommendations:
-                - github.com/aquasecurity/go-version
-              reason: "`aquasecurity/go-version` is designed for our use-cases"
-          - github.com/Masterminds/semver:
-              recommendations:
-                - github.com/aquasecurity/go-version
-              reason: "`aquasecurity/go-version` is designed for our use-cases"
-          - github.com/liamg/memoryfs:
-              recommendations:
-                - github.com/aquasecurity/trivy/pkg/mapfs
+        - module: github.com/hashicorp/go-version
+          recommendations:
+            - github.com/aquasecurity/go-version
+          reason: "`aquasecurity/go-version` is designed for our use-cases"
+        - module: github.com/Masterminds/semver
+          recommendations:
+            - github.com/aquasecurity/go-version
+          reason: "`aquasecurity/go-version` is designed for our use-cases"
+        - module: github.com/liamg/memoryfs
+          recommendations:
+            - github.com/aquasecurity/trivy/pkg/mapfs
     gosec:
       excludes:
         - G101
@@ -151,7 +150,7 @@ linters:
     - depguard
     - gocritic
     - gocyclo
-    - gomodguard
+    - gomodguard_v2
     - gosec
     - govet
     - ineffassign