Skip to content

Fix for issue 218: Bug when using capycli bom map -o outmap (v2.… #219

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.

Sign up for GitHub

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

Merged
tngraf merged 1 commit into from
May 24, 2026
+37 −6
Merged

Fix for issue 218: Bug when using capycli bom map -o outmap (v2.… #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 12 additions & 4 deletions capycli/bom/map_bom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------------------
# Copyright (c) 2019-24 Siemens
# Copyright (c) 2019-2026 Siemens
# All Rights Reserved.
# Author: thomas.graf@siemens.com
#
Expand Down Expand Up @@ -33,6 +33,7 @@
from capycli.common.map_result import MapResult
from capycli.common.print import print_green, print_red, print_text, print_yellow
from capycli.common.purl_service import PurlService
from capycli.common.purl_utils import PurlUtils
from capycli.main.result_codes import ResultCode

LOG = get_logger(__name__)
Expand Down Expand Up @@ -504,15 +505,22 @@ def get_purl_from_match(self, match: Dict[str, Any]) -> str:
"""
Return the package-url for the given SW360 entry.
"""
purl = ""
raw_purl = ""
if "RepositoryId" in match and match["RepositoryId"]:
return match["RepositoryId"]

if "ExternalIds" in match:
if "package-url" in match["ExternalIds"]:
purl = match["ExternalIds"]["package-url"]
raw_purl = match["ExternalIds"]["package-url"]
elif "purl" in match["ExternalIds"]:
purl = match["ExternalIds"]["purl"]
raw_purl = match["ExternalIds"]["purl"]

if not raw_purl:
return ""

purls = PurlUtils.parse_purls_from_external_id(raw_purl)
if purls:
purl = purls[0]

return purl

Expand Down
27 changes: 25 additions & 2 deletions tests/test_bom_map2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------------------
# Copyright (c) 2021-2023 Siemens
# Copyright (c) 2021-2026 Siemens
# All Rights Reserved.
# Author: gernot.hillier@siemens.com, thomas.graf@siemens.com
#
Expand Down Expand Up @@ -3514,8 +3514,31 @@ def test_is_good_match(self) -> None:
self.assertTrue(sut.is_good_match(MapResult.FULL_MATCH_BY_NAME_AND_VERSION))
self.assertTrue(sut.is_good_match(MapResult.MATCH_BY_FILENAME))

def test_update_bom_item_multi_purl(self) -> None:
"""
Special test for issue #218 "Bug when using capycli bom map -o outmap (v2.11.1)"
"""
sut = MapBom()

# have a match with multiple purls
match: Dict[str, Any] = {
"Name": "clap",
"Version": "4.5.60",
"ExternalIds": {
"package-url": "[\"pkg:cargo/clap_builder@4.5.60\",\"pkg:cargo/clap@4.5.60\"]"
},
}

comp = sut.update_bom_item(None, match)
self.assertIsNotNone(comp)
self.assertEqual("clap", comp.name)
self.assertEqual("4.5.60", comp.version)
self.assertIsNotNone(comp.purl)
if comp.purl:
self.assertEqual("pkg:cargo/clap_builder@4.5.60", comp.purl.to_string())


if __name__ == "__main__":
APP = CapycliTestBomMap()
APP.setUp()
APP.test_mapping_require_result_not_found()
APP.test_update_bom_item_multi_purl()
Loading