Skip to content

fix: remove fallback logic for Source Code Download URL #220

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

Open
meAndreea wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: remove fallback logic for Source Code Download URL #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3e045b
fix: remove fallback logic for Source Code Download URL
May 27, 2026
80f735f
fix: remove update with repo and website at component level and resto…
May 28, 2026
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
22 changes: 8 additions & 14 deletions capycli/bom/create_components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,13 @@ def add_licenses(self, cx_comp: Component, data: Dict[str, Any]) -> None:
data["mainLicenseIds"] = licenses

def prepare_release_data(self, cx_comp: Component) -> Dict[str, Any]:
"""Create release data structure as expected by SW360 REST API
"""Create the Release data structure as expected by SW360 REST API.

:param item: a single bill of materials item - a release
:type item: dictionary
If the Source Code Download URL is missing in the given Release, try to update the VCS/Repository URL
of the corresponding SW360 Component with the repository or website URL from the Release.

:param cx_comp: a single bill of materials item - a Release
:type cx_comp: Component
:return: the release
:rtype: release (dictionary)
"""
Expand All @@ -251,6 +254,8 @@ def prepare_release_data(self, cx_comp: Component) -> Dict[str, Any]:
src_url = str(CycloneDxSupport.get_ext_ref_source_url(cx_comp))
if src_url:
data["sourceCodeDownloadurl"] = src_url
else:
print_red(" No Source Code Download URL found.")

bin_url = str(CycloneDxSupport.get_ext_ref_binary_url(cx_comp))
if bin_url:
Expand All @@ -266,17 +271,6 @@ def prepare_release_data(self, cx_comp: Component) -> Dict[str, Any]:
data["additionalData"] = {}
data["additionalData"]["createdWith"] = capycli.get_app_signature()

# use project site as fallback for source code download url
website = CycloneDxSupport.get_ext_ref_website(cx_comp)
repo = CycloneDxSupport.get_ext_ref_repository(cx_comp)
if not src_url:
if repo:
print(" Using repository for source code download URL...")
data["sourceCodeDownloadurl"] = str(repo)
elif website:
print(" Using website for source code download URL...")
data["sourceCodeDownloadurl"] = str(website)

language = CycloneDxSupport.get_property_value(cx_comp, CycloneDxSupport.CDX_PROP_LANGUAGE)
if language:
data["languages"] = []
Expand Down
3 changes: 2 additions & 1 deletion tests/test_bom_create_components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def test_create_component(self) -> None:

release_data = {"name": "activemodel", "version": "5.2.4.3",
"mainlineState": "OPEN", "languages": ["Ruby"],
"sourceCodeDownloadurl": "http://test.org",
"sourceCodeDownloadurl": "http://test.org/activemodel@5.2.4.3.zip",
"externalIds": {"package-url": "pkg:gem/activemodel@5.2.4.3"},
"additionalData": {"createdWith": capycli.get_app_signature()}}
responses.add(
Expand All @@ -85,6 +85,7 @@ def test_create_component(self) -> None:
CycloneDxSupport.update_or_set_property(item, CycloneDxSupport.CDX_PROP_LANGUAGE, "Ruby")
CycloneDxSupport.update_or_set_property(item, CycloneDxSupport.CDX_PROP_CATEGORIES, "devel")
CycloneDxSupport.update_or_set_ext_ref(item, ExternalReferenceType.WEBSITE, "", "http://test.org")
CycloneDxSupport.update_or_set_ext_ref(item, ExternalReferenceType.SOURCE_DISTRIBUTION, "", "http://test.org/activemodel@5.2.4.3.zip")

self.app.create_component_and_release(item)
assert len(responses.calls) == 3
Expand Down
Loading