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

refactor(sbom): add intermediate representation for BOM #6240

Merged
merged 14 commits into from
Mar 12, 2024
Merged

refactor(sbom): add intermediate representation for BOM #6240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6efa3f7
refactor: add intermediate representation for BOM
knqyf263 Feb 23, 2024
194f07a
fix: lint issues
knqyf263 Mar 1, 2024
c46cd24
test(integration): fix
knqyf263 Mar 1, 2024
194d7f9
refactor: drop easyjson
knqyf263 Mar 1, 2024
b685508
fix: exclude uuid for TinyGo
knqyf263 Mar 1, 2024
64a9b14
fix(sbom): use original BOM-Refs
knqyf263 Mar 1, 2024
7da7911
refactor(sbom): replace hashes with files
knqyf263 Mar 2, 2024
fc60099
Update pkg/sbom/cyclonedx/unmarshal.go
knqyf263 Mar 8, 2024
0e025f9
refactor: make ID calling consistent
knqyf263 Mar 8, 2024
ffef67b
refactor: remove an unused struct
knqyf263 Mar 8, 2024
d3de909
refactor: reflect comments
knqyf263 Mar 8, 2024
dda7d7d
test(sbom): add tests
knqyf263 Mar 11, 2024
1057d92
refactor: call dependency.ID
knqyf263 Mar 12, 2024
5bfb04c
refactor: add packageID
knqyf263 Mar 12, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ require (
github.com/kylelemons/godebug v1.1.0
github.com/liamg/jfather v0.0.7
github.com/magefile/mage v1.15.0
github.com/mailru/easyjson v0.7.7
github.com/mailru/easyjson v0.7.7 // indirect
github.com/masahiro331/go-disk v0.0.0-20220919035250-c8da316f91ac
github.com/masahiro331/go-ebs-file v0.0.0-20240112135404-d5fbb1d46323
github.com/masahiro331/go-ext4-filesystem v0.0.0-20231208112839-4339555a0cd4
Expand Down
18 changes: 9 additions & 9 deletions integration/testdata/conda-cyclonedx.json.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.5",
"serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000001",
"serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000004",
"version": 1,
"metadata": {
"timestamp": "2021-08-25T12:20:30+00:00",
Expand All @@ -17,7 +17,7 @@
]
},
"component": {
"bom-ref": "3ff14136-e09f-4df9-80ea-000000000002",
"bom-ref": "3ff14136-e09f-4df9-80ea-000000000001",
"type": "application",
"name": "testdata/fixtures/repo/conda",
"properties": [
Expand All @@ -30,7 +30,7 @@
},
"components": [
{
"bom-ref": "pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fopenssl-1.1.1q-h7f8727e_0.json",
"bom-ref": "pkg:conda/[email protected]",
"type": "library",
"name": "openssl",
"version": "1.1.1q",
Expand All @@ -54,7 +54,7 @@
]
},
{
"bom-ref": "pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fpip-22.2.2-py38h06a4308_0.json",
"bom-ref": "pkg:conda/[email protected]",
"type": "library",
"name": "pip",
"version": "22.2.2",
Expand All @@ -80,18 +80,18 @@
],
"dependencies": [
{
"ref": "3ff14136-e09f-4df9-80ea-000000000002",
"ref": "3ff14136-e09f-4df9-80ea-000000000001",
"dependsOn": [
"pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fopenssl-1.1.1q-h7f8727e_0.json",
"pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fpip-22.2.2-py38h06a4308_0.json"
"pkg:conda/[email protected]",
"pkg:conda/[email protected]"
]
},
{
"ref": "pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fopenssl-1.1.1q-h7f8727e_0.json",
"ref": "pkg:conda/[email protected]",
"dependsOn": []
},
{
"ref": "pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fpip-22.2.2-py38h06a4308_0.json",
"ref": "pkg:conda/[email protected]",
"dependsOn": []
}
],
Expand Down
12 changes: 1 addition & 11 deletions integration/testdata/fixtures/sbom/minikube-kbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,7 @@
{
"bom-ref": "a62abb1f-cb38-4fde-90f3-2bda3b87ddb2",
"type": "application",
"name": "node-core-components",
"properties": [
{
"name": "aquasecurity:trivy:Class",
"value": "lang-pkgs"
},
{
"name": "aquasecurity:trivy:Type",
"value": "golang"
}
]
"name": "node-core-components"
},
{
"bom-ref": "a6350ac3-52f6-4c5f-a3e3-184b9a634bef",
Expand Down
Loading