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

feat(results): update cyclonedx reports to support v1.5 #6841

Merged
merged 8 commits into from
Jan 17, 2024
Merged

feat(results): update cyclonedx reports to support v1.5 #6841

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2a589ec
feat(results): update cyclonedx reports from v1.3 to v1.5
ArturRibeiro-CX Dec 29, 2023
e7501b8
feat(update): update cyclonedx reports to support v1.5
ArturRibeiro-CX Dec 29, 2023
79b1631
feat(update): update cyclonedx reports to support v1.5
ArturRibeiro-CX Dec 29, 2023
2f669b6
update documentation for the new version 1.5 of cyclonedx
ArturRibeiro-CX Jan 10, 2024
4975751
Merge branch 'master' into cyclonedx
ArturRibeiro-CX Jan 10, 2024
6318b5e
Adding a new line on the note in the CycloneDX documentation
ArturRibeiro-CX Jan 15, 2024
72c9a01
Fix adding new line on the note in the CycloneDX documentation
ArturRibeiro-CX Jan 16, 2024
c50bc91
Merge branch 'master' into cyclonedx
gabriel-cx Jan 16, 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
6 changes: 4 additions & 2 deletions pkg/report/model/cyclonedx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,10 @@ func InitCycloneDxReport() *CycloneDxReport {
},
},
}

// Update cycloneDX version to 1.5 (from 1.3 to 1.5 nothing needed to change since we only create 1 bom at a time,
// more changes to come)
return &CycloneDxReport{
XMLNS: "http://cyclonedx.org/schema/bom/1.3",
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
XMLNSV: "http://cyclonedx.org/schema/ext/vulnerability/1.0",
SerialNumber: "urn:uuid:" + uuid.New().String(),
Version: 1,
Expand Down Expand Up @@ -268,5 +269,6 @@ func BuildCycloneDxReport(summary *model.Summary, filePaths map[string]string) *

bom.Components.Components = append(bom.Components.Components, component)
}

return bom
}
3 changes: 2 additions & 1 deletion pkg/report/model/cyclonedx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ var metadata Metadata = Metadata{
},
}

// Update XMLNS version to 1.5 from 1.3
var initCycloneDxReport CycloneDxReport = CycloneDxReport{
XMLNS: "http://cyclonedx.org/schema/bom/1.3",
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
XMLNSV: "http://cyclonedx.org/schema/ext/vulnerability/1.0",
SerialNumber: "urn:uuid:", // set to "urn:uuid:" because it will be different for every report
Version: 1,
Expand Down
Loading