cartography 0.102.0rc1__py3-none-any.whl → 0.103.0rc1__py3-none-any.whl

cartography/models/core/relationships.py

@@ -19,18 +19,19 @@ class LinkDirection(Enum):
 
         class EMRCluster(CartographyNodeSchema):
             label: str = "EMRCluster"
-            sub_resource_relationship: CartographyRelSchema = EMRClusterToAWSAccount()
+            sub_resource_relationship: CartographyRelSchema = EMRClusterToAWSAccountRel()
             # ...
 
-        class EMRClusterToAWSAccount(CartographyRelSchema):
+        class EMRClusterToAWSAccountRel(CartographyRelSchema):
             target_node_label: str = "AWSAccount"
             rel_label: str = "RESOURCE"
             direction: LinkDirection = LinkDirection.INWARD
             # ...
 
-    If `EMRClusterToAWSAccount.direction` was LinkDirection.OUTWARD, then the directionality of the relationship would
+    If `EMRClusterToAWSAccountRel.direction` was LinkDirection.OUTWARD, then the directionality of the relationship would
     be `(:EMRCluster)-[:RESOURCE]->(:AWSAccount)` instead.
     """
+
     INWARD = auto()
     OUTWARD = auto()
 
@@ -42,6 +43,7 @@ class CartographyRelProperties(abc.ABC):
     subclasses will have a lastupdated field defined on their resulting relationships. These fields are assigned to the
     relationship in the `SET` clause.
     """
+
     lastupdated: PropertyRef = field(init=False)
 
     def __post_init__(self):
@@ -49,12 +51,12 @@ class CartographyRelProperties(abc.ABC):
         Data validation.
         1. Prevents direct instantiation. This workaround is needed since this is a dataclass and an abstract
         class without an abstract method defined. See https://stackoverflow.com/q/60590442.
-        2. Stops reserved words from being used as attribute names. See https://github.com/lyft/cartography/issues/1064.
+        2. Stops reserved words from being used as attribute names. See https://github.com/cartography-cncf/cartography/issues/1064.
         """
         if self.__class__ == CartographyRelProperties:
             raise TypeError("Cannot instantiate abstract class.")
 
-        if hasattr(self, 'firstseen'):
+        if hasattr(self, "firstseen"):
             raise TypeError(
                 "`firstseen` is a reserved word and is automatically set by the querybuilder on cartography rels, so "
                 f'it cannot be used on class "{type(self).__name__}(CartographyRelProperties)". Please either choose '
@@ -72,6 +74,7 @@ class TargetNodeMatcher:
     This is used to ensure dataclass immutability when composed as part of a CartographyNodeSchema object.
     See `make_target_node_matcher()`.
     """
+
     pass
 
 
@@ -80,7 +83,10 @@ def make_target_node_matcher(key_ref_dict: Dict[str, PropertyRef]) -> TargetNode
     :param key_ref_dict: A Dict mapping keys present on the node to PropertyRef objects.
     :return: A TargetNodeMatcher used for CartographyRelSchema to match with other nodes.
     """
-    fields = [(key, PropertyRef, field(default=prop_ref)) for key, prop_ref in key_ref_dict.items()]
+    fields = [
+        (key, PropertyRef, field(default=prop_ref))
+        for key, prop_ref in key_ref_dict.items()
+    ]
     return make_dataclass(TargetNodeMatcher.__name__, fields, frozen=True)()
 
 
@@ -92,6 +98,7 @@ class CartographyRelSchema(abc.ABC):
     The CartographyRelSchema contains properties that make it possible to connect the CartographyNodeSchema to other
     existing nodes in the graph.
     """
+
     @property
     @abc.abstractmethod
     def properties(self) -> CartographyRelProperties:
@@ -139,4 +146,5 @@ class OtherRelationships:
     Encapsulates a list of CartographyRelSchema. This is used to ensure dataclass immutability when composed as part of
     a CartographyNodeSchema object.
     """
+
     rels: List[CartographyRelSchema]

cartography/models/crowdstrike/hosts.py

@@ -7,43 +7,45 @@ from cartography.models.core.nodes import CartographyNodeSchema
 
 @dataclass(frozen=True)
 class CrowdstrikeHostNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('device_id')
-    cid: PropertyRef = PropertyRef('cid')
-    instance_id: PropertyRef = PropertyRef('instance_id', extra_index=True)
-    serial_number: PropertyRef = PropertyRef('serial_number', extra_index=True)
-    status: PropertyRef = PropertyRef('status')
-    hostname: PropertyRef = PropertyRef('hostname')
-    machine_domain: PropertyRef = PropertyRef('machine_domain')
-    crowdstrike_first_seen: PropertyRef = PropertyRef('first_seen')
-    crowdstrike_last_seen: PropertyRef = PropertyRef('last_seen')
-    local_ip: PropertyRef = PropertyRef('local_ip')
-    external_ip: PropertyRef = PropertyRef('external_ip')
-    cpu_signature: PropertyRef = PropertyRef('cpu_signature')
-    bios_manufacturer: PropertyRef = PropertyRef('bios_manufacturer')
-    bios_version: PropertyRef = PropertyRef('bios_version')
-    mac_address: PropertyRef = PropertyRef('mac_address')
-    os_version: PropertyRef = PropertyRef('os_version')
-    os_build: PropertyRef = PropertyRef('os_build')
-    platform_id: PropertyRef = PropertyRef('platform_id')
-    platform_name: PropertyRef = PropertyRef('platform_name')
-    service_provider: PropertyRef = PropertyRef('service_provider')
-    service_provider_account_id: PropertyRef = PropertyRef('service_provider_account_id')
-    agent_version: PropertyRef = PropertyRef('agent_version')
-    system_manufacturer: PropertyRef = PropertyRef('system_manufacturer')
-    system_product_name: PropertyRef = PropertyRef('system_product_name')
-    product_type: PropertyRef = PropertyRef('product_type')
-    product_type_desc: PropertyRef = PropertyRef('product_type_desc')
-    provision_status: PropertyRef = PropertyRef('provision_status')
-    reduced_functionality_mode: PropertyRef = PropertyRef('reduced_functionality_mode')
-    kernel_version: PropertyRef = PropertyRef('kernel_version')
-    major_version: PropertyRef = PropertyRef('major_version')
-    minor_version: PropertyRef = PropertyRef('minor_version')
-    tags: PropertyRef = PropertyRef('tags')
-    modified_timestamp: PropertyRef = PropertyRef('modified_timestamp')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("device_id")
+    cid: PropertyRef = PropertyRef("cid")
+    instance_id: PropertyRef = PropertyRef("instance_id", extra_index=True)
+    serial_number: PropertyRef = PropertyRef("serial_number", extra_index=True)
+    status: PropertyRef = PropertyRef("status")
+    hostname: PropertyRef = PropertyRef("hostname")
+    machine_domain: PropertyRef = PropertyRef("machine_domain")
+    crowdstrike_first_seen: PropertyRef = PropertyRef("first_seen")
+    crowdstrike_last_seen: PropertyRef = PropertyRef("last_seen")
+    local_ip: PropertyRef = PropertyRef("local_ip")
+    external_ip: PropertyRef = PropertyRef("external_ip")
+    cpu_signature: PropertyRef = PropertyRef("cpu_signature")
+    bios_manufacturer: PropertyRef = PropertyRef("bios_manufacturer")
+    bios_version: PropertyRef = PropertyRef("bios_version")
+    mac_address: PropertyRef = PropertyRef("mac_address")
+    os_version: PropertyRef = PropertyRef("os_version")
+    os_build: PropertyRef = PropertyRef("os_build")
+    platform_id: PropertyRef = PropertyRef("platform_id")
+    platform_name: PropertyRef = PropertyRef("platform_name")
+    service_provider: PropertyRef = PropertyRef("service_provider")
+    service_provider_account_id: PropertyRef = PropertyRef(
+        "service_provider_account_id"
+    )
+    agent_version: PropertyRef = PropertyRef("agent_version")
+    system_manufacturer: PropertyRef = PropertyRef("system_manufacturer")
+    system_product_name: PropertyRef = PropertyRef("system_product_name")
+    product_type: PropertyRef = PropertyRef("product_type")
+    product_type_desc: PropertyRef = PropertyRef("product_type_desc")
+    provision_status: PropertyRef = PropertyRef("provision_status")
+    reduced_functionality_mode: PropertyRef = PropertyRef("reduced_functionality_mode")
+    kernel_version: PropertyRef = PropertyRef("kernel_version")
+    major_version: PropertyRef = PropertyRef("major_version")
+    minor_version: PropertyRef = PropertyRef("minor_version")
+    tags: PropertyRef = PropertyRef("tags")
+    modified_timestamp: PropertyRef = PropertyRef("modified_timestamp")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class CrowdstrikeHostSchema(CartographyNodeSchema):
-    label: str = 'CrowdstrikeHost'
+    label: str = "CrowdstrikeHost"
     properties: CrowdstrikeHostNodeProperties = CrowdstrikeHostNodeProperties()

cartography/models/cve/cve.py

@@ -13,41 +13,41 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class CVENodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    assigner: PropertyRef = PropertyRef('sourceIdentifier')
-    description: PropertyRef = PropertyRef('descriptions_en')
-    references: PropertyRef = PropertyRef('references_urls')
-    problem_types: PropertyRef = PropertyRef('weaknesses')
-    vector_string: PropertyRef = PropertyRef('vectorString')
-    attack_vector: PropertyRef = PropertyRef('attackVector')
-    attack_complexity: PropertyRef = PropertyRef('attackComplexity')
-    privileges_required: PropertyRef = PropertyRef('privilegesRequired')
-    user_interaction: PropertyRef = PropertyRef('userInteraction')
-    scope: PropertyRef = PropertyRef('scope')
-    confidentiality_impact: PropertyRef = PropertyRef('confidentialityImpact')
-    integrity_impact: PropertyRef = PropertyRef('integrityImpact')
-    availability_impact: PropertyRef = PropertyRef('availabilityImpact')
-    base_score: PropertyRef = PropertyRef('baseScore')
-    base_severity: PropertyRef = PropertyRef('baseSeverity')
-    exploitability_score: PropertyRef = PropertyRef('exploitabilityScore')
-    impact_score: PropertyRef = PropertyRef('impactScore')
-    published_date: PropertyRef = PropertyRef('published')
-    last_modified_date: PropertyRef = PropertyRef('lastModified')
-    vuln_status: PropertyRef = PropertyRef('vulnStatus')
-    lastupdated: PropertyRef = PropertyRef('lastupdated')
+    id: PropertyRef = PropertyRef("id")
+    assigner: PropertyRef = PropertyRef("sourceIdentifier")
+    description: PropertyRef = PropertyRef("descriptions_en")
+    references: PropertyRef = PropertyRef("references_urls")
+    problem_types: PropertyRef = PropertyRef("weaknesses")
+    vector_string: PropertyRef = PropertyRef("vectorString")
+    attack_vector: PropertyRef = PropertyRef("attackVector")
+    attack_complexity: PropertyRef = PropertyRef("attackComplexity")
+    privileges_required: PropertyRef = PropertyRef("privilegesRequired")
+    user_interaction: PropertyRef = PropertyRef("userInteraction")
+    scope: PropertyRef = PropertyRef("scope")
+    confidentiality_impact: PropertyRef = PropertyRef("confidentialityImpact")
+    integrity_impact: PropertyRef = PropertyRef("integrityImpact")
+    availability_impact: PropertyRef = PropertyRef("availabilityImpact")
+    base_score: PropertyRef = PropertyRef("baseScore")
+    base_severity: PropertyRef = PropertyRef("baseSeverity")
+    exploitability_score: PropertyRef = PropertyRef("exploitabilityScore")
+    impact_score: PropertyRef = PropertyRef("impactScore")
+    published_date: PropertyRef = PropertyRef("published")
+    last_modified_date: PropertyRef = PropertyRef("lastModified")
+    vuln_status: PropertyRef = PropertyRef("vulnStatus")
+    lastupdated: PropertyRef = PropertyRef("lastupdated")
 
 
 @dataclass(frozen=True)
 class CVEtoCVEFeedRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:CVE)<-[:RESOURCE]-(:CVEFeed)
-class CVEtoCVEFeedRelSchema(CartographyRelSchema):
-    target_node_label: str = 'CVEFeed'
+class CVEtoCVEFeedRel(CartographyRelSchema):
+    target_node_label: str = "CVEFeed"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('FEED_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("FEED_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
@@ -56,26 +56,28 @@ class CVEtoCVEFeedRelSchema(CartographyRelSchema):
 
 @dataclass(frozen=True)
 class CVEToSpotlightVulnerabilityRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:CVE)<-[:HAS_CVE]-(:SpotlightVulnerability)
 class CVEToSpotlightVulnerabilityRel(CartographyRelSchema):
-    target_node_label: str = 'SpotlightVulnerability'
+    target_node_label: str = "SpotlightVulnerability"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('id')},
+        {"id": PropertyRef("id")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS_CVE"
-    properties: CVEToSpotlightVulnerabilityRelProperties = CVEToSpotlightVulnerabilityRelProperties()
+    properties: CVEToSpotlightVulnerabilityRelProperties = (
+        CVEToSpotlightVulnerabilityRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class CVESchema(CartographyNodeSchema):
-    label: str = 'CVE'
+    label: str = "CVE"
     properties: CVENodeProperties = CVENodeProperties()
-    sub_resource_relationship: CVEtoCVEFeedRelSchema = CVEtoCVEFeedRelSchema()
+    sub_resource_relationship: CVEtoCVEFeedRel = CVEtoCVEFeedRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
             CVEToSpotlightVulnerabilityRel(),

cartography/models/cve/cve_feed.py

@@ -7,14 +7,14 @@ from cartography.models.core.nodes import CartographyNodeSchema
 
 @dataclass(frozen=True)
 class CVEFeedNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('FEED_ID')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    format: PropertyRef = PropertyRef('format')
-    version: PropertyRef = PropertyRef('version')
-    timestamp: PropertyRef = PropertyRef('timestamp')
+    id: PropertyRef = PropertyRef("FEED_ID")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    format: PropertyRef = PropertyRef("format")
+    version: PropertyRef = PropertyRef("version")
+    timestamp: PropertyRef = PropertyRef("timestamp")
 
 
 @dataclass(frozen=True)
 class CVEFeedSchema(CartographyNodeSchema):
-    label: str = 'CVEFeed'
+    label: str = "CVEFeed"
     properties: CVEFeedNodeProperties = CVEFeedNodeProperties()

cartography/models/digitalocean/account.py

@@ -0,0 +1,21 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+
+
+@dataclass(frozen=True)
+class DOAccountNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    uuid: PropertyRef = PropertyRef("uuid")
+    droplet_limit: PropertyRef = PropertyRef("droplet_limit")
+    floating_ip_limit: PropertyRef = PropertyRef("floating_ip_limit")
+    status: PropertyRef = PropertyRef("status")
+
+
+@dataclass(frozen=True)
+class DOAccountSchema(CartographyNodeSchema):
+    label: str = "DOAccount"
+    properties: DOAccountNodeProperties = DOAccountNodeProperties()

cartography/models/digitalocean/droplet.py

@@ -0,0 +1,56 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class DODropletNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    name: PropertyRef = PropertyRef("name")
+    locked: PropertyRef = PropertyRef("locked")
+    status: PropertyRef = PropertyRef("status")
+    region: PropertyRef = PropertyRef("region")
+    created_at: PropertyRef = PropertyRef("created_at")
+    image: PropertyRef = PropertyRef("image")
+    size: PropertyRef = PropertyRef("size")
+    kernel: PropertyRef = PropertyRef("kernel")
+    tags: PropertyRef = PropertyRef("tags")
+    volumes: PropertyRef = PropertyRef("volumes")
+    vpc_uuid: PropertyRef = PropertyRef("vpc_uuid")
+    ip_address: PropertyRef = PropertyRef("ip_address")
+    private_ip_address: PropertyRef = PropertyRef("private_ip_address")
+    ip_v6_address: PropertyRef = PropertyRef("ip_v6_address")
+    account_id: PropertyRef = PropertyRef("ACCOUNT_ID", set_in_kwargs=True)
+    project_id: PropertyRef = PropertyRef("PROJECT_ID", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class DODropletToAccountRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:DOProject)<-[:RESOURCE]-(:DODroplet)
+class DODropletToAccountRel(CartographyRelSchema):
+    target_node_label: str = "DOProject"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("PROJECT_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.OUTWARD
+    rel_label: str = "RESOURCE"
+    properties: DODropletToAccountRelProperties = DODropletToAccountRelProperties()
+
+
+@dataclass(frozen=True)
+class DODropletSchema(CartographyNodeSchema):
+    label: str = "DODroplet"
+    properties: DODropletNodeProperties = DODropletNodeProperties()
+    sub_resource_relationship: DODropletToAccountRel = DODropletToAccountRel()

cartography/models/digitalocean/project.py

@@ -0,0 +1,48 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class DOProjectNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    account_id: PropertyRef = PropertyRef("ACCOUNT_ID", set_in_kwargs=True)
+    name: PropertyRef = PropertyRef("name")
+    owner_uuid: PropertyRef = PropertyRef("owner_uuid")
+    description: PropertyRef = PropertyRef("description")
+    environment: PropertyRef = PropertyRef("environment")
+    is_default: PropertyRef = PropertyRef("is_default")
+    created_at: PropertyRef = PropertyRef("created_at")
+    updated_at: PropertyRef = PropertyRef("updated_at")
+
+
+@dataclass(frozen=True)
+class DOProjectToAccountRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:DOAccount)<-[:RESOURCE]-(:DOProject)
+class DOProjectToAccountRel(CartographyRelSchema):
+    target_node_label: str = "DOAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("ACCOUNT_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.OUTWARD
+    rel_label: str = "RESOURCE"
+    properties: DOProjectToAccountRelProperties = DOProjectToAccountRelProperties()
+
+
+@dataclass(frozen=True)
+class DOProjectSchema(CartographyNodeSchema):
+    label: str = "DOProject"
+    properties: DOProjectNodeProperties = DOProjectNodeProperties()
+    sub_resource_relationship: DOProjectToAccountRel = DOProjectToAccountRel()

cartography/models/duo/api_host.py

@@ -7,11 +7,11 @@ from cartography.models.core.nodes import CartographyNodeSchema
 
 @dataclass(frozen=True)
 class DuoApiHostNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class DuoApiHostSchema(CartographyNodeSchema):
-    label: str = 'DuoApiHost'
+    label: str = "DuoApiHost"
     properties: DuoApiHostNodeProperties = DuoApiHostNodeProperties()

cartography/models/duo/endpoint.py

@@ -13,73 +13,75 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class DuoEndpointNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('epkey')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    browsers: PropertyRef = PropertyRef('browsers')
-    computer_sid: PropertyRef = PropertyRef('computer_sid')
-    cpu_id: PropertyRef = PropertyRef('cpu_id')
-    device_id: PropertyRef = PropertyRef('device_id')
-    device_identifier: PropertyRef = PropertyRef('device_identifier')
-    device_identifier_type: PropertyRef = PropertyRef('device_identifier_type')
-    device_name: PropertyRef = PropertyRef('device_name')
-    device_udid: PropertyRef = PropertyRef('device_udid')
-    device_username: PropertyRef = PropertyRef('device_username')
-    device_username_type: PropertyRef = PropertyRef('device_username_type')
-    disk_encryption_status: PropertyRef = PropertyRef('disk_encryption_status')
-    domain_sid: PropertyRef = PropertyRef('domain_sid')
-    email: PropertyRef = PropertyRef('email', extra_index=True)
-    epkey: PropertyRef = PropertyRef('epkey', extra_index=True)
-    firewall_status: PropertyRef = PropertyRef('firewall_status')
-    hardware_uuid: PropertyRef = PropertyRef('hardware_uuid')
-    health_app_client_version: PropertyRef = PropertyRef('health_app_client_version')
-    health_data_last_collected: PropertyRef = PropertyRef('health_data_last_collected')
-    last_updated: PropertyRef = PropertyRef('last_updated')
-    machine_guid: PropertyRef = PropertyRef('machine_guid')
-    model: PropertyRef = PropertyRef('model')
-    os_build: PropertyRef = PropertyRef('os_build')
-    os_family: PropertyRef = PropertyRef('os_family')
-    os_version: PropertyRef = PropertyRef('os_version')
-    password_status: PropertyRef = PropertyRef('password_status')
-    security_agents: PropertyRef = PropertyRef('security_agents')
-    trusted_endpoint: PropertyRef = PropertyRef('trusted_endpoint')
-    type: PropertyRef = PropertyRef('type')
-    username: PropertyRef = PropertyRef('username', extra_index=True)
+    id: PropertyRef = PropertyRef("epkey")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    browsers: PropertyRef = PropertyRef("browsers")
+    computer_sid: PropertyRef = PropertyRef("computer_sid")
+    cpu_id: PropertyRef = PropertyRef("cpu_id")
+    device_id: PropertyRef = PropertyRef("device_id")
+    device_identifier: PropertyRef = PropertyRef("device_identifier")
+    device_identifier_type: PropertyRef = PropertyRef("device_identifier_type")
+    device_name: PropertyRef = PropertyRef("device_name")
+    device_udid: PropertyRef = PropertyRef("device_udid")
+    device_username: PropertyRef = PropertyRef("device_username")
+    device_username_type: PropertyRef = PropertyRef("device_username_type")
+    disk_encryption_status: PropertyRef = PropertyRef("disk_encryption_status")
+    domain_sid: PropertyRef = PropertyRef("domain_sid")
+    email: PropertyRef = PropertyRef("email", extra_index=True)
+    epkey: PropertyRef = PropertyRef("epkey", extra_index=True)
+    firewall_status: PropertyRef = PropertyRef("firewall_status")
+    hardware_uuid: PropertyRef = PropertyRef("hardware_uuid")
+    health_app_client_version: PropertyRef = PropertyRef("health_app_client_version")
+    health_data_last_collected: PropertyRef = PropertyRef("health_data_last_collected")
+    last_updated: PropertyRef = PropertyRef("last_updated")
+    machine_guid: PropertyRef = PropertyRef("machine_guid")
+    model: PropertyRef = PropertyRef("model")
+    os_build: PropertyRef = PropertyRef("os_build")
+    os_family: PropertyRef = PropertyRef("os_family")
+    os_version: PropertyRef = PropertyRef("os_version")
+    password_status: PropertyRef = PropertyRef("password_status")
+    security_agents: PropertyRef = PropertyRef("security_agents")
+    trusted_endpoint: PropertyRef = PropertyRef("trusted_endpoint")
+    type: PropertyRef = PropertyRef("type")
+    username: PropertyRef = PropertyRef("username", extra_index=True)
 
 
 @dataclass(frozen=True)
 class DuoEndpointToDuoApiHostRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class DuoEndpointToDuoApiHostRel(CartographyRelSchema):
-    target_node_label: str = 'DuoApiHost'
+    target_node_label: str = "DuoApiHost"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('DUO_API_HOSTNAME', set_in_kwargs=True)},
+        {"id": PropertyRef("DUO_API_HOSTNAME", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: DuoEndpointToDuoApiHostRelProperties = DuoEndpointToDuoApiHostRelProperties()
+    properties: DuoEndpointToDuoApiHostRelProperties = (
+        DuoEndpointToDuoApiHostRelProperties()
+    )
 
 
-class DuoEndpointToDuoUserProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class DuoEndpointToDuoUserRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class DuoEndpointToDuoUserRel(CartographyRelSchema):
-    target_node_label: str = 'DuoUser'
+    target_node_label: str = "DuoUser"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'email': PropertyRef('email')},
+        {"email": PropertyRef("email")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS_DUO_ENDPOINT"
-    properties: DuoEndpointToDuoUserProperties = DuoEndpointToDuoUserProperties()
+    properties: DuoEndpointToDuoUserRelProperties = DuoEndpointToDuoUserRelProperties()
 
 
 @dataclass(frozen=True)
 class DuoEndpointSchema(CartographyNodeSchema):
-    label: str = 'DuoEndpoint'
+    label: str = "DuoEndpoint"
     properties: DuoEndpointNodeProperties = DuoEndpointNodeProperties()
     sub_resource_relationship: DuoEndpointToDuoApiHostRel = DuoEndpointToDuoApiHostRel()
     other_relationships: OtherRelationships = OtherRelationships(

cartography/models/duo/group.py

@@ -12,28 +12,28 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class DuoGroupNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('group_id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    desc: PropertyRef = PropertyRef('desc')
-    group_id: PropertyRef = PropertyRef('group_id', extra_index=True)
-    mobile_otp_enabled: PropertyRef = PropertyRef('mobile_otp_enabled')
-    name: PropertyRef = PropertyRef('name', extra_index=True)
-    push_enabled: PropertyRef = PropertyRef('push_enabled')
-    sms_enabled: PropertyRef = PropertyRef('sms_enabled')
-    status: PropertyRef = PropertyRef('status')
-    voice_enabled: PropertyRef = PropertyRef('voice_enabled')
+    id: PropertyRef = PropertyRef("group_id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    desc: PropertyRef = PropertyRef("desc")
+    group_id: PropertyRef = PropertyRef("group_id", extra_index=True)
+    mobile_otp_enabled: PropertyRef = PropertyRef("mobile_otp_enabled")
+    name: PropertyRef = PropertyRef("name", extra_index=True)
+    push_enabled: PropertyRef = PropertyRef("push_enabled")
+    sms_enabled: PropertyRef = PropertyRef("sms_enabled")
+    status: PropertyRef = PropertyRef("status")
+    voice_enabled: PropertyRef = PropertyRef("voice_enabled")
 
 
 @dataclass(frozen=True)
 class DuoGroupToDuoApiHostRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class DuoGroupToDuoApiHostRel(CartographyRelSchema):
-    target_node_label: str = 'DuoApiHost'
+    target_node_label: str = "DuoApiHost"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('DUO_API_HOSTNAME', set_in_kwargs=True)},
+        {"id": PropertyRef("DUO_API_HOSTNAME", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
@@ -42,6 +42,6 @@ class DuoGroupToDuoApiHostRel(CartographyRelSchema):
 
 @dataclass(frozen=True)
 class DuoGroupSchema(CartographyNodeSchema):
-    label: str = 'DuoGroup'
+    label: str = "DuoGroup"
     properties: DuoGroupNodeProperties = DuoGroupNodeProperties()
     sub_resource_relationship: DuoGroupToDuoApiHostRel = DuoGroupToDuoApiHostRel()