fix(sbom): preserve OS packages from multiple SBOMs #8325
Merged
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.
Overview
This PR fixes a bug in the SBOM analyzer where OS packages from multiple SBOM files were being overwritten during the merge process.
Usage
No changes in usage. This is a bug fix in how Trivy handles OS packages from multiple SBOM files.
Description
When scanning container images with multiple SBOM files containing OS packages, only the packages from the last processed SBOM remained in the final result. This was because OS packages didn't have a file path set, causing them to be overwritten during the merge process.
This PR fixes the issue by:
For example, when scanning an image with these SBOM files:
/opt/bitnami/debian/.spdx-ca-certificates.spdx
/opt/bitnami/debian/.spdx-tzdata.spdx
/opt/bitnami/debian/.spdx-netbase.spdx
All OS packages will now be correctly preserved in the final result.
Related Issues
Checklist