Merge generated BOM with services BOM #2175
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This operation required the CycloneDX CLI to be installed and is thus disabled by default. The path to the CLI is customizable using the `cyclonedx-cli.path` property. Also discontinue distribution of BOM in XML format. Maintaining the BOM in multiple formats only adds overhead. Signed-off-by: nscuro <nscuro@protonmail.com>
Closes DependencyTrack#2125 Signed-off-by: nscuro <nscuro@protonmail.com>
|
@stevespringett Does this work for you? In particular us not publishing our BOM in XML format anymore. |
mulder999
pushed a commit
to mulder999/dependency-track
that referenced
this pull request
Dec 23, 2022
* Merge generated BOM with services BOM This operation required the CycloneDX CLI to be installed and is thus disabled by default. The path to the CLI is customizable using the `cyclonedx-cli.path` property. Also discontinue distribution of BOM in XML format. Maintaining the BOM in multiple formats only adds overhead. Signed-off-by: nscuro <nscuro@protonmail.com> * Add services BOM entries for OSV and Snyk Closes DependencyTrack#2125 Signed-off-by: nscuro <nscuro@protonmail.com> Signed-off-by: nscuro <nscuro@protonmail.com> Signed-off-by: mulder999 <nospam099-github@yahoo.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds an execution of the CycloneDX CLI to the build in order to merge the generated
bom.jsonwith the manually-maintainedservices.bom.json.The services OSV and Snyk have been added to
services.bom.jsonin order to reflect our new integrations.Addressed Issue
Relates to #1559
Closes #2125
Additional Details
As the merge step requires the CycloneDX CLI to be installed, it is disabled by default.
In order to keep things simple, generation and distribution of the BOM in XML format is disabled.
Focusing on just the JSON BOM should suffice. Users who need a different format can convert on their end.
Checklist
This PR fixes a defect, and I have provided tests to verify that the fix is effectiveThis PR implements an enhancement, and I have provided tests to verify that it works as intendedThis PR introduces changes to the database model, and I have added corresponding update logicThis PR introduces new or alters existing behavior, and I have updated the documentation accordingly