cartography 0.102.0rc2__py3-none-any.whl → 0.103.0__py3-none-any.whl

cartography/models/aws/ec2/routes.py

@@ -13,65 +13,73 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class RouteNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    carrier_gateway_id: PropertyRef = PropertyRef('carrier_gateway_id')
-    core_network_arn: PropertyRef = PropertyRef('core_network_arn')
-    destination_cidr_block: PropertyRef = PropertyRef('destination_cidr_block')
-    destination_ipv6_cidr_block: PropertyRef = PropertyRef('destination_ipv6_cidr_block')
-    destination_prefix_list_id: PropertyRef = PropertyRef('destination_prefix_list_id')
-    egress_only_internet_gateway_id: PropertyRef = PropertyRef('egress_only_internet_gateway_id')
-    gateway_id: PropertyRef = PropertyRef('gateway_id')
-    instance_id: PropertyRef = PropertyRef('instance_id')
-    instance_owner_id: PropertyRef = PropertyRef('instance_owner_id')
-    local_gateway_id: PropertyRef = PropertyRef('local_gateway_id')
-    nat_gateway_id: PropertyRef = PropertyRef('nat_gateway_id')
-    network_interface_id: PropertyRef = PropertyRef('network_interface_id')
-    origin: PropertyRef = PropertyRef('origin')
-    state: PropertyRef = PropertyRef('state')
-    transit_gateway_id: PropertyRef = PropertyRef('transit_gateway_id')
-    vpc_peering_connection_id: PropertyRef = PropertyRef('vpc_peering_connection_id')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    target: PropertyRef = PropertyRef('_target')
+    id: PropertyRef = PropertyRef("id")
+    carrier_gateway_id: PropertyRef = PropertyRef("carrier_gateway_id")
+    core_network_arn: PropertyRef = PropertyRef("core_network_arn")
+    destination_cidr_block: PropertyRef = PropertyRef("destination_cidr_block")
+    destination_ipv6_cidr_block: PropertyRef = PropertyRef(
+        "destination_ipv6_cidr_block"
+    )
+    destination_prefix_list_id: PropertyRef = PropertyRef("destination_prefix_list_id")
+    egress_only_internet_gateway_id: PropertyRef = PropertyRef(
+        "egress_only_internet_gateway_id"
+    )
+    gateway_id: PropertyRef = PropertyRef("gateway_id")
+    instance_id: PropertyRef = PropertyRef("instance_id")
+    instance_owner_id: PropertyRef = PropertyRef("instance_owner_id")
+    local_gateway_id: PropertyRef = PropertyRef("local_gateway_id")
+    nat_gateway_id: PropertyRef = PropertyRef("nat_gateway_id")
+    network_interface_id: PropertyRef = PropertyRef("network_interface_id")
+    origin: PropertyRef = PropertyRef("origin")
+    state: PropertyRef = PropertyRef("state")
+    transit_gateway_id: PropertyRef = PropertyRef("transit_gateway_id")
+    vpc_peering_connection_id: PropertyRef = PropertyRef("vpc_peering_connection_id")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    target: PropertyRef = PropertyRef("_target")
 
 
 @dataclass(frozen=True)
-class RouteToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class RouteToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('AWS_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: RouteToAwsAccountRelProperties = RouteToAwsAccountRelProperties()
+    properties: RouteToAWSAccountRelRelProperties = RouteToAWSAccountRelRelProperties()
 
 
 @dataclass(frozen=True)
-class RouteToInternetGatewayRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteToInternetGatewayRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteToInternetGateway(CartographyRelSchema):
-    target_node_label: str = 'AWSInternetGateway'
+class RouteToInternetGatewayRel(CartographyRelSchema):
+    target_node_label: str = "AWSInternetGateway"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('gateway_id')},
+        {"id": PropertyRef("gateway_id")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "ROUTES_TO_GATEWAY"
-    properties: RouteToInternetGatewayRelProperties = RouteToInternetGatewayRelProperties()
+    properties: RouteToInternetGatewayRelRelProperties = (
+        RouteToInternetGatewayRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class RouteSchema(CartographyNodeSchema):
-    label: str = 'EC2Route'
+    label: str = "EC2Route"
     properties: RouteNodeProperties = RouteNodeProperties()
-    sub_resource_relationship: RouteToAWSAccount = RouteToAWSAccount()
-    other_relationships: OtherRelationships = OtherRelationships([
-        RouteToInternetGateway(),
-    ])
+    sub_resource_relationship: RouteToAWSAccountRel = RouteToAWSAccountRel()
+    other_relationships: OtherRelationships = OtherRelationships(
+        [
+            RouteToInternetGatewayRel(),
+        ]
+    )

cartography/models/aws/ec2/securitygroup_instance.py

@@ -14,42 +14,46 @@ from cartography.models.core.relationships import TargetNodeMatcher
 @dataclass(frozen=True)
 class EC2SecurityGroupInstanceNodeProperties(CartographyNodeProperties):
     # arn: PropertyRef = PropertyRef('Arn', extra_index=True) # TODO use arn; #1024
-    id: PropertyRef = PropertyRef('GroupId')
-    groupid: PropertyRef = PropertyRef('GroupId', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("GroupId")
+    groupid: PropertyRef = PropertyRef("GroupId", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SecurityGroupToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SecurityGroupToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SecurityGroupToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2SecurityGroupToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('AWS_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: EC2SecurityGroupToAwsAccountRelProperties = EC2SecurityGroupToAwsAccountRelProperties()
+    properties: EC2SecurityGroupToAWSAccountRelRelProperties = (
+        EC2SecurityGroupToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2SecurityGroupToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SecurityGroupToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SecurityGroupToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class EC2SecurityGroupToEC2InstanceRel(CartographyRelSchema):
+    target_node_label: str = "EC2Instance"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('InstanceId')},
+        {"id": PropertyRef("InstanceId")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "MEMBER_OF_EC2_SECURITY_GROUP"
-    properties: EC2SecurityGroupToEC2InstanceRelProperties = EC2SecurityGroupToEC2InstanceRelProperties()
+    properties: EC2SecurityGroupToEC2InstanceRelRelProperties = (
+        EC2SecurityGroupToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -57,11 +61,16 @@ class EC2SecurityGroupInstanceSchema(CartographyNodeSchema):
     """
     Security groups as known by describe-ec2-instances
     """
-    label: str = 'EC2SecurityGroup'
-    properties: EC2SecurityGroupInstanceNodeProperties = EC2SecurityGroupInstanceNodeProperties()
-    sub_resource_relationship: EC2SecurityGroupToAWSAccount = EC2SecurityGroupToAWSAccount()
+
+    label: str = "EC2SecurityGroup"
+    properties: EC2SecurityGroupInstanceNodeProperties = (
+        EC2SecurityGroupInstanceNodeProperties()
+    )
+    sub_resource_relationship: EC2SecurityGroupToAWSAccountRel = (
+        EC2SecurityGroupToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2SecurityGroupToEC2Instance(),
+            EC2SecurityGroupToEC2InstanceRel(),
         ],
     )

cartography/models/aws/ec2/securitygroup_networkinterface.py

@@ -1,6 +1,8 @@
 from dataclasses import dataclass
 
-from cartography.models.aws.ec2.securitygroup_instance import EC2SecurityGroupToAWSAccount
+from cartography.models.aws.ec2.securitygroup_instance import (
+    EC2SecurityGroupToAWSAccountRel,
+)
 from cartography.models.core.common import PropertyRef
 from cartography.models.core.nodes import CartographyNodeProperties
 from cartography.models.core.nodes import CartographyNodeSchema
@@ -15,26 +17,28 @@ from cartography.models.core.relationships import TargetNodeMatcher
 @dataclass(frozen=True)
 class EC2SecurityGroupNetworkInterfaceNodeProperties(CartographyNodeProperties):
     # arn: PropertyRef = PropertyRef('Arn', extra_index=True) # TODO use arn; issue #1024
-    id: PropertyRef = PropertyRef('GroupId')
-    groupid: PropertyRef = PropertyRef('GroupId', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("GroupId")
+    groupid: PropertyRef = PropertyRef("GroupId", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToNetworkInterfaceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SubnetToNetworkInterfaceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SecurityGroupToNetworkInterface(CartographyRelSchema):
-    target_node_label: str = 'NetworkInterface'
+class EC2SecurityGroupToNetworkInterfaceRel(CartographyRelSchema):
+    target_node_label: str = "NetworkInterface"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('NetworkInterfaceId')},
+        {"id": PropertyRef("NetworkInterfaceId")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "MEMBER_OF_EC2_SECURITY_GROUP"
-    properties: EC2SubnetToNetworkInterfaceRelProperties = EC2SubnetToNetworkInterfaceRelProperties()
+    properties: EC2SubnetToNetworkInterfaceRelRelProperties = (
+        EC2SubnetToNetworkInterfaceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -42,11 +46,16 @@ class EC2SecurityGroupNetworkInterfaceSchema(CartographyNodeSchema):
     """
     Security groups as known by describe-network-interfaces.
     """
-    label: str = 'EC2SecurityGroup'
-    properties: EC2SecurityGroupNetworkInterfaceNodeProperties = EC2SecurityGroupNetworkInterfaceNodeProperties()
-    sub_resource_relationship: EC2SecurityGroupToAWSAccount = EC2SecurityGroupToAWSAccount()
+
+    label: str = "EC2SecurityGroup"
+    properties: EC2SecurityGroupNetworkInterfaceNodeProperties = (
+        EC2SecurityGroupNetworkInterfaceNodeProperties()
+    )
+    sub_resource_relationship: EC2SecurityGroupToAWSAccountRel = (
+        EC2SecurityGroupToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2SecurityGroupToNetworkInterface(),
+            EC2SecurityGroupToNetworkInterfaceRel(),
         ],
     )

cartography/models/aws/ec2/subnet_instance.py

@@ -14,42 +14,46 @@ from cartography.models.core.relationships import TargetNodeMatcher
 @dataclass(frozen=True)
 class EC2SubnetInstanceNodeProperties(CartographyNodeProperties):
     # arn: PropertyRef = PropertyRef('Arn', extra_index=True) TODO use arn; issue #1024
-    id: PropertyRef = PropertyRef('SubnetId')
-    subnetid: PropertyRef = PropertyRef('SubnetId', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("SubnetId")
+    subnetid: PropertyRef = PropertyRef("SubnetId", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SubnetToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2SubnetToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('AWS_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: EC2SubnetToAwsAccountRelProperties = EC2SubnetToAwsAccountRelProperties()
+    properties: EC2SubnetToAWSAccountRelRelProperties = (
+        EC2SubnetToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2SubnetToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SubnetToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class EC2SubnetToEC2InstanceRel(CartographyRelSchema):
+    target_node_label: str = "EC2Instance"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('InstanceId')},
+        {"id": PropertyRef("InstanceId")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "PART_OF_SUBNET"
-    properties: EC2SubnetToEC2InstanceRelProperties = EC2SubnetToEC2InstanceRelProperties()
+    properties: EC2SubnetToEC2InstanceRelRelProperties = (
+        EC2SubnetToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -57,11 +61,12 @@ class EC2SubnetInstanceSchema(CartographyNodeSchema):
     """
     EC2 Subnet as known by describe-ec2-instances
     """
-    label: str = 'EC2Subnet'
+
+    label: str = "EC2Subnet"
     properties: EC2SubnetInstanceNodeProperties = EC2SubnetInstanceNodeProperties()
-    sub_resource_relationship: EC2SubnetToAWSAccount = EC2SubnetToAWSAccount()
+    sub_resource_relationship: EC2SubnetToAWSAccountRel = EC2SubnetToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2SubnetToEC2Instance(),
+            EC2SubnetToEC2InstanceRel(),
         ],
     )

cartography/models/aws/ec2/subnet_networkinterface.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 
-from cartography.models.aws.ec2.subnet_instance import EC2SubnetToAWSAccount
-from cartography.models.aws.ec2.subnet_instance import EC2SubnetToEC2Instance
+from cartography.models.aws.ec2.subnet_instance import EC2SubnetToAWSAccountRel
+from cartography.models.aws.ec2.subnet_instance import EC2SubnetToEC2InstanceRel
 from cartography.models.core.common import PropertyRef
 from cartography.models.core.nodes import CartographyNodeProperties
 from cartography.models.core.nodes import CartographyNodeSchema
@@ -15,58 +15,64 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class EC2SubnetNetworkInterfaceNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('SubnetId')
-    subnet_id: PropertyRef = PropertyRef('SubnetId', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("SubnetId")
+    subnet_id: PropertyRef = PropertyRef("SubnetId", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToNetworkInterfaceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SubnetToNetworkInterfaceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToNetworkInterface(CartographyRelSchema):
-    target_node_label: str = 'NetworkInterface'
+class EC2SubnetToNetworkInterfaceRel(CartographyRelSchema):
+    target_node_label: str = "NetworkInterface"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('NetworkInterfaceId')},
+        {"id": PropertyRef("NetworkInterfaceId")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "PART_OF_SUBNET"
-    properties: EC2SubnetToNetworkInterfaceRelProperties = EC2SubnetToNetworkInterfaceRelProperties()
+    properties: EC2SubnetToNetworkInterfaceRelRelProperties = (
+        EC2SubnetToNetworkInterfaceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2SubnetToLoadBalancerRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SubnetToLoadBalancerRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToLoadBalancer(CartographyRelSchema):
-    target_node_label: str = 'LoadBalancer'
+class EC2SubnetToLoadBalancerRel(CartographyRelSchema):
+    target_node_label: str = "LoadBalancer"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('ElbV1Id')},
+        {"id": PropertyRef("ElbV1Id")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "PART_OF_SUBNET"
-    properties: EC2SubnetToLoadBalancerRelProperties = EC2SubnetToLoadBalancerRelProperties()
+    properties: EC2SubnetToLoadBalancerRelRelProperties = (
+        EC2SubnetToLoadBalancerRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2SubnetToLoadBalancerV2RelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SubnetToLoadBalancerV2RelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToLoadBalancerV2(CartographyRelSchema):
-    target_node_label: str = 'LoadBalancerV2'
+class EC2SubnetToLoadBalancerV2Rel(CartographyRelSchema):
+    target_node_label: str = "LoadBalancerV2"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('ElbV2Id')},
+        {"id": PropertyRef("ElbV2Id")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "PART_OF_SUBNET"
-    properties: EC2SubnetToLoadBalancerV2RelProperties = EC2SubnetToLoadBalancerV2RelProperties()
+    properties: EC2SubnetToLoadBalancerV2RelRelProperties = (
+        EC2SubnetToLoadBalancerV2RelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -74,14 +80,17 @@ class EC2SubnetNetworkInterfaceSchema(CartographyNodeSchema):
     """
     Subnet as known by describe-network-interfaces
     """
-    label: str = 'EC2Subnet'
-    properties: EC2SubnetNetworkInterfaceNodeProperties = EC2SubnetNetworkInterfaceNodeProperties()
-    sub_resource_relationship: EC2SubnetToAWSAccount = EC2SubnetToAWSAccount()
+
+    label: str = "EC2Subnet"
+    properties: EC2SubnetNetworkInterfaceNodeProperties = (
+        EC2SubnetNetworkInterfaceNodeProperties()
+    )
+    sub_resource_relationship: EC2SubnetToAWSAccountRel = EC2SubnetToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2SubnetToNetworkInterface(),
-            EC2SubnetToEC2Instance(),
-            EC2SubnetToLoadBalancer(),
-            EC2SubnetToLoadBalancerV2(),
+            EC2SubnetToNetworkInterfaceRel(),
+            EC2SubnetToEC2InstanceRel(),
+            EC2SubnetToLoadBalancerRel(),
+            EC2SubnetToLoadBalancerV2Rel(),
         ],
     )

cartography/models/aws/ec2/volumes.py

@@ -13,55 +13,59 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class EBSVolumeNodeProperties(CartographyNodeProperties):
-    arn: PropertyRef = PropertyRef('Arn', extra_index=True)
-    id: PropertyRef = PropertyRef('VolumeId')
-    volumeid: PropertyRef = PropertyRef('VolumeId', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    availabilityzone: PropertyRef = PropertyRef('AvailabilityZone')
-    createtime: PropertyRef = PropertyRef('CreateTime')
-    encrypted: PropertyRef = PropertyRef('Encrypted')
-    size: PropertyRef = PropertyRef('Size')
-    state: PropertyRef = PropertyRef('State')
-    outpostarn: PropertyRef = PropertyRef('OutpostArn')
-    snapshotid: PropertyRef = PropertyRef('SnapshotId')
-    iops: PropertyRef = PropertyRef('Iops')
-    fastrestored: PropertyRef = PropertyRef('FastRestored')
-    multiattachenabled: PropertyRef = PropertyRef('MultiAttachEnabled')
-    type: PropertyRef = PropertyRef('VolumeType')
-    kmskeyid: PropertyRef = PropertyRef('KmsKeyId')
+    arn: PropertyRef = PropertyRef("Arn", extra_index=True)
+    id: PropertyRef = PropertyRef("VolumeId")
+    volumeid: PropertyRef = PropertyRef("VolumeId", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    availabilityzone: PropertyRef = PropertyRef("AvailabilityZone")
+    createtime: PropertyRef = PropertyRef("CreateTime")
+    encrypted: PropertyRef = PropertyRef("Encrypted")
+    size: PropertyRef = PropertyRef("Size")
+    state: PropertyRef = PropertyRef("State")
+    outpostarn: PropertyRef = PropertyRef("OutpostArn")
+    snapshotid: PropertyRef = PropertyRef("SnapshotId")
+    iops: PropertyRef = PropertyRef("Iops")
+    fastrestored: PropertyRef = PropertyRef("FastRestored")
+    multiattachenabled: PropertyRef = PropertyRef("MultiAttachEnabled")
+    type: PropertyRef = PropertyRef("VolumeType")
+    kmskeyid: PropertyRef = PropertyRef("KmsKeyId")
 
 
 @dataclass(frozen=True)
-class EBSVolumeToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EBSVolumeToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EBSVolumeToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EBSVolumeToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('AWS_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: EBSVolumeToAwsAccountRelProperties = EBSVolumeToAwsAccountRelProperties()
+    properties: EBSVolumeToAWSAccountRelRelProperties = (
+        EBSVolumeToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EBSVolumeToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EBSVolumeToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EBSVolumeToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class EBSVolumeToEC2InstanceRel(CartographyRelSchema):
+    target_node_label: str = "EC2Instance"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('InstanceId')},
+        {"id": PropertyRef("InstanceId")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "ATTACHED_TO"
-    properties: EBSVolumeToEC2InstanceRelProperties = EBSVolumeToEC2InstanceRelProperties()
+    properties: EBSVolumeToEC2InstanceRelRelProperties = (
+        EBSVolumeToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -69,12 +73,13 @@ class EBSVolumeSchema(CartographyNodeSchema):
     """
     EBS Volume properties as returned from the EBS Volume API response
     """
-    label: str = 'EBSVolume'
+
+    label: str = "EBSVolume"
     properties: EBSVolumeNodeProperties = EBSVolumeNodeProperties()
-    sub_resource_relationship: EBSVolumeToAWSAccount = EBSVolumeToAWSAccount()
+    sub_resource_relationship: EBSVolumeToAWSAccountRel = EBSVolumeToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EBSVolumeToEC2Instance(),
+            EBSVolumeToEC2InstanceRel(),
         ],
     )
 
@@ -85,11 +90,12 @@ class EBSVolumeInstanceProperties(CartographyNodeProperties):
     EBS Volume properties as known by an EC2 instance.
     The EC2 instance API response includes a `deleteontermination` field and the volume id.
     """
-    arn: PropertyRef = PropertyRef('Arn', extra_index=True)
-    id: PropertyRef = PropertyRef('VolumeId')
-    volumeid: PropertyRef = PropertyRef('VolumeId', extra_index=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    deleteontermination: PropertyRef = PropertyRef('DeleteOnTermination')
+
+    arn: PropertyRef = PropertyRef("Arn", extra_index=True)
+    id: PropertyRef = PropertyRef("VolumeId")
+    volumeid: PropertyRef = PropertyRef("VolumeId", extra_index=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    deleteontermination: PropertyRef = PropertyRef("DeleteOnTermination")
 
 
 @dataclass(frozen=True)
@@ -97,11 +103,12 @@ class EBSVolumeInstanceSchema(CartographyNodeSchema):
     """
     EBS Volume from EC2 Instance API response. This is separate from `EBSVolumeSchema` to prevent issue #1210.
     """
-    label: str = 'EBSVolume'
+
+    label: str = "EBSVolume"
     properties: EBSVolumeInstanceProperties = EBSVolumeInstanceProperties()
-    sub_resource_relationship: EBSVolumeToAWSAccount = EBSVolumeToAWSAccount()
+    sub_resource_relationship: EBSVolumeToAWSAccountRel = EBSVolumeToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EBSVolumeToEC2Instance(),
+            EBSVolumeToEC2InstanceRel(),
         ],
     )