feat(ISV-5785): rewrite CycloneDX update logic#418
Merged
mmalina merged 7 commits intokonflux-ci:mainfrom Apr 30, 2025
Merged
Conversation
jedinym
force-pushed
the
ISV-5785
branch
3 times, most recently
from
078c54e to
286b269
Compare
Contributor
Author
|
@wcheang @BorekZnovustvoritel Could you please review? |
wcheang
approved these changes
Apr 25, 2025
BorekZnovustvoritel
approved these changes
Apr 28, 2025
BorekZnovustvoritel
left a comment
BorekZnovustvoritel
left a comment
There was a problem hiding this comment.
Nice addition, I have only 2 notes about some code comments, the functionality looks good to me 👍
jedinym
force-pushed
the
ISV-5785
branch
2 times, most recently
from
290b5bd to
9b47c6f
Compare
mmalina
approved these changes
Apr 28, 2025
Contributor
mmalina
left a comment
mmalina
left a comment
There was a problem hiding this comment.
Let's give @johnbieren a chance to review this if he wants to. Otherwise we can merge this later today.
Signed-off-by: Martin Jediny <jedinym@proton.me>
Signed-off-by: Martin Jediny <jedinym@proton.me>
CycloneDX is forward compatible, so we can bump the version to 1.6. This allows us to populate more fields. Signed-off-by: Martin Jediny <jedinym@proton.me>
Signed-off-by: Martin Jediny <jedinym@proton.me>
Signed-off-by: Martin Jediny <jedinym@proton.me>
The CycloneDX handler does not need to support index images, because Konflux generates index image build SBOMs only in the SPDX format. Signed-off-by: Martin Jediny <jedinym@proton.me>
Signed-off-by: Martin Jediny <jedinym@proton.me>
Collaborator
I think 3 approvals are plenty without also giving mine |
Contributor
Author
|
Could we merge this today? |
Contributor
Totally.
Done. Sorry for the delay. |
jedinym
added a commit
to jedinym/release-service-utils
that referenced
this pull request
May 12, 2025
* refactor(ISV-5785): simplify SPDX handler logic Signed-off-by: Martin Jediny <jedinym@proton.me> * feat(ISV-5785): implement CycloneDX handler Signed-off-by: Martin Jediny <jedinym@proton.me> * feat(ISV-5785): bump CycloneDX version CycloneDX is forward compatible, so we can bump the version to 1.6. This allows us to populate more fields. Signed-off-by: Martin Jediny <jedinym@proton.me> * fix(ISV-5785): adjust identity generation Signed-off-by: Martin Jediny <jedinym@proton.me> * feat(ISV-5785): add CDX property tests Signed-off-by: Martin Jediny <jedinym@proton.me> * feat(ISV-5785): remove CDX index image support The CycloneDX handler does not need to support index images, because Konflux generates index image build SBOMs only in the SPDX format. Signed-off-by: Martin Jediny <jedinym@proton.me> * fix(ISV-5785): remove leftover comments Signed-off-by: Martin Jediny <jedinym@proton.me> --------- Signed-off-by: Martin Jediny <jedinym@proton.me>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This PR rewrites the CycloneDX SBOM update logic using the new API from sbomlib. We bump the version of all SBOMs to 1.6, so the
evidence.identityfield supports our tag use case (CycloneDX 1.X is forward-compatible).CycloneDX index image SBOMs are not supported, because Konflux only generates index image SBOMs in the SPDX format.