-
-
Notifications
You must be signed in to change notification settings - Fork 583
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.
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
DRAFT: Issue #2737 - Fulfil NTIA minimum requirements #2867
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @melba-lopez, added some comments to the changes made so far.
So far you've covered supplier data in metadata.component
of the BOM, which corresponds to a project's supplier in DT.
For the component side of things in DT, you want to look at these methods:
- Convert from CycloneDX to DT:
dependency-track/src/main/java/org/dependencytrack/parser/cyclonedx/util/ModelConverter.java
Line 98 in 561ef18
public static Component convert(final QueryManager qm, final org.cyclonedx.model.Component cycloneDxComponent, final Project project) { - Convert from DT to CycloneDX again:
dependency-track/src/main/java/org/dependencytrack/parser/cyclonedx/util/ModelConverter.java
Line 209 in 561ef18
public static org.cyclonedx.model.Component convert(final QueryManager qm, final Component component) {
Happy to help if you need more clarification or get stuck!
src/main/java/org/dependencytrack/parser/cyclonedx/util/ModelConverter.java
Outdated
Show resolved
Hide resolved
src/main/java/org/dependencytrack/tasks/BomUploadProcessingTask.java
Outdated
Show resolved
Hide resolved
} | ||
supplier.setContacts(contacts); | ||
} | ||
project.setSupplier(supplier); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
createMetadata
is converting from DT's data model to CycloneDX, so it should not set anything on DT's project
:
project.setSupplier(supplier); | |
cycloneComponent.setSupplier(supplier); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
made the change. will commit shortly :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
when i make this change it is complaining for some reason 😭
src/test/java/org/dependencytrack/tasks/BomUploadProcessingTaskTest.java
Outdated
Show resolved
Hide resolved
Thanks for all the feedback @nscuro def will take all the help i can get :) hopefully i can finally start fixing this tomorrow evening. |
@nscuro i made all the changes and had to fix/undo some changes i made accidentally. not sure why it does not like your recommendation |
7985836
to
caacffa
Compare
Co-authored by: Melba Lopez <[email protected]> Co-authored by: nscuro <[email protected]> Signed-off-by: Melba Lopez <[email protected]> Signed-off-by: Melba Lopez <[email protected]>
7ddd3c8
to
f01000f
Compare
Signed-off-by: Melba Lopez <[email protected]>
ffe269c
to
b1d0686
Compare
Signed-off-by: Melba Lopez <[email protected]>
This was taken over by @leec94 in #3090. Thanks @melba-lopez for your work on this! :) |
Description
Addressed Issue
#2737
Additional Details
Checklist