-
-
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
Supplier and manufacturer corrections #3179
Merged
nscuro
merged 16 commits into
DependencyTrack:master
from
nscuro:supplier-manufacturer-corrections
Nov 28, 2023
Merged
Supplier and manufacturer corrections #3179
nscuro
merged 16 commits into
DependencyTrack:master
from
nscuro:supplier-manufacturer-corrections
Nov 28, 2023
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
2 tasks
nscuro
force-pushed
the
supplier-manufacturer-corrections
branch
from
November 14, 2023 14:24
fa6f8a7
to
81eebdd
Compare
This maps to `metadata.manufacturer` and `metadata.supplier` in CycloneDX. Signed-off-by: nscuro <[email protected]>
Components do not have manufacturers in CycloneDX, but they do have suppliers: https://cyclonedx.org/docs/1.5/json/#components Additionally, add `supplier` to the default fetch group, as otherwise it would be lazy-loaded. Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
…supplier` Use JSON for serialization instead of DataNucleus' `@Serialized`, as this makes it possible for non-DataNucleus and non-Java applications to access and query the data. Most RDBMSes also support JSON queries, which can come in handy here for analytics queries. Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
…and projects Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
Signed-off-by: nscuro <[email protected]>
nscuro
force-pushed
the
supplier-manufacturer-corrections
branch
from
November 27, 2023 19:07
dddaa18
to
609c4f8
Compare
Signed-off-by: nscuro <[email protected]>
As per CycloneDX specification, `metadata.manufacturer` refers to `metadata.component`, whereas `metadata.supplier` and `metadata.authors` refer to the BOM itself. Keeping `manufacturer` in `ProjectMetadata` is awkward and confusing. Signed-off-by: nscuro <[email protected]>
2 tasks
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 introduces a new database table,
PROJECT_METADATA
.This table is used to store information that is located in the
metadata
node of CycloneDX documents, but not directly refers tometadata.component
(the project in DT's data model). This currently includes:metadata.authors
: (Human) authors of the BOMmetadata.supplier
: Supplier organization of the BOMauthors
andsupplier
are not stored in dedicated tables, but as serialized JSON in aTEXT
column instead. Opposed to the ORM's default@Serialized
, this makes it possible for RDBMSes with native JSON support to query contents of those fields.Addressed Issue
#2737 (comment)
Closes #2737
Additional Details
Frontend PR: DependencyTrack/frontend#646
Schema of the new table:
BIGINT
1
TEXT
{"name": "bar"}
TEXT
[{"name": "baz"}]
Checklist