Support new tool metadata format in the merge syft sbom script#452
Support new tool metadata format in the merge syft sbom script#452brunoapimentel wants to merge 1 commit intohermetoproject:mainfrom
Conversation
2b75a28 to
9eb9167
Compare
CycloneDX 1.5 changes the way to define tools in the metadata section, and marks the 1.4 way as deprecated. Syft has adopted the newer format starting from version 0.99.0. This makes the 'merge_syft_sbom.py' script to fail in case a newer Syft SBOM is used. This patch updates the script so both formats can be handled. Signed-off-by: Bruno Pimentel <bpimente@redhat.com>
9eb9167 to
684515c
Compare
| was marked as deprecated. | ||
|
|
||
| This function aims to support both formats. Notice that, for simplicity reasons, we're ignoring | ||
| the actual 'tools' key present in the Cachi2 generated SBOM, and the data following the |
There was a problem hiding this comment.
Clever. Will this end up being tech debt?
There was a problem hiding this comment.
Yeah... the kind that might never be paid out. We won't likely change anything about the 'tools' content until (if) we get to the point we're actually adding Cachi2's version number to it. Then this needs to be changed.
On the other hand, the reason I took the simple approach was because I was hoping we could have this fixed ASAP to unblock users from using Yarn in Konflux, but we found a simpler way to fix it. So I can actually go back and implement this the right way.
|
I introduced a slightly improved version of this patch in #448. It does not hard-code the data the merge script inserts into I think we can close this PR and use only #448 instead. |
The Renovate PR pairs the cachi2 update with a syft update. The latter breaks the pipeline (changes needed in the SBOM merge script: hermetoproject/hermeto#452) Extract the cachi2 update into a separate PR to unblock it. Signed-off-by: Adam Cmiel <acmiel@redhat.com>
|
Closing this in favor of #448 |
The Renovate PR pairs the cachi2 update with a syft update. The latter breaks the pipeline (changes needed in the SBOM merge script: hermetoproject/hermeto#452) Extract the cachi2 update into a separate PR to unblock it. Signed-off-by: Adam Cmiel <acmiel@redhat.com>
The Renovate PR pairs the cachi2 update with a syft update. The latter breaks the pipeline (changes needed in the SBOM merge script: hermetoproject/hermeto#452) Extract the cachi2 update into a separate PR to unblock it. Signed-off-by: Adam Cmiel <acmiel@redhat.com>
CycloneDX 1.5 changes the way to define tools in the metadata section, and marks the 1.4 way as deprecated.
Syft has adopted the newer format starting from version 0.99.0. This makes the 'merge_syft_sbom.py' script to fail in case a newer Syft SBOM is used.
This patch updates the script so both formats can be handled.
CycloneDX 1.4:
CycloneDX 1.5:
Maintainers will complete the following section