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

cartography/models/aws/ec2/networkinterfaces.py

@@ -1,9 +1,17 @@
 from dataclasses import dataclass
 
-from cartography.models.aws.ec2.networkinterface_instance import EC2NetworkInterfaceToAWSAccount
-from cartography.models.aws.ec2.networkinterface_instance import EC2NetworkInterfaceToEC2Instance
-from cartography.models.aws.ec2.networkinterface_instance import EC2NetworkInterfaceToEC2SecurityGroup
-from cartography.models.aws.ec2.networkinterface_instance import EC2NetworkInterfaceToEC2Subnet
+from cartography.models.aws.ec2.networkinterface_instance import (
+    EC2NetworkInterfaceToAWSAccountRel,
+)
+from cartography.models.aws.ec2.networkinterface_instance import (
+    EC2NetworkInterfaceToEC2InstanceRel,
+)
+from cartography.models.aws.ec2.networkinterface_instance import (
+    EC2NetworkInterfaceToEC2SecurityGroupRel,
+)
+from cartography.models.aws.ec2.networkinterface_instance import (
+    EC2NetworkInterfaceToEC2SubnetRel,
+)
 from cartography.models.core.common import PropertyRef
 from cartography.models.core.nodes import CartographyNodeProperties
 from cartography.models.core.nodes import CartographyNodeSchema
@@ -20,54 +28,59 @@ class EC2NetworkInterfaceNodeProperties(CartographyNodeProperties):
     """
     Network interface properties
     """
-    id: PropertyRef = PropertyRef('NetworkInterfaceId')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    description: PropertyRef = PropertyRef('Description')
-    mac_address: PropertyRef = PropertyRef('MacAddress', extra_index=True)
-    private_dns_name: PropertyRef = PropertyRef('PrivateDnsName')
-    private_ip_address: PropertyRef = PropertyRef('PrivateIpAddress', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    status: PropertyRef = PropertyRef('Status')
+
+    id: PropertyRef = PropertyRef("NetworkInterfaceId")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    description: PropertyRef = PropertyRef("Description")
+    mac_address: PropertyRef = PropertyRef("MacAddress", extra_index=True)
+    private_dns_name: PropertyRef = PropertyRef("PrivateDnsName")
+    private_ip_address: PropertyRef = PropertyRef("PrivateIpAddress", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    status: PropertyRef = PropertyRef("Status")
 
     # Properties only returned by describe-network-interfaces
-    interface_type: PropertyRef = PropertyRef('InterfaceType')
-    public_ip: PropertyRef = PropertyRef('PublicIp', extra_index=True)
-    requester_id: PropertyRef = PropertyRef('RequesterId', extra_index=True)
-    requester_managed: PropertyRef = PropertyRef('RequesterManaged')
-    source_dest_check: PropertyRef = PropertyRef('SourceDestCheck')
-    subnetid: PropertyRef = PropertyRef('SubnetId', extra_index=True)
+    interface_type: PropertyRef = PropertyRef("InterfaceType")
+    public_ip: PropertyRef = PropertyRef("PublicIp", extra_index=True)
+    requester_id: PropertyRef = PropertyRef("RequesterId", extra_index=True)
+    requester_managed: PropertyRef = PropertyRef("RequesterManaged")
+    source_dest_check: PropertyRef = PropertyRef("SourceDestCheck")
+    subnetid: PropertyRef = PropertyRef("SubnetId", extra_index=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToElbRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkInterfaceToElbRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToElb(CartographyRelSchema):
-    target_node_label: str = 'LoadBalancer'
+class EC2NetworkInterfaceToElbRel(CartographyRelSchema):
+    target_node_label: str = "LoadBalancer"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'name': PropertyRef('ElbV1Id')},
+        {"name": PropertyRef("ElbV1Id")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "NETWORK_INTERFACE"
-    properties: EC2NetworkInterfaceToElbRelProperties = EC2NetworkInterfaceToElbRelProperties()
+    properties: EC2NetworkInterfaceToElbRelRelProperties = (
+        EC2NetworkInterfaceToElbRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToElbV2RelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkInterfaceToElbV2RelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToElbV2(CartographyRelSchema):
-    target_node_label: str = 'LoadBalancerV2'
+class EC2NetworkInterfaceToElbV2Rel(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 = "NETWORK_INTERFACE"
-    properties: EC2NetworkInterfaceToElbV2RelProperties = EC2NetworkInterfaceToElbV2RelProperties()
+    properties: EC2NetworkInterfaceToElbV2RelRelProperties = (
+        EC2NetworkInterfaceToElbV2RelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -75,15 +88,18 @@ class EC2NetworkInterfaceSchema(CartographyNodeSchema):
     """
     Network interface as known by describe-network-interfaces.
     """
-    label: str = 'NetworkInterface'
+
+    label: str = "NetworkInterface"
     properties: EC2NetworkInterfaceNodeProperties = EC2NetworkInterfaceNodeProperties()
-    sub_resource_relationship: EC2NetworkInterfaceToAWSAccount = EC2NetworkInterfaceToAWSAccount()
+    sub_resource_relationship: EC2NetworkInterfaceToAWSAccountRel = (
+        EC2NetworkInterfaceToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2NetworkInterfaceToEC2Subnet(),
-            EC2NetworkInterfaceToEC2SecurityGroup(),
-            EC2NetworkInterfaceToElb(),
-            EC2NetworkInterfaceToElbV2(),
-            EC2NetworkInterfaceToEC2Instance(),
+            EC2NetworkInterfaceToEC2SubnetRel(),
+            EC2NetworkInterfaceToEC2SecurityGroupRel(),
+            EC2NetworkInterfaceToElbRel(),
+            EC2NetworkInterfaceToElbV2Rel(),
+            EC2NetworkInterfaceToEC2InstanceRel(),
         ],
     )

cartography/models/aws/ec2/privateip_networkinterface.py

@@ -16,45 +16,50 @@ class EC2PrivateIpNetworkInterfaceNodeProperties(CartographyNodeProperties):
     """
     Selection of properties of a private IP as known by an EC2 network interface
     """
-    id: PropertyRef = PropertyRef('Id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    network_interface_id: PropertyRef = PropertyRef('NetworkInterfaceId')
-    primary: PropertyRef = PropertyRef('Primary')
-    private_ip_address: PropertyRef = PropertyRef('PrivateIpAddress')
-    public_ip: PropertyRef = PropertyRef('PublicIp')
-    ip_owner_id: PropertyRef = PropertyRef('IpOwnerId')
+
+    id: PropertyRef = PropertyRef("Id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    network_interface_id: PropertyRef = PropertyRef("NetworkInterfaceId")
+    primary: PropertyRef = PropertyRef("Primary")
+    private_ip_address: PropertyRef = PropertyRef("PrivateIpAddress")
+    public_ip: PropertyRef = PropertyRef("PublicIp")
+    ip_owner_id: PropertyRef = PropertyRef("IpOwnerId")
 
 
 @dataclass(frozen=True)
-class EC2PrivateIpToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2PrivateIpToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2PrivateIpToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2PrivateIpToAWSAccountRel(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: EC2PrivateIpToAwsAccountRelProperties = EC2PrivateIpToAwsAccountRelProperties()
+    properties: EC2PrivateIpToAWSAccountRelRelProperties = (
+        EC2PrivateIpToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class EC2NetworkInterfaceToPrivateIpRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2PrivateIpToNetworkInterface(CartographyRelSchema):
-    target_node_label: str = 'NetworkInterface'
+class EC2PrivateIpToNetworkInterfaceRel(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 = "PRIVATE_IP_ADDRESS"
-    properties: EC2NetworkInterfaceToPrivateIpRelProperties = EC2NetworkInterfaceToPrivateIpRelProperties()
+    properties: EC2NetworkInterfaceToPrivateIpRelProperties = (
+        EC2NetworkInterfaceToPrivateIpRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -62,11 +67,16 @@ class EC2PrivateIpNetworkInterfaceSchema(CartographyNodeSchema):
     """
     PrivateIp as known by a Network Interface
     """
-    label: str = 'EC2PrivateIp'
-    properties: EC2PrivateIpNetworkInterfaceNodeProperties = EC2PrivateIpNetworkInterfaceNodeProperties()
-    sub_resource_relationship: EC2PrivateIpToAWSAccount = EC2PrivateIpToAWSAccount()
+
+    label: str = "EC2PrivateIp"
+    properties: EC2PrivateIpNetworkInterfaceNodeProperties = (
+        EC2PrivateIpNetworkInterfaceNodeProperties()
+    )
+    sub_resource_relationship: EC2PrivateIpToAWSAccountRel = (
+        EC2PrivateIpToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2PrivateIpToNetworkInterface(),
+            EC2PrivateIpToNetworkInterfaceRel(),
         ],
     )

cartography/models/aws/ec2/reservations.py

@@ -12,32 +12,36 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class EC2ReservationNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('ReservationId')
-    reservationid: PropertyRef = PropertyRef('ReservationId')
-    ownerid: PropertyRef = PropertyRef('OwnerId')
-    requesterid: PropertyRef = PropertyRef('RequesterId')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("ReservationId")
+    reservationid: PropertyRef = PropertyRef("ReservationId")
+    ownerid: PropertyRef = PropertyRef("OwnerId")
+    requesterid: PropertyRef = PropertyRef("RequesterId")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2ReservationToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2ReservationToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2ReservationToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2ReservationToAWSAccountRel(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: EC2ReservationToAwsAccountRelProperties = EC2ReservationToAwsAccountRelProperties()
+    properties: EC2ReservationToAWSAccountRelRelProperties = (
+        EC2ReservationToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class EC2ReservationSchema(CartographyNodeSchema):
-    label: str = 'EC2Reservation'
+    label: str = "EC2Reservation"
     properties: EC2ReservationNodeProperties = EC2ReservationNodeProperties()
-    sub_resource_relationship: EC2ReservationToAWSAccount = EC2ReservationToAWSAccount()
+    sub_resource_relationship: EC2ReservationToAWSAccountRel = (
+        EC2ReservationToAWSAccountRel()
+    )

cartography/models/aws/ec2/route_table_associations.py

@@ -13,75 +13,85 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class RouteTableAssociationNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    route_table_association_id: PropertyRef = PropertyRef('id', extra_index=True)
-    target: PropertyRef = PropertyRef('_target')
-    gateway_id: PropertyRef = PropertyRef('gateway_id')
-    main: PropertyRef = PropertyRef('main')
-    route_table_id: PropertyRef = PropertyRef('route_table_id')
-    subnet_id: PropertyRef = PropertyRef('subnet_id')
-    association_state: PropertyRef = PropertyRef('association_state')
-    association_state_message: PropertyRef = PropertyRef('association_state_message')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    route_table_association_id: PropertyRef = PropertyRef("id", extra_index=True)
+    target: PropertyRef = PropertyRef("_target")
+    gateway_id: PropertyRef = PropertyRef("gateway_id")
+    main: PropertyRef = PropertyRef("main")
+    route_table_id: PropertyRef = PropertyRef("route_table_id")
+    subnet_id: PropertyRef = PropertyRef("subnet_id")
+    association_state: PropertyRef = PropertyRef("association_state")
+    association_state_message: PropertyRef = PropertyRef("association_state_message")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableAssociationToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableAssociationToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableAssociationToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class RouteTableAssociationToAWSAccountRel(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: RouteTableAssociationToAwsAccountRelProperties = RouteTableAssociationToAwsAccountRelProperties()
+    properties: RouteTableAssociationToAWSAccountRelRelProperties = (
+        RouteTableAssociationToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class RouteTableAssociationToSubnetRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableAssociationToSubnetRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableAssociationToSubnet(CartographyRelSchema):
-    target_node_label: str = 'EC2Subnet'
+class RouteTableAssociationToSubnetRel(CartographyRelSchema):
+    target_node_label: str = "EC2Subnet"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'subnetid': PropertyRef('subnet_id')},
+        {"subnetid": PropertyRef("subnet_id")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "ASSOCIATED_SUBNET"
-    properties: RouteTableAssociationToSubnetRelProperties = RouteTableAssociationToSubnetRelProperties()
+    properties: RouteTableAssociationToSubnetRelRelProperties = (
+        RouteTableAssociationToSubnetRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class RouteTableAssociationToIgwRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableAssociationToIgwRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableAssociationToIgw(CartographyRelSchema):
-    target_node_label: str = 'AWSInternetGateway'
+class RouteTableAssociationToIgwRel(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 = "ASSOCIATED_IGW_FOR_INGRESS"
-    properties: RouteTableAssociationToIgwRelProperties = RouteTableAssociationToIgwRelProperties()
+    properties: RouteTableAssociationToIgwRelRelProperties = (
+        RouteTableAssociationToIgwRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class RouteTableAssociationSchema(CartographyNodeSchema):
-    label: str = 'EC2RouteTableAssociation'
-    properties: RouteTableAssociationNodeProperties = RouteTableAssociationNodeProperties()
-    sub_resource_relationship: RouteTableAssociationToAWSAccount = RouteTableAssociationToAWSAccount()
+    label: str = "EC2RouteTableAssociation"
+    properties: RouteTableAssociationNodeProperties = (
+        RouteTableAssociationNodeProperties()
+    )
+    sub_resource_relationship: RouteTableAssociationToAWSAccountRel = (
+        RouteTableAssociationToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            RouteTableAssociationToSubnet(),
-            RouteTableAssociationToIgw(),
+            RouteTableAssociationToSubnetRel(),
+            RouteTableAssociationToIgwRel(),
         ],
     )

cartography/models/aws/ec2/route_tables.py

@@ -16,106 +16,113 @@ class RouteTableNodeProperties(CartographyNodeProperties):
     """
     Schema describing a RouteTable.
     """
-    id: PropertyRef = PropertyRef('id')
-    route_table_id: PropertyRef = PropertyRef('route_table_id', extra_index=True)
-    owner_id: PropertyRef = PropertyRef('owner_id')
-    vpc_id: PropertyRef = PropertyRef('VpcId')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    main: PropertyRef = PropertyRef('main')
+
+    id: PropertyRef = PropertyRef("id")
+    route_table_id: PropertyRef = PropertyRef("route_table_id", extra_index=True)
+    owner_id: PropertyRef = PropertyRef("owner_id")
+    vpc_id: PropertyRef = PropertyRef("VpcId")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    main: PropertyRef = PropertyRef("main")
 
 
 @dataclass(frozen=True)
-class RouteTableToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class RouteTableToAWSAccountRel(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: RouteTableToAwsAccountRelProperties = RouteTableToAwsAccountRelProperties()
+    properties: RouteTableToAWSAccountRelRelProperties = (
+        RouteTableToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class RouteTableToVpcRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableToVpcRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableToVpc(CartographyRelSchema):
-    target_node_label: str = 'AWSVpc'
+class RouteTableToVpcRel(CartographyRelSchema):
+    target_node_label: str = "AWSVpc"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('vpc_id')},
+        {"id": PropertyRef("vpc_id")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "MEMBER_OF_AWS_VPC"
-    properties: RouteTableToVpcRelProperties = RouteTableToVpcRelProperties()
+    properties: RouteTableToVpcRelRelProperties = RouteTableToVpcRelRelProperties()
 
 
 @dataclass(frozen=True)
-class RouteTableToRouteRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableToRouteRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableToRoute(CartographyRelSchema):
-    target_node_label: str = 'EC2Route'
+class RouteTableToRouteRel(CartographyRelSchema):
+    target_node_label: str = "EC2Route"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('RouteIds', one_to_many=True)},
+        {"id": PropertyRef("RouteIds", one_to_many=True)},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "ROUTE"
-    properties: RouteTableToRouteRelProperties = RouteTableToRouteRelProperties()
+    properties: RouteTableToRouteRelRelProperties = RouteTableToRouteRelRelProperties()
 
 
 @dataclass(frozen=True)
-class RouteTableToAssociationRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableToAssociationRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class RouteTableToAssociation(CartographyRelSchema):
-    target_node_label: str = 'EC2RouteTableAssociation'
+class RouteTableToAssociationRel(CartographyRelSchema):
+    target_node_label: str = "EC2RouteTableAssociation"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('RouteTableAssociationIds', one_to_many=True)},
+        {"id": PropertyRef("RouteTableAssociationIds", one_to_many=True)},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "ASSOCIATION"
-    properties: RouteTableToAssociationRelProperties = RouteTableToAssociationRelProperties()
+    properties: RouteTableToAssociationRelRelProperties = (
+        RouteTableToAssociationRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class RouteTableToVpnGatewayRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class RouteTableToVpnGatewayRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 # TODO implement AWSVpnGateways
 @dataclass(frozen=True)
-class RouteTableToVpnGateway(CartographyRelSchema):
-    target_node_label: str = 'AWSVpnGateway'
+class RouteTableToVpnGatewayRel(CartographyRelSchema):
+    target_node_label: str = "AWSVpnGateway"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('VpnGatewayIds', one_to_many=True)},
+        {"id": PropertyRef("VpnGatewayIds", one_to_many=True)},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "CONNECTED_TO"
-    properties: RouteTableToVpnGatewayRelProperties = RouteTableToVpnGatewayRelProperties()
+    properties: RouteTableToVpnGatewayRelRelProperties = (
+        RouteTableToVpnGatewayRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class RouteTableSchema(CartographyNodeSchema):
-    label: str = 'EC2RouteTable'
+    label: str = "EC2RouteTable"
     properties: RouteTableNodeProperties = RouteTableNodeProperties()
-    sub_resource_relationship: RouteTableToAWSAccount = RouteTableToAWSAccount()
+    sub_resource_relationship: RouteTableToAWSAccountRel = RouteTableToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            RouteTableToVpc(),
-            RouteTableToRoute(),
-            RouteTableToAssociation(),
-            RouteTableToVpnGateway(),
+            RouteTableToVpcRel(),
+            RouteTableToRouteRel(),
+            RouteTableToAssociationRel(),
+            RouteTableToVpnGatewayRel(),
         ],
     )