diff --git a/cyclonedx/model/component.py b/cyclonedx/model/component.py index 9f53d106..71dd0f23 100644 --- a/cyclonedx/model/component.py +++ b/cyclonedx/model/component.py @@ -873,7 +873,7 @@ def __repr__(self) -> str: @serializable.serializable_class -class OmniBorId(serializable.helpers.BaseHelper): +class OmniborId(serializable.helpers.BaseHelper): """ Helper class that allows us to perform validation on data strings that must conform to https://www.iana.org/assignments/uri-schemes/prov/gitoid. @@ -883,7 +883,7 @@ class OmniBorId(serializable.helpers.BaseHelper): _VALID_OMNIBOR_ID_REGEX = re.compile(r'^gitoid:(blob|tree|commit|tag):sha(1|256):([a-z0-9]+)$') def __init__(self, id: str) -> None: - if OmniBorId._VALID_OMNIBOR_ID_REGEX.match(id) is None: + if OmniborId._VALID_OMNIBOR_ID_REGEX.match(id) is None: raise InvalidOmniBorIdException( f'Supplied value "{id} does not meet format specification.' ) @@ -897,27 +897,27 @@ def id(self) -> str: @classmethod def serialize(cls, o: Any) -> str: - if isinstance(o, OmniBorId): + if isinstance(o, OmniborId): return str(o) raise SerializationOfUnexpectedValueException( f'Attempt to serialize a non-OmniBorId: {o!r}') @classmethod - def deserialize(cls, o: Any) -> 'OmniBorId': + def deserialize(cls, o: Any) -> 'OmniborId': try: - return OmniBorId(id=str(o)) + return OmniborId(id=str(o)) except ValueError as err: raise CycloneDxDeserializationException( f'OmniBorId string supplied does not parse: {o!r}' ) from err def __eq__(self, other: Any) -> bool: - if isinstance(other, OmniBorId): + if isinstance(other, OmniborId): return hash(other) == hash(self) return False def __lt__(self, other: Any) -> bool: - if isinstance(other, OmniBorId): + if isinstance(other, OmniborId): return self._id < other._id return NotImplemented @@ -984,7 +984,7 @@ def __init__(self, *, components: Optional[Iterable['Component']] = None, evidence: Optional[ComponentEvidence] = None, modified: bool = False, manufacturer: Optional[OrganizationalEntity] = None, authors: Optional[Iterable[OrganizationalContact]] = None, - omnibor_ids: Optional[Iterable[OmniBorId]] = None, + omnibor_ids: Optional[Iterable[OmniborId]] = None, # swhid: Optional[Iterable[str]] = None, # Deprecated in v1.6 author: Optional[str] = None, @@ -1362,9 +1362,9 @@ def purl(self, purl: Optional[PackageURL]) -> None: @property @serializable.json_name('omniborId') @serializable.view(SchemaVersion1Dot6) - @serializable.xml_array(serializable.XmlArraySerializationType.FLAT, 'omniborId') + @serializable.xml_array(serializable.XmlArraySerializationType.FLAT, child_name='omniborId') @serializable.xml_sequence(16) - def omnibor_ids(self) -> 'SortedSet[OmniBorId]': + def omnibor_ids(self) -> 'SortedSet[OmniborId]': """ Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid @@ -1376,7 +1376,7 @@ def omnibor_ids(self) -> 'SortedSet[OmniBorId]': return self._omnibor_ids @omnibor_ids.setter - def omnibor_ids(self, omnibor_ids: Iterable[OmniBorId]) -> None: + def omnibor_ids(self, omnibor_ids: Iterable[OmniborId]) -> None: self._omnibor_ids = SortedSet(omnibor_ids) # @property @@ -1606,7 +1606,8 @@ def __hash__(self) -> int: self.type, self.mime_type, self.supplier, self.author, self.publisher, self.group, self.name, self.version, self.description, self.scope, tuple(self.hashes), tuple(self.licenses), self.copyright, self.cpe, self.purl, self.swid, self.pedigree, tuple(self.external_references), tuple(self.properties), - tuple(self.components), self.evidence, self.release_notes, self.modified + tuple(self.components), self.evidence, self.release_notes, self.modified, tuple(self.authors), + tuple(self.omnibor_ids), )) def __repr__(self) -> str: diff --git a/pyproject.toml b/pyproject.toml index 85ed5cc6..e04223b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,7 +69,7 @@ keywords = [ [tool.poetry.dependencies] python = "^3.8" packageurl-python = ">=0.11, <2" -py-serializable = ">=0.16, <2" +py-serializable = ">=1.0.3, <2" sortedcontainers = "^2.4.0" license-expression = "^30" jsonschema = { version = "^4.18", extras=['format'], optional=true } diff --git a/tests/_data/models.py b/tests/_data/models.py index 0001aac9..5ccfd011 100644 --- a/tests/_data/models.py +++ b/tests/_data/models.py @@ -52,7 +52,7 @@ ComponentScope, ComponentType, Diff, - OmniBorId, + OmniborId, Patch, PatchClassification, Pedigree, @@ -130,7 +130,7 @@ def get_bom_with_component_setuptools_with_v16_fields() -> Bom: component = get_component_setuptools_simple() component.manufacturer = get_org_entity_1() component.authors = [get_org_contact_1(), get_org_contact_2()] - component.omnibor_ids = [OmniBorId('gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64')] + component.omnibor_ids = [OmniborId('gitoid:blob:sha1:261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64')] # component.swhid = 'swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2' return _make_bom(components=[component]) @@ -276,7 +276,8 @@ def get_bom_just_complete_metadata() -> Bom: bom = _make_bom() bom.metadata.authors = [get_org_contact_1(), get_org_contact_2()] bom.metadata.component = get_component_setuptools_complete() - bom.metadata.manufacture = get_org_entity_1() + bom.metadata.component.manufacturer = get_org_entity_1() + bom.metadata.manufacture = get_org_entity_1() # Deprecated from v1.6 onwards bom.metadata.supplier = get_org_entity_2() bom.metadata.licenses = [DisjunctiveLicense( id='Apache-2.0', @@ -572,7 +573,8 @@ def get_org_contact_2() -> OrganizationalContact: def get_org_entity_1() -> OrganizationalEntity: return OrganizationalEntity( - name='CycloneDX', urls=[XsUri('https://cyclonedx.org')], contacts=[get_org_contact_1(), get_org_contact_2()] + name='CycloneDX', urls=[XsUri('https://cyclonedx.org'), XsUri('https://cyclonedx.org/docs')], + contacts=[get_org_contact_1(), get_org_contact_2()] ) diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.json.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.json.bin index 10d11f7e..61fa9505 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.json.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.json.bin @@ -219,7 +219,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { @@ -249,7 +250,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "supplier": { diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.xml.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.xml.bin index b221c421..7ab99f68 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.xml.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.2.xml.bin @@ -24,6 +24,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -183,6 +184,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.json.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.json.bin index 5487748c..68592b69 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.json.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.json.bin @@ -263,7 +263,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { @@ -306,7 +307,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "properties": [ diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.xml.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.xml.bin index 3ee248de..67b09fc1 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.xml.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.3.xml.bin @@ -24,6 +24,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -205,6 +206,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.json.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.json.bin index b528a656..f57e79cf 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.json.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.json.bin @@ -320,7 +320,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { @@ -363,7 +364,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "properties": [ diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.xml.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.xml.bin index bfaf0c2a..402fe22b 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.xml.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.4.xml.bin @@ -50,6 +50,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -273,6 +274,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.json.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.json.bin index 1a4f253c..69efaef9 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.json.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.json.bin @@ -320,7 +320,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { @@ -363,7 +364,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "properties": [ diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.xml.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.xml.bin index 0e2c6dcb..cf5cc4e5 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.xml.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.5.xml.bin @@ -50,6 +50,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -273,6 +274,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.json.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.json.bin index d0b81651..98ef14d3 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.json.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.json.bin @@ -95,6 +95,24 @@ } } ], + "manufacturer": { + "contact": [ + { + "email": "someone@somewhere.tld", + "name": "A N Other", + "phone": "+44 (0)1234 567890" + }, + { + "email": "paul.horton@owasp.org", + "name": "Paul Horton" + } + ], + "name": "CycloneDX", + "url": [ + "https://cyclonedx.org", + "https://cyclonedx.org/docs" + ] + }, "name": "setuptools", "pedigree": { "ancestors": [ @@ -320,7 +338,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { @@ -363,7 +382,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "properties": [ diff --git a/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.xml.bin b/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.xml.bin index 87dfce7a..dae5ebeb 100644 --- a/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.xml.bin +++ b/tests/_data/snapshots/get_bom_just_complete_metadata-1.6.xml.bin @@ -50,6 +50,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -60,6 +61,20 @@ paul.horton@owasp.org + + CycloneDX + https://cyclonedx.org + https://cyclonedx.org/docs + + A N Other + someone@somewhere.tld + +44 (0)1234 567890 + + + Paul Horton + paul.horton@owasp.org + + Test Author CycloneDX setuptools @@ -273,6 +288,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.json.bin index 09c7319c..e1bef464 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.json.bin @@ -203,7 +203,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.xml.bin index ee8f666d..72167cd3 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.2.xml.bin @@ -15,6 +15,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.json.bin index af05fa91..24bd942b 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.json.bin @@ -247,7 +247,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.xml.bin index 72a48eb1..b7aaea4a 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.3.xml.bin @@ -15,6 +15,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.json.bin index b3752a32..8c30490f 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.json.bin @@ -304,7 +304,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.xml.bin index 05a230ee..0318ec2f 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.4.xml.bin @@ -41,6 +41,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.json.bin index c400a979..e20b947f 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.json.bin @@ -304,7 +304,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.xml.bin index 66b438da..1db3e774 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.5.xml.bin @@ -41,6 +41,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.json.bin index 54053e94..b088cc4a 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.json.bin @@ -304,7 +304,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "swid": { diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.xml.bin index ad5ac60e..bb315e66 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_complete-1.6.xml.bin @@ -41,6 +41,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.json.bin index aaaad675..b6129fe4 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.json.bin @@ -35,7 +35,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "name": "setuptools", diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.xml.bin index f42c44cf..4ed47141 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_v16_fields-1.6.xml.bin @@ -41,6 +41,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.json.bin index 275fe17e..1b70e6e3 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.json.bin @@ -121,7 +121,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] } ] diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.xml.bin index bff463b4..f7e73493 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.4.xml.bin @@ -115,6 +115,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.json.bin index 6eece2f8..960b631a 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.json.bin @@ -121,7 +121,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] } ] diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.xml.bin index 3b08de44..d5942b3f 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.5.xml.bin @@ -115,6 +115,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.json.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.json.bin index c8eef8ba..89921480 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.json.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.json.bin @@ -121,7 +121,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] } ] diff --git a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.xml.bin b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.xml.bin index befb040a..96b32b16 100644 --- a/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.xml.bin +++ b/tests/_data/snapshots/get_bom_with_component_setuptools_with_vulnerability-1.6.xml.bin @@ -115,6 +115,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.2.json.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.2.json.bin index a63b9db5..29fbb5fa 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.2.json.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.2.json.bin @@ -72,7 +72,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "services": [ @@ -95,7 +96,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "3.2.1", @@ -131,7 +133,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "6.5.4" diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.2.xml.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.2.xml.bin index 053443a6..68bed448 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.2.xml.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.2.xml.bin @@ -19,6 +19,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -58,6 +59,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -86,6 +88,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.3.json.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.3.json.bin index 788f853d..578ada50 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.3.json.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.3.json.bin @@ -88,7 +88,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "services": [ @@ -111,7 +112,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "3.2.1", @@ -147,7 +149,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "6.5.4" diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.3.xml.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.3.xml.bin index 74cd645e..a9536b6a 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.3.xml.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.3.xml.bin @@ -19,6 +19,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -65,6 +66,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -93,6 +95,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.4.json.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.4.json.bin index 36443b8c..f9ca9db0 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.4.json.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.4.json.bin @@ -122,7 +122,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "releaseNotes": { @@ -204,7 +205,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "3.2.1", @@ -240,7 +242,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "6.5.4" diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.4.xml.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.4.xml.bin index cb585422..94c873c9 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.4.xml.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.4.xml.bin @@ -45,6 +45,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -91,6 +92,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -163,6 +165,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.5.json.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.5.json.bin index d675e596..552c4227 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.5.json.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.5.json.bin @@ -122,7 +122,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "releaseNotes": { @@ -204,7 +205,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "3.2.1", @@ -240,7 +242,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "6.5.4" diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.5.xml.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.5.xml.bin index e2d41d33..a03c0dd8 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.5.xml.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.5.xml.bin @@ -45,6 +45,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -91,6 +92,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -163,6 +165,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.6.json.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.6.json.bin index 0ed90001..0e225390 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.6.json.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.6.json.bin @@ -122,7 +122,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "releaseNotes": { @@ -204,7 +205,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "3.2.1", @@ -240,7 +242,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "6.5.4" diff --git a/tests/_data/snapshots/get_bom_with_nested_services-1.6.xml.bin b/tests/_data/snapshots/get_bom_with_nested_services-1.6.xml.bin index ffced532..4c4c43e9 100644 --- a/tests/_data/snapshots/get_bom_with_nested_services-1.6.xml.bin +++ b/tests/_data/snapshots/get_bom_with_nested_services-1.6.xml.bin @@ -45,6 +45,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -91,6 +92,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld @@ -163,6 +165,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.2.json.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.2.json.bin index d66fe485..7f4621c8 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.2.json.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.2.json.bin @@ -72,7 +72,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "1.2.3", diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.2.xml.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.2.xml.bin index d03f661e..00d2a617 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.2.xml.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.2.xml.bin @@ -19,6 +19,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.3.json.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.3.json.bin index a4827614..01ab92d3 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.3.json.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.3.json.bin @@ -88,7 +88,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "version": "1.2.3", diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.3.xml.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.3.xml.bin index 136d59a1..d6df0b4b 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.3.xml.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.3.xml.bin @@ -19,6 +19,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.4.json.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.4.json.bin index a9296579..cc761a4c 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.4.json.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.4.json.bin @@ -122,7 +122,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "releaseNotes": { diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.4.xml.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.4.xml.bin index ea727f7e..31b95370 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.4.xml.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.4.xml.bin @@ -45,6 +45,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.5.json.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.5.json.bin index 01e7f716..d7366dc4 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.5.json.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.5.json.bin @@ -122,7 +122,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "releaseNotes": { diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.5.xml.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.5.xml.bin index f1b44b88..f12b33bf 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.5.xml.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.5.xml.bin @@ -45,6 +45,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.6.json.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.6.json.bin index 96e0b3ac..55dee933 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.6.json.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.6.json.bin @@ -122,7 +122,8 @@ ], "name": "CycloneDX", "url": [ - "https://cyclonedx.org" + "https://cyclonedx.org", + "https://cyclonedx.org/docs" ] }, "releaseNotes": { diff --git a/tests/_data/snapshots/get_bom_with_services_complex-1.6.xml.bin b/tests/_data/snapshots/get_bom_with_services_complex-1.6.xml.bin index be355ddc..37d3b397 100644 --- a/tests/_data/snapshots/get_bom_with_services_complex-1.6.xml.bin +++ b/tests/_data/snapshots/get_bom_with_services_complex-1.6.xml.bin @@ -45,6 +45,7 @@ CycloneDX https://cyclonedx.org + https://cyclonedx.org/docs A N Other someone@somewhere.tld