-
Notifications
You must be signed in to change notification settings - Fork 98
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
feat(importCDX): Add functionality to configure release creation when importing SBOM to an existing project #2458
base: main
Are you sure you want to change the base?
Conversation
72f9853
to
0c94fe8
Compare
Testing this PR. |
@sameed20 The REST API docs have not been updated. Pls update the docs for this endpoint as well |
0c94fe8
to
6d622d7
Compare
@sameed20 Feature is working as expected if the component has a VCS field in the SBOM for both orphan and non-orphan pkgs. But if an orphan pkg is present in the project and the SBOM also has different version of the orphan pkg then the it is simply adding the orphan pkgs and never replacing it. Same behaviour is seen when imported from UI or rest. |
6d622d7
to
2fa92ee
Compare
6b2e89f
to
c9aa23f
Compare
backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
Outdated
Show resolved
Hide resolved
backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
Outdated
Show resolved
Hide resolved
backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
Outdated
Show resolved
Hide resolved
backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
Outdated
Show resolved
Hide resolved
backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
Outdated
Show resolved
Hide resolved
backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandler.java
Outdated
Show resolved
Hide resolved
c9aa23f
to
c5311b1
Compare
backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
Outdated
Show resolved
Hide resolved
c5311b1
to
9f45c16
Compare
9f45c16
to
b2664f4
Compare
b2664f4
to
8014c8b
Compare
aae1f13
to
abc1735
Compare
@afsahsyeda I see most change requests have been closed. Can you please review it again? |
cf30a84
to
2fe51fc
Compare
2fe51fc
to
695ce84
Compare
backend/common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandler.java
Outdated
Show resolved
Hide resolved
Testing successful. |
aaf0ed3
to
f779674
Compare
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.
One doc update required.
@@ -2064,7 +2064,8 @@ public ResponseEntity<?> importSBOMonProject( | |||
@Parameter(description = "Project ID", example = "376576") | |||
@PathVariable(value = "id", required = true) String id, | |||
@Parameter(description = "SBOM file") | |||
@RequestBody MultipartFile file | |||
@RequestBody MultipartFile file, | |||
@RequestParam(value = "doNotReplacePackageAndRelease", required = false) boolean doNotReplacePackageAndRelease |
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.
Please add OpenAPI doc for the parameter with @Parameter
annotation.
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.
@GMishx I have made the asked change. Please review.
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.
Would recommend a simpler description like "Overwrite existing project releases and packages while importing new SBOM?"
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.
@GMishx Please review.
f779674
to
4c8b60f
Compare
… importing SBOM to an existing project Signed-off-by: sameed.ahmad <[email protected]>
4c8b60f
to
7900e92
Compare
This PR introduces the feature that allows users to configure release creation when importing CycloneDX SBOM to an existing project.
closes: #2435