Skip to content

Commit 85b7614

Browse files
nikpivkinnikpivkin
committed
Merge remote-tracking branch 'origin' into feat/rego-scan-opt
2 parents 1da6411 + fe400ea commit 85b7614

File tree

377 files changed

+7356
-2669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+7356
-2669
lines changed

‎.github/workflows/auto-update-labels.yaml

+3-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
- 'misc/triage/labels.yaml'
66
branches:
77
- main
8-
env:
9-
GO_VERSION: '1.23'
108
jobs:
119
deploy:
1210
name: Auto-update labels
@@ -18,14 +16,11 @@ jobs:
1816
- name: Set up Go
1917
uses: actions/setup-go@v5
2018
with:
21-
# cf. https://github.com/aquasecurity/trivy/pull/6711
22-
go-version: ${{ env.GO_VERSION }}
19+
go-version-file: go.mod
2320
cache: false
2421

25-
- name: Install aqua tools
26-
uses: aquaproj/[email protected]
27-
with:
28-
aqua_version: v1.25.0
22+
- name: Install Go tools
23+
run: go install tool # GOBIN is added to the PATH by the setup-go action
2924

3025
- name: update labels
3126
env:

‎.github/workflows/cache-test-images.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ jobs:
1818
go-version-file: go.mod
1919
cache: false
2020

21-
- name: Install tools
22-
uses: aquaproj/[email protected]
23-
with:
24-
aqua_version: v1.25.0
21+
- name: Install Go tools
22+
run: go install tool # GOBIN is added to the PATH by the setup-go action
2523

2624
- name: Generate image list digest
2725
if: github.ref_name == 'main'
@@ -59,10 +57,8 @@ jobs:
5957
go-version-file: go.mod
6058
cache: false
6159

62-
- name: Install tools
63-
uses: aquaproj/[email protected]
64-
with:
65-
aqua_version: v1.25.0
60+
- name: Install Go tools
61+
run: go install tool # GOBIN is added to the PATH by the setup-go action
6662

6763
- name: Generate image list digest
6864
if: github.ref_name == 'main'

‎.github/workflows/canary.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Restore Trivy binaries from cache
28-
uses: actions/cache@v4.0.2
28+
uses: actions/cache@v4
2929
with:
3030
path: dist/
3131
key: ${{ runner.os }}-bins-${{github.workflow}}-${{github.sha}}

‎.github/workflows/publish-chart.yaml

+8-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
fetch-depth: 0
3535
- name: Install Helm
36-
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
36+
uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112
3737
with:
3838
version: v3.14.4
3939
- name: Set up python
@@ -65,16 +65,19 @@ jobs:
6565
uses: actions/[email protected]
6666
with:
6767
fetch-depth: 0
68+
6869
- name: Set up Git user
6970
run: |
7071
git config --global user.email "[email protected]"
7172
git config --global user.name "GitHub Actions"
7273
73-
- name: Install tools
74-
uses: aquaproj/[email protected]
74+
- name: Set up Go
75+
uses: actions/setup-go@v5
7576
with:
76-
aqua_version: v1.25.0
77-
aqua_opts: ""
77+
go-version-file: go.mod
78+
79+
- name: Install Go tools
80+
run: go install tool # GOBIN is added to the PATH by the setup-go action
7881

7982
- name: Create a PR with Trivy version
8083
run: mage helm:updateVersion

‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525

2626
- name: Restore Trivy binaries from cache
27-
uses: actions/cache@v4.0.2
27+
uses: actions/cache@v4
2828
with:
2929
path: dist/
3030
key: ${{ runner.os }}-bins-${{github.workflow}}-${{github.sha}}

‎.github/workflows/reusable-release.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414

1515
env:
1616
GH_USER: "aqua-bot"
17-
GO_VERSION: '1.23'
1817

1918
jobs:
2019
release:
@@ -28,7 +27,7 @@ jobs:
2827
contents: read # Not required for public repositories, but for clarity
2928
steps:
3029
- name: Cosign install
31-
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da
30+
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a
3231

3332
- name: Set up QEMU
3433
uses: docker/setup-qemu-action@v3
@@ -68,7 +67,7 @@ jobs:
6867
- name: Setup Go
6968
uses: actions/setup-go@v5
7069
with:
71-
go-version: ${{ env.GO_VERSION }}
70+
go-version-file: go.mod
7271
cache: false # Disable cache to avoid free space issues during `Post Setup Go` step.
7372

7473
- name: Generate SBOM
@@ -120,7 +119,7 @@ jobs:
120119
public.ecr.aws/aquasecurity/trivy:canary
121120
122121
- name: Cache Trivy binaries
123-
uses: actions/cache@v4.0.2
122+
uses: actions/cache@v4
124123
with:
125124
path: dist/
126125
# use 'github.sha' to create a unique cache folder for each run.

‎.github/workflows/spdx-cron.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ jobs:
1212
- name: Check out code
1313
uses: actions/[email protected]
1414

15-
- name: Install tools
16-
uses: aquaproj/[email protected]
15+
- name: Set up Go
16+
uses: actions/setup-go@v5
1717
with:
18-
aqua_version: v1.25.0
19-
aqua_opts: ""
18+
go-version-file: go.mod
19+
20+
- name: Install Go tools
21+
run: go install tool # GOBIN is added to the PATH by the setup-go action
2022

2123
- name: Check if SPDX exceptions are up-to-date
2224
run: |

‎.github/workflows/test.yaml

+16-29
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ on:
1111
merge_group:
1212
workflow_dispatch:
1313

14-
env:
15-
GO_VERSION: '1.23'
1614
jobs:
1715
test:
1816
name: Test
@@ -26,7 +24,7 @@ jobs:
2624
- name: Set up Go
2725
uses: actions/setup-go@v5
2826
with:
29-
go-version: ${{ env.GO_VERSION }}
27+
go-version-file: go.mod
3028
cache: false
3129

3230
- name: go mod tidy
@@ -40,9 +38,9 @@ jobs:
4038

4139
- name: Lint
4240
id: lint
43-
uses: golangci/golangci-lint-action@v6.2.0
41+
uses: golangci/golangci-lint-action@v6.5.0
4442
with:
45-
version: v1.61
43+
version: v1.64
4644
args: --verbose --out-format=line-number
4745
if: matrix.operating-system == 'ubuntu-latest'
4846

@@ -53,10 +51,7 @@ jobs:
5351
if: ${{ failure() && steps.lint.conclusion == 'failure' }}
5452

5553
- name: Install tools
56-
uses: aquaproj/[email protected]
57-
with:
58-
aqua_version: v1.25.0
59-
aqua_opts: ""
54+
run: go install tool # GOBIN is added to the PATH by the setup-go action
6055

6156
- name: Check if CLI references are up-to-date
6257
run: |
@@ -80,13 +75,11 @@ jobs:
8075
- name: Set up Go
8176
uses: actions/setup-go@v5
8277
with:
83-
go-version: ${{ env.GO_VERSION }}
78+
go-version-file: go.mod
8479
cache: false
8580

86-
- name: Install tools
87-
uses: aquaproj/[email protected]
88-
with:
89-
aqua_version: v1.25.0
81+
- name: Install Go tools
82+
run: go install tool # GOBIN is added to the PATH by the setup-go action
9083

9184
- name: Generate image list digest
9285
id: image-digest
@@ -117,13 +110,11 @@ jobs:
117110
- name: Set up Go
118111
uses: actions/setup-go@v5
119112
with:
120-
go-version: ${{ env.GO_VERSION }}
113+
go-version-file: go.mod
121114
cache: false
122115

123-
- name: Install tools
124-
uses: aquaproj/[email protected]
125-
with:
126-
aqua_version: v1.25.0
116+
- name: Install Go tools
117+
run: go install tool # GOBIN is added to the PATH by the setup-go action
127118

128119
- name: Run k8s integration tests
129120
run: mage test:k8s
@@ -138,13 +129,11 @@ jobs:
138129
- name: Set up Go
139130
uses: actions/setup-go@v5
140131
with:
141-
go-version: ${{ env.GO_VERSION }}
132+
go-version-file: go.mod
142133
cache: false
143134

144135
- name: Install tools
145-
uses: aquaproj/[email protected]
146-
with:
147-
aqua_version: v1.25.0
136+
run: go install tool # GOBIN is added to the PATH by the setup-go action
148137

149138
- name: Generate image list digest
150139
id: image-digest
@@ -177,13 +166,11 @@ jobs:
177166
- name: Set up Go
178167
uses: actions/setup-go@v5
179168
with:
180-
go-version: ${{ env.GO_VERSION }}
169+
go-version-file: go.mod
181170
cache: false
182171

183-
- name: Install tools
184-
uses: aquaproj/[email protected]
185-
with:
186-
aqua_version: v1.25.0
172+
- name: Install Go tools
173+
run: go install tool # GOBIN is added to the PATH by the setup-go action
187174

188175
- name: Generate image list digest
189176
id: image-digest
@@ -220,7 +207,7 @@ jobs:
220207
- name: Set up Go
221208
uses: actions/setup-go@v5
222209
with:
223-
go-version: ${{ env.GO_VERSION }}
210+
go-version-file: go.mod
224211
cache: false
225212

226213
- name: Determine GoReleaser ID

‎.golangci.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ linters-settings:
7373
- G304
7474
- G402
7575
govet:
76-
check-shadowing: false
76+
disable:
77+
- shadow
7778
misspell:
7879
locale: US
7980
ignore-words:
@@ -113,15 +114,15 @@ linters:
113114
- misspell
114115
- perfsprint
115116
- revive
116-
- tenv
117+
- usetesting
117118
- testifylint
118119
- typecheck
119120
- unconvert
120121
- unused
121122
- usestdlibvars
122123

123124
run:
124-
go: '1.23'
125+
go: '1.24'
125126
timeout: 30m
126127

127128
issues:

‎.release-please-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{".":"0.59.0"}
1+
{".":"0.60.0"}

‎CHANGELOG.md

+33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
11
# Changelog
22

3+
## [0.60.0](https://github.com/aquasecurity/trivy/compare/v0.59.0...v0.60.0) (2025-03-05)
4+
5+
6+
### Features
7+
8+
* add `--vuln-severity-source` flag ([#8269](https://github.com/aquasecurity/trivy/issues/8269)) ([d464807](https://github.com/aquasecurity/trivy/commit/d4648073211e8451d66e4c0399e9441250b60a76))
9+
* add report summary table ([#8177](https://github.com/aquasecurity/trivy/issues/8177)) ([dd54f80](https://github.com/aquasecurity/trivy/commit/dd54f80d3fda7821dba13553480e9893ba8b4cb3))
10+
* **cyclonedx:** Add initial support for loading external VEX files from SBOM references ([#8254](https://github.com/aquasecurity/trivy/issues/8254)) ([4820eb7](https://github.com/aquasecurity/trivy/commit/4820eb70fc926a35d759c373112dbbdca890fd46))
11+
* **go:** fix parsing main module version for go >= 1.24 ([#8433](https://github.com/aquasecurity/trivy/issues/8433)) ([e58dcfc](https://github.com/aquasecurity/trivy/commit/e58dcfcf9f102c12825d5343ebbcc12a2d6c05c5))
12+
* **misconf:** render causes for Terraform ([#8360](https://github.com/aquasecurity/trivy/issues/8360)) ([a99498c](https://github.com/aquasecurity/trivy/commit/a99498cdd9b7bdac000140af6654bfe30135242d))
13+
14+
15+
### Bug Fixes
16+
17+
* **db:** fix case when 2 trivy-db were copied at the same time ([#8452](https://github.com/aquasecurity/trivy/issues/8452)) ([bb3cca6](https://github.com/aquasecurity/trivy/commit/bb3cca6018551e96fdd357563dc177215ca29bd4))
18+
* don't use `scope` for `trivy registry login` command ([#8393](https://github.com/aquasecurity/trivy/issues/8393)) ([8715e5d](https://github.com/aquasecurity/trivy/commit/8715e5d14a727667c2e62d6f7a4b5308a0323386))
19+
* **go:** merge nested flags into string for ldflags for Go binaries ([#8368](https://github.com/aquasecurity/trivy/issues/8368)) ([b675b06](https://github.com/aquasecurity/trivy/commit/b675b06e897aaf374e7b1262d4323060a8a62edb))
20+
* **image:** disable AVD-DS-0007 for history scanning ([#8366](https://github.com/aquasecurity/trivy/issues/8366)) ([a3cd693](https://github.com/aquasecurity/trivy/commit/a3cd693a5ea88def2f9057df6178b0c0e7a6bdb0))
21+
* **k8s:** add missed option `PkgRelationships` ([#8442](https://github.com/aquasecurity/trivy/issues/8442)) ([f987e41](https://github.com/aquasecurity/trivy/commit/f987e4157494434f6e4e4566fedfedda92167565))
22+
* **misconf:** do not log scanners when misconfig scanning is disabled ([#8345](https://github.com/aquasecurity/trivy/issues/8345)) ([5695eb2](https://github.com/aquasecurity/trivy/commit/5695eb22dfed672eafacb64a71da8e9bdfbaab87))
23+
* **misconf:** ecs include enhanced for container insights ([#8326](https://github.com/aquasecurity/trivy/issues/8326)) ([39789ff](https://github.com/aquasecurity/trivy/commit/39789fff438d11bc6eccd254b3b890beb68c240b))
24+
* **misconf:** fix incorrect k8s locations due to JSON to YAML conversion ([#8073](https://github.com/aquasecurity/trivy/issues/8073)) ([a994453](https://github.com/aquasecurity/trivy/commit/a994453a7d0f543fe30c4dc8adbc92ad0c21bcbc))
25+
* **os:** add mapping OS aliases ([#8466](https://github.com/aquasecurity/trivy/issues/8466)) ([6b4cebe](https://github.com/aquasecurity/trivy/commit/6b4cebe9592f3a06bd91aa58ba6d65869afebbee))
26+
* **python:** add `poetry` v2 support ([#8323](https://github.com/aquasecurity/trivy/issues/8323)) ([10cd98c](https://github.com/aquasecurity/trivy/commit/10cd98cf55263749cb2583063a2e9e9953c7371a))
27+
* **report:** remove html escaping for `shortDescription` and `fullDescription` fields for sarif reports ([#8344](https://github.com/aquasecurity/trivy/issues/8344)) ([3eb0b03](https://github.com/aquasecurity/trivy/commit/3eb0b03f7c9ee462daccfacb291b2c463d848ff5))
28+
* **sbom:** add SBOM file's filePath as Application FilePath if we can't detect its path ([#8346](https://github.com/aquasecurity/trivy/issues/8346)) ([ecc01bb](https://github.com/aquasecurity/trivy/commit/ecc01bb3fb876fd0cc503cb38efa23e4fb9484b4))
29+
* **sbom:** improve logic for binding direct dependency to parent component ([#8489](https://github.com/aquasecurity/trivy/issues/8489)) ([85cca8c](https://github.com/aquasecurity/trivy/commit/85cca8c07affee4ded5c232efb45b05dacf22242))
30+
* **sbom:** preserve OS packages from multiple SBOMs ([#8325](https://github.com/aquasecurity/trivy/issues/8325)) ([bd5baaf](https://github.com/aquasecurity/trivy/commit/bd5baaf93054d71223e0721c7547a0567dea3b02))
31+
* **server:** secrets inspectation for the config analyzer in client server mode ([#8418](https://github.com/aquasecurity/trivy/issues/8418)) ([a1c4bd7](https://github.com/aquasecurity/trivy/commit/a1c4bd746f5f901e2a8f09f48f58b973b9103165))
32+
* **spdx:** init `pkgFilePaths` map for all formats ([#8380](https://github.com/aquasecurity/trivy/issues/8380)) ([72ea4b0](https://github.com/aquasecurity/trivy/commit/72ea4b0632308bd6150aaf2f1549a3f10b60dc23))
33+
* **terraform:** apply parser options to submodule parsing ([#8377](https://github.com/aquasecurity/trivy/issues/8377)) ([398620b](https://github.com/aquasecurity/trivy/commit/398620b471c25e467018bc23df53a3a1c2aa661c))
34+
* update all documentation links ([#8045](https://github.com/aquasecurity/trivy/issues/8045)) ([49456ba](https://github.com/aquasecurity/trivy/commit/49456ba8410e0e4cc1756906ccea1fdd60006d2d))
35+
336
## [0.59.0](https://github.com/aquasecurity/trivy/compare/v0.58.0...v0.59.0) (2025-01-30)
437

538

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21.0
1+
FROM alpine:3.21.3
22
RUN apk --no-cache add ca-certificates git
33
COPY trivy /usr/local/bin/trivy
44
COPY contrib/*.tpl contrib/

‎Dockerfile.canary

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21.0
1+
FROM alpine:3.21.3
22
RUN apk --no-cache add ca-certificates git
33

44
# binaries were created with GoReleaser

‎Dockerfile.protoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=linux/amd64 golang:1.23
1+
FROM --platform=linux/amd64 golang:1.24
22

33
# Set environment variable for protoc
44
ENV PROTOC_ZIP=protoc-3.19.4-linux-x86_64.zip

‎README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ If you'd like to contact Aqua or request a demo, please use this form: <https://
116116
Trivy is an [Aqua Security][aquasec] open source project.
117117
Learn about our open source work and portfolio [here][oss].
118118
Contact us about any matter by opening a GitHub Discussion [here][discussions]
119-
Join our [Slack community][slack] to stay up to date with community efforts.
120119

121120
Please ensure to abide by our [Code of Conduct][code-of-conduct] during all interactions.
122121

@@ -131,9 +130,8 @@ Please ensure to abide by our [Code of Conduct][code-of-conduct] during all inte
131130
[license]: https://github.com/aquasecurity/trivy/blob/main/LICENSE
132131
[license-img]: https://img.shields.io/badge/License-Apache%202.0-blue.svg
133132
[homepage]: https://trivy.dev
134-
[docs]: https://trivy.dev/trivy
133+
[docs]: https://trivy.dev/latest/docs/
135134
[pronunciation]: #how-to-pronounce-the-name-trivy
136-
[slack]: https://slack.aquasec.com
137135
[code-of-conduct]: https://github.com/aquasecurity/community/blob/main/CODE_OF_CONDUCT.md
138136

139137
[Installation]:https://trivy.dev/latest/getting-started/installation/

‎aqua.yaml

-10
This file was deleted.

0 commit comments

Comments
 (0)