Update License Of Existing Components On BOM Upload #3556
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.
Description
When an SBOM is re-uploaded with different license information on an already imported component, the component should be updated with the new license.
Similarly, if license information previously existed on a component but not on a subsequent SBOM upload, the resolved license should be deleted from the component
Addressed Issue
Fixes #3498
Additional Details
In the V1 BomUploadProcessingTask, we were looking up licenses only if the component does not have a
resolvedLicense
already.In such a case, if a new SBOM with an updated license for the component was uploaded,
component.getResolvedLicense() == null
will be false, since the component already had a previously resolved license and we would ignore the new license. Hence, removed this null check forgetResolvedLicense()
.On a similar note, the logic to lookup license is dependent on whether
licenseChoice != null
, which is correct. However, iflicenseChoice == null
, then we should consider that the component does not have a license and hence nullify the previously resolved license (which came from an earlier BOM upload)The changes in
ModelConverter.java
are:if (component.getResolvedLicense() == null)
and fix indentationelse
block toif (licenseChoice != null)
, which sets license fields to nullChecklist