Skip to content

Commit b5a6fe8

Browse files
author
Saquib Saifee
committed
refactor: remove method based on feedback
Signed-off-by: Saquib Saifee <[email protected]>
1 parent b943bba commit b5a6fe8

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

cyclonedx/model/bom.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
SchemaVersion1Dot6,
3838
)
3939
from ..serialization import LicenseRepositoryHelper, UrnUuidHelper
40-
from . import ExternalReference, Property, XsUri
40+
from . import ExternalReference, Property
4141
from .bom_ref import BomRef
4242
from .component import Component
4343
from .contact import OrganizationalContact, OrganizationalEntity
@@ -665,21 +665,6 @@ def register_dependency(self, target: Dependable, depends_on: Optional[Iterable[
665665
def urn(self) -> str:
666666
return f'urn:cdx:{self.serial_number}/{self.version}'
667667

668-
def get_bom_link(self, bom_ref: Union[str, BomRef]) -> XsUri:
669-
"""
670-
Generate a BOM-Link URI.
671-
672-
Args:
673-
bom_ref: The unique identifier of the component, service, or vulnerability within the BOM.
674-
675-
Returns:
676-
XsUri: Instance of XsUri with the generated BOM-Link URI.
677-
678-
.. note:
679-
See the CycloneDX Schema for BOM-Link: https://cyclonedx.org/capabilities/bomlink
680-
"""
681-
return XsUri.make_bom_link(self.serial_number, self.version, bom_ref)
682-
683668
def validate(self) -> bool:
684669
"""
685670
Perform data-model level validations to make sure we have some known data integrity prior to attempting output

tests/test_model_bom.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from ddt import ddt, named_data
2424

2525
from cyclonedx.exception.model import LicenseExpressionAlongWithOthersException
26-
from cyclonedx.model import Property, XsUri
26+
from cyclonedx.model import Property
2727
from cyclonedx.model.bom import Bom, BomMetaData
2828
from cyclonedx.model.bom_ref import BomRef
2929
from cyclonedx.model.component import Component, ComponentType
@@ -292,11 +292,3 @@ def test_regression_issue_539(self) -> None:
292292
self.assertEqual(1, len(d.dependencies))
293293
self.assertIs(component2.bom_ref, d.dependencies[0].ref)
294294
# endregion assert component1
295-
296-
def test_get_bom_link(self) -> None:
297-
serial_number = uuid4()
298-
version = 1
299-
bom_ref = 'componentA'
300-
bom = Bom(serial_number=serial_number, version=1)
301-
bom_link = bom.get_bom_link(bom_ref=bom_ref)
302-
self.assertEqual(bom_link, XsUri(f'urn:cdx:{serial_number}/{version}#{bom_ref}'))

0 commit comments

Comments
 (0)