Skip to content

fix sbom no description #20263

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
AbrilRBS merged 2 commits into from
Aug 15, 2026
+3 −2
Merged

fix sbom no description #20263

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
54c1cd8
fix sbom no description
ErniGH Aug 14, 2026
46b3db2
test
ErniGH Aug 14, 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
4 changes: 2 additions & 2 deletions conan/tools/sbom/cyclonedx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def cyclonedx_1_4(conanfile, name=None, add_build=False, add_tests=False, **kwar
**({"components": [{
"author": node.conanfile.author or "Unknown",
"bom-ref": _calculate_bomref(node),
"description": node.conanfile.description,
**({"description": node.conanfile.description} if node.conanfile.description else {}),
**({"externalReferences": [{
"type": "website",
"url": node.conanfile.homepage
Expand Down Expand Up @@ -158,7 +158,7 @@ def cyclonedx_1_6(conanfile, name=None, add_build=False, add_tests=False, **kwar
**({"components": [{
**({"authors": [{"name": node.conanfile.author}]} if node.conanfile.author else {}),
"bom-ref": _calculate_bomref(node),
"description": node.conanfile.description,
**({"description": node.conanfile.description} if node.conanfile.description else {}),
**({"externalReferences": [{
"type": "website",
"url": node.conanfile.homepage
Expand Down
1 change: 1 addition & 0 deletions test/integration/sbom/test_cyclonedx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ def requirements(self):
cyclone_path = os.path.join(create_layout.metadata(), "sbom.cdx.json")
content = tc.load(cyclone_path)
content_json = json.loads(content)
assert "description" not in content_json["components"][0]
if cyclone_version == 'cyclonedx_1_4':
assert content_json["metadata"]["component"]["author"] == 'conan-dev'
assert content_json["metadata"]["component"]["type"] == 'application'
Expand Down
Loading