Skip to content

feat: allow empty OrganizationalContact object #772

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
merged 2 commits into from
Feb 6, 2025
Merged

feat: allow empty OrganizationalContact object #772

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
acbd3fc
feat: allow empty `OrganizationalContact` object
Churro Feb 5, 2025
aa1ddc4
remove superfluous import
Churro Feb 6, 2025
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
5 changes: 0 additions & 5 deletions cyclonedx/model/contact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

from .._internal.bom_ref import bom_ref_from_str as _bom_ref_from_str
from .._internal.compare import ComparableTuple as _ComparableTuple
from ..exception.model import NoPropertiesProvidedException
from ..schema.schema import SchemaVersion1Dot6
from . import XsUri
from .bom_ref import BomRef
Expand Down Expand Up @@ -202,10 +201,6 @@ def __init__(
phone: Optional[str] = None,
email: Optional[str] = None,
) -> None:
if not name and not phone and not email:
raise NoPropertiesProvidedException(
'One of name, email or phone must be supplied for an OrganizationalContact - none supplied.'
)
self.name = name
self.email = email
self.phone = phone
Expand Down
21 changes: 21 additions & 0 deletions tests/_data/own/json/1.6/issue771.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions tests/test_deserialize_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,19 @@ def test(ls: LicenseRepository) -> None:
test(list(bom.components)[0].licenses)
test(list(bom.services)[0].licenses)

def test_regression_issue771(self) -> None:
"""
regression test for issue#771.
see https://github.com/CycloneDX/cyclonedx-python-lib/issues/771
"""
json_file = join(OWN_DATA_DIRECTORY, 'json',
SchemaVersion.V1_6.to_version(),
'issue771.json')
with open(json_file) as f:
json = json_loads(f.read())
bom: Bom = Bom.from_json(json) # <<< is expected to not crash
self.assertIsNotNone(bom)

def test_regression_issue764(self) -> None:
"""
regression test for issue#764.
Expand Down