diff --git a/conan/tools/sbom/cyclonedx.py b/conan/tools/sbom/cyclonedx.py index 8e2f4b17194..ee880fc2927 100644 --- a/conan/tools/sbom/cyclonedx.py +++ b/conan/tools/sbom/cyclonedx.py @@ -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 @@ -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 diff --git a/test/integration/sbom/test_cyclonedx.py b/test/integration/sbom/test_cyclonedx.py index 4964d57fe0b..218d2a256f9 100644 --- a/test/integration/sbom/test_cyclonedx.py +++ b/test/integration/sbom/test_cyclonedx.py @@ -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'