Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(report): add Supported field for json and SBOM formats #7378

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

feat(report): add Supported field for json and SBOM formats #7378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a80ae16
feat: add `unsupported` field
DmitriyLewen Aug 23, 2024
51cbc11
test: update tests
DmitriyLewen Aug 23, 2024
aae3ea7
feat: add `unsupported` field in `rpc` package
DmitriyLewen Aug 23, 2024
cf5c950
feat(bom): add `unsupported` property
DmitriyLewen Aug 26, 2024
a3d1683
refactor: add `DriverFound` func
DmitriyLewen Aug 27, 2024
68df610
refactor: rename `Unsupported` to `Supported`
DmitriyLewen Aug 27, 2024
3b52d31
test: update golden files
DmitriyLewen Aug 27, 2024
c00f7b4
mage:fmt
DmitriyLewen Aug 27, 2024
e3a64cb
feat: add `supportedOS` prop for OS component
DmitriyLewen Aug 27, 2024
a50be8c
test: update golden files
DmitriyLewen Aug 27, 2024
70e5cc6
test: update VM golden files
DmitriyLewen Aug 27, 2024
3383f10
test(integration): update golden files
DmitriyLewen Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion integration/testdata/almalinux-8.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "alma",
"Name": "8.5"
"Name": "8.5",
"Supported": true
},
"ImageID": "sha256:4ca63ce1d8a90da2ed4f2d5e93e8e9db2f32d0fabf0718a2edebbe0e70826622",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/alpine-310-registry.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"OS": {
"Family": "alpine",
"Name": "3.10.2",
"EOSL": true
"EOSL": true,
"Supported": true
},
"ImageID": "sha256:961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/alpine-310.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"OS": {
"Family": "alpine",
"Name": "3.10.2",
"EOSL": true
"EOSL": true,
"Supported": true
},
"ImageID": "sha256:961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/alpine-39-high-critical.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"OS": {
"Family": "alpine",
"Name": "3.9.4",
"EOSL": true
"EOSL": true,
"Supported": true
},
"ImageID": "sha256:055936d3920576da37aa9bc460d70c5f212028bda1c08c0879aedf03d7a66ea1",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/alpine-39-ignore-cveids.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"OS": {
"Family": "alpine",
"Name": "3.9.4",
"EOSL": true
"EOSL": true,
"Supported": true
},
"ImageID": "sha256:055936d3920576da37aa9bc460d70c5f212028bda1c08c0879aedf03d7a66ea1",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/alpine-39.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"OS": {
"Family": "alpine",
"Name": "3.9.4",
"EOSL": true
"EOSL": true,
"Supported": true
},
"ImageID": "sha256:055936d3920576da37aa9bc460d70c5f212028bda1c08c0879aedf03d7a66ea1",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/alpine-distroless.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "alpine",
"Name": "3.16"
"Name": "3.16",
"Supported": true
},
"ImageID": "sha256:22848737c0d272ad5d7c7369d8ca830a62929e63e38edcb22085139a6ae0688d",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/amazon-1.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "amazon",
"Name": "AMI release 2018.03"
"Name": "AMI release 2018.03",
"Supported": true
},
"ImageID": "sha256:961c4ee06269351d858969ea0426878675ed708d3a140246eabbc0bfc352bffa",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/amazon-2.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "amazon",
"Name": "2 (Karoo)"
"Name": "2 (Karoo)",
"Supported": true
},
"ImageID": "sha256:b94321659aca6a89cb7650a5b864bc8ec4bf62c620b8f1a01530c2e90a88c391",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/amazonlinux2-gp2-x86-vm.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "amazon",
"Name": "2 (Karoo)"
"Name": "2 (Karoo)",
"Supported": true
},
"ImageConfig": {
"architecture": "",
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/centos-6.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"OS": {
"Family": "centos",
"Name": "6.10",
"EOSL": true
"EOSL": true,
"Supported": true
},
"ImageID": "sha256:5bf9684f472089d6d5cb636041d3d6dc748dbde39f1aefc374bbd367bd2aabbf",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/centos-7-ignore-unfixed.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "centos",
"Name": "7.6.1810"
"Name": "7.6.1810",
"Supported": true
},
"ImageID": "sha256:f1cb7c7d58b73eac859c395882eec49d50651244e342cd6c68a5c7809785f427",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/centos-7-medium.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "centos",
"Name": "7.6.1810"
"Name": "7.6.1810",
"Supported": true
},
"ImageID": "sha256:f1cb7c7d58b73eac859c395882eec49d50651244e342cd6c68a5c7809785f427",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/centos-7.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "centos",
"Name": "7.6.1810"
"Name": "7.6.1810",
"Supported": true
},
"ImageID": "sha256:f1cb7c7d58b73eac859c395882eec49d50651244e342cd6c68a5c7809785f427",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/debian-buster-ignore-unfixed.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "10.1"
"Name": "10.1",
"Supported": true
},
"ImageID": "sha256:c2c03a296d2329a4f3ab72a7bf38b78a8a80108204d326b0139d6af700e152d1",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/debian-buster.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "10.1"
"Name": "10.1",
"Supported": true
},
"ImageID": "sha256:c2c03a296d2329a4f3ab72a7bf38b78a8a80108204d326b0139d6af700e152d1",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/debian-stretch.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "9.9"
"Name": "9.9",
"Supported": true
},
"ImageID": "sha256:f26939cc87ef44a6fc554eedd0a976ab30b5bc2769d65d2e986b6c5f1fd4053d",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/distroless-base.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "9.9"
"Name": "9.9",
"Supported": true
},
"ImageID": "sha256:7f04a8d247173b1f2546d22913af637bbab4e7411e00ae6207da8d94c445750d",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/distroless-python27.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "9.9"
"Name": "9.9",
"Supported": true
},
"ImageID": "sha256:6fcac2cc8a710f21577b5bbd534e0bfc841c0cca569b57182ba19054696cddda",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/fluentd-gems.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "10.2"
"Name": "10.2",
"Supported": true
},
"ImageID": "sha256:5a992077baba51b97f27591a10d54d2f2723dc9c81a3fe419e261023f2554933",
"DiffIDs": [
Expand Down
4 changes: 4 additions & 0 deletions integration/testdata/fluentd-multiple-lockfiles.cdx.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
"name": "aquasecurity:trivy:Class",
"value": "os-pkgs"
},
{
"name": "aquasecurity:trivy:SupportedOS",
"value": "true"
},
{
"name": "aquasecurity:trivy:Type",
"value": "debian"
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/fluentd-multiple-lockfiles.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "10.2"
"Name": "10.2",
"Supported": true
},
"ImageConfig": {
"architecture": "",
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/mariner-1.0.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "cbl-mariner",
"Name": "1.0"
"Name": "1.0",
"Supported": true
},
"ImageID": "sha256:8cdcbf18341ed8afa5322e7b0077f8ef3f46896882c921df5f97c51b369f6767",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/minikube-kbom.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "ubuntu",
"Name": "22.04.2"
"Name": "22.04.2",
"Supported": true
},
"ImageConfig": {
"architecture": "",
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/opensuse-leap-151.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"OS": {
"Family": "opensuse.leap",
"Name": "15.1",
"EOSL": true
"EOSL": true,
"Supported": true
},
"ImageID": "sha256:fef5ad254f6378f08071cfa2daaf05a1ce9857141c944b67a40742e63e65cecc",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/opensuse-tumbleweed.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "opensuse.tumbleweed",
"Name": "20240607"
"Name": "20240607",
"Supported": true
},
"ImageID": "sha256:580e73f5c823232e6587136e9f5428a89afdf77a123bb8575d08208e0cc34b12",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/oraclelinux-8.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "oracle",
"Name": "8.0"
"Name": "8.0",
"Supported": true
},
"ImageID": "sha256:8988c7081e1f7b6c2928cbc4832b8a05968bb589d45d444ca1e3027c68f97f56",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/photon-30.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "photon",
"Name": "3.0"
"Name": "3.0",
"Supported": true
},
"ImageID": "sha256:5ccb5186b75cd13ff0d028f5b5b2bdf7ef7ca2b3d56eb2c6eb6c136077a6991a",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/rockylinux-8.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "rocky",
"Name": "8.5"
"Name": "8.5",
"Supported": true
},
"ImageID": "sha256:210996f98b856d7cd00496ddbe9412e73f1c714c95de09661e07b4e43648f9ab",
"DiffIDs": [
Expand Down
21 changes: 11 additions & 10 deletions integration/testdata/spring4shell-jre11.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "11.3"
"Name": "11.3",
"Supported": true
},
"ImageID": "sha256:ed8f0747d483b60657982f0ef1ba74482aed08795cf0eb774b00bc53022a8351",
"DiffIDs": [
Expand Down Expand Up @@ -255,15 +256,6 @@
"Target": "",
"Class": "custom",
"CustomResources": [
{
"Type": "spring4shell/java-major-version",
"FilePath": "/usr/local/openjdk-11/release",
"Layer": {
"Digest": "sha256:e94fd7d3bf7a9b78b61be8303cd35eb9da3f8d121cf572a3b8878cbf11e84818",
"DiffID": "sha256:64272e9218cd019d57b84ac283aa35036cbd8c1dcface8c69f756088a0a13c45"
},
"Data": "11.0.14.1"
},
{
"Type": "spring4shell/tomcat-version",
"FilePath": "/usr/local/tomcat/RELEASE-NOTES",
Expand All @@ -272,6 +264,15 @@
"DiffID": "sha256:0b201a611e5455d637c719d70eb5dd76fd4154bc4a5cf597d67ed2fb6647cc42"
},
"Data": "8.5.77"
},
{
"Type": "spring4shell/java-major-version",
"FilePath": "/usr/local/openjdk-11/release",
"Layer": {
"Digest": "sha256:e94fd7d3bf7a9b78b61be8303cd35eb9da3f8d121cf572a3b8878cbf11e84818",
"DiffID": "sha256:64272e9218cd019d57b84ac283aa35036cbd8c1dcface8c69f756088a0a13c45"
},
"Data": "11.0.14.1"
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/spring4shell-jre8.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "debian",
"Name": "11.3"
"Name": "11.3",
"Supported": true
},
"ImageID": "sha256:b88bc3d2f0b5aacf1d36efa498f427d923b01c854dac090acf5368c55ac04fda",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/ubi-7-comprehensive.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "redhat",
"Name": "7.7"
"Name": "7.7",
"Supported": true
},
"ImageID": "sha256:6fecccc91c83e11ae4fede6793e9410841221d4779520c2b9e9fb7f7b3830264",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/ubi-7.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "redhat",
"Name": "7.7"
"Name": "7.7",
"Supported": true
},
"ImageID": "sha256:6fecccc91c83e11ae4fede6793e9410841221d4779520c2b9e9fb7f7b3830264",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/ubuntu-1804-ignore-unfixed.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "ubuntu",
"Name": "18.04"
"Name": "18.04",
"Supported": true
},
"ImageID": "sha256:a2a15febcdf362f6115e801d37b5e60d6faaeedcb9896155e5fe9d754025be12",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/ubuntu-1804.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "ubuntu",
"Name": "18.04"
"Name": "18.04",
"Supported": true
},
"ImageID": "sha256:a2a15febcdf362f6115e801d37b5e60d6faaeedcb9896155e5fe9d754025be12",
"DiffIDs": [
Expand Down
3 changes: 2 additions & 1 deletion integration/testdata/ubuntu-gp2-x86-vm.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Metadata": {
"OS": {
"Family": "ubuntu",
"Name": "22.04"
"Name": "22.04",
"Supported": true
},
"ImageConfig": {
"architecture": "",
Expand Down
Loading