Skip to content
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

fix(ISV-5128): also update sbom metadata component purl #315

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions sbom/test_update_component_sbom.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,33 @@ def test_get_component_to_purls_map(self) -> None:

def test_update_cyclonedx_sbom(self) -> None:
sbom = {
"metadata": {
"component": {
"name": "comp1",
"purl": "purl1",
}
},
"components": [
{"name": "comp1", "purl": "purl1"},
{"name": "comp2", "purl": "purl2"},
]
],
}
mapping = {
"comp1": ["updated_purl1"],
"comp2": ["updated_purl2"],
}
update_cyclonedx_sbom(sbom, mapping)
assert sbom == {
"metadata": {
"component": {
"name": "comp1",
"purl": "updated_purl1",
}
},
"components": [
{"name": "comp1", "purl": "updated_purl1"},
{"name": "comp2", "purl": "updated_purl2"},
]
],
}

def test_update_spdx_sbom(self) -> None:
Expand Down
6 changes: 6 additions & 0 deletions sbom/update_component_sbom.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ def update_cyclonedx_sbom(sbom: Dict, component_to_purls_map: Dict[str, List[str
component_to_purls_map: dictionary mapping of component names to list of purls.
"""
LOG.info("Updating CycloneDX sbom")

component_name = sbom["metadata"]["component"]["name"]
if component_name in component_to_purls_map:
# only one purl is supported for CycloneDX
sbom["metadata"]["component"]["purl"] = component_to_purls_map[component_name][0]

for component in sbom["components"]:
if component["name"] in component_to_purls_map:
# only one purl is supported for CycloneDX
Expand Down