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

cartography/models/aws/ec2/load_balancers.py

@@ -13,90 +13,100 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class LoadBalancerNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    name: PropertyRef = PropertyRef('name')
-    dnsname: PropertyRef = PropertyRef('dnsname', extra_index=True)
-    canonicalhostedzonename: PropertyRef = PropertyRef('canonicalhostedzonename')
-    canonicalhostedzonenameid: PropertyRef = PropertyRef('canonicalhostedzonenameid')
-    scheme: PropertyRef = PropertyRef('scheme')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    createdtime: PropertyRef = PropertyRef('createdtime')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    name: PropertyRef = PropertyRef("name")
+    dnsname: PropertyRef = PropertyRef("dnsname", extra_index=True)
+    canonicalhostedzonename: PropertyRef = PropertyRef("canonicalhostedzonename")
+    canonicalhostedzonenameid: PropertyRef = PropertyRef("canonicalhostedzonenameid")
+    scheme: PropertyRef = PropertyRef("scheme")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    createdtime: PropertyRef = PropertyRef("createdtime")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class LoadBalancerToAWSAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class LoadBalancerToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class LoadBalancerToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class LoadBalancerToAWSAccountRel(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: LoadBalancerToAWSAccountRelProperties = LoadBalancerToAWSAccountRelProperties()
+    properties: LoadBalancerToAWSAccountRelRelProperties = (
+        LoadBalancerToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class LoadBalancerToSecurityGroupRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class LoadBalancerToSourceSecurityGroup(CartographyRelSchema):
-    target_node_label: str = 'EC2SecurityGroup'
+class LoadBalancerToSourceSecurityGroupRel(CartographyRelSchema):
+    target_node_label: str = "EC2SecurityGroup"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'name': PropertyRef('GROUP_NAME')},
+        {"name": PropertyRef("GROUP_NAME")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "SOURCE_SECURITY_GROUP"
-    properties: LoadBalancerToSecurityGroupRelProperties = LoadBalancerToSecurityGroupRelProperties()
+    properties: LoadBalancerToSecurityGroupRelProperties = (
+        LoadBalancerToSecurityGroupRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class LoadBalancerToEC2SecurityGroupRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class LoadBalancerToEC2SecurityGroupRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class LoadBalancerToEC2SecurityGroup(CartographyRelSchema):
-    target_node_label: str = 'EC2SecurityGroup'
+class LoadBalancerToEC2SecurityGroupRel(CartographyRelSchema):
+    target_node_label: str = "EC2SecurityGroup"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'groupid': PropertyRef('GROUP_IDS', one_to_many=True)},
+        {"groupid": PropertyRef("GROUP_IDS", one_to_many=True)},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "MEMBER_OF_EC2_SECURITY_GROUP"
-    properties: LoadBalancerToEC2SecurityGroupRelProperties = LoadBalancerToEC2SecurityGroupRelProperties()
+    properties: LoadBalancerToEC2SecurityGroupRelRelProperties = (
+        LoadBalancerToEC2SecurityGroupRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class LoadBalancerToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class LoadBalancerToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class LoadBalancerToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class LoadBalancerToEC2InstanceRel(CartographyRelSchema):
+    target_node_label: str = "EC2Instance"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'instanceid': PropertyRef('INSTANCE_IDS', one_to_many=True)},
+        {"instanceid": PropertyRef("INSTANCE_IDS", one_to_many=True)},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "EXPOSE"
-    properties: LoadBalancerToEC2InstanceRelProperties = LoadBalancerToEC2InstanceRelProperties()
+    properties: LoadBalancerToEC2InstanceRelRelProperties = (
+        LoadBalancerToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class LoadBalancerSchema(CartographyNodeSchema):
-    label: str = 'LoadBalancer'
+    label: str = "LoadBalancer"
     properties: LoadBalancerNodeProperties = LoadBalancerNodeProperties()
-    sub_resource_relationship: LoadBalancerToAWSAccount = LoadBalancerToAWSAccount()
+    sub_resource_relationship: LoadBalancerToAWSAccountRel = (
+        LoadBalancerToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            LoadBalancerToSourceSecurityGroup(),
-            LoadBalancerToEC2SecurityGroup(),
-            LoadBalancerToEC2Instance(),
+            LoadBalancerToSourceSecurityGroupRel(),
+            LoadBalancerToEC2SecurityGroupRel(),
+            LoadBalancerToEC2InstanceRel(),
         ],
     )

cartography/models/aws/ec2/network_acl_rules.py

@@ -14,30 +14,30 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class EC2NetworkAclRuleNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('Id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    network_acl_id: PropertyRef = PropertyRef('NetworkAclId')
-    protocol: PropertyRef = PropertyRef('Protocol')
-    fromport: PropertyRef = PropertyRef('FromPort')
-    toport: PropertyRef = PropertyRef('ToPort')
-    cidrblock: PropertyRef = PropertyRef('CidrBlock')
-    ipv6cidrblock: PropertyRef = PropertyRef('Ipv6CidrBlock')
-    egress: PropertyRef = PropertyRef('Egress')
-    rulenumber: PropertyRef = PropertyRef('RuleNumber')
-    ruleaction: PropertyRef = PropertyRef('RuleAction')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("Id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    network_acl_id: PropertyRef = PropertyRef("NetworkAclId")
+    protocol: PropertyRef = PropertyRef("Protocol")
+    fromport: PropertyRef = PropertyRef("FromPort")
+    toport: PropertyRef = PropertyRef("ToPort")
+    cidrblock: PropertyRef = PropertyRef("CidrBlock")
+    ipv6cidrblock: PropertyRef = PropertyRef("Ipv6CidrBlock")
+    egress: PropertyRef = PropertyRef("Egress")
+    rulenumber: PropertyRef = PropertyRef("RuleNumber")
+    ruleaction: PropertyRef = PropertyRef("RuleAction")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class EC2NetworkAclRuleAclRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclRuleToAcl(CartographyRelSchema):
-    target_node_label: str = 'EC2NetworkAcl'
+class EC2NetworkAclRuleToAclRel(CartographyRelSchema):
+    target_node_label: str = "EC2NetworkAcl"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'network_acl_id': PropertyRef('NetworkAclId')},
+        {"network_acl_id": PropertyRef("NetworkAclId")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "MEMBER_OF_NACL"
@@ -45,19 +45,21 @@ class EC2NetworkAclRuleToAcl(CartographyRelSchema):
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclRuleToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkAclRuleToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclRuleToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2NetworkAclRuleToAWSAccountRel(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: EC2NetworkAclRuleToAwsAccountRelProperties = EC2NetworkAclRuleToAwsAccountRelProperties()
+    properties: EC2NetworkAclRuleToAWSAccountRelRelProperties = (
+        EC2NetworkAclRuleToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -65,15 +67,18 @@ class EC2NetworkAclInboundRuleSchema(CartographyNodeSchema):
     """
     Network interface as known by describe-network-interfaces.
     """
-    label: str = 'EC2NetworkAclRule'
+
+    label: str = "EC2NetworkAclRule"
     extra_node_labels: ExtraNodeLabels = ExtraNodeLabels(
-        ['IpPermissionInbound'],
+        ["IpPermissionInbound"],
     )
     properties: EC2NetworkAclRuleNodeProperties = EC2NetworkAclRuleNodeProperties()
-    sub_resource_relationship: EC2NetworkAclRuleToAWSAccount = EC2NetworkAclRuleToAWSAccount()
+    sub_resource_relationship: EC2NetworkAclRuleToAWSAccountRel = (
+        EC2NetworkAclRuleToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2NetworkAclRuleToAcl(),
+            EC2NetworkAclRuleToAclRel(),
         ],
     )
 
@@ -83,16 +88,19 @@ class EC2NetworkAclEgressRuleSchema(CartographyNodeSchema):
     """
     Network interface as known by describe-network-interfaces.
     """
-    label: str = 'EC2NetworkAclRule'
+
+    label: str = "EC2NetworkAclRule"
     extra_node_labels: ExtraNodeLabels = ExtraNodeLabels(
         [
-            'IpPermissionEgress',
+            "IpPermissionEgress",
         ],
     )
     properties: EC2NetworkAclRuleNodeProperties = EC2NetworkAclRuleNodeProperties()
-    sub_resource_relationship: EC2NetworkAclRuleToAWSAccount = EC2NetworkAclRuleToAWSAccount()
+    sub_resource_relationship: EC2NetworkAclRuleToAWSAccountRel = (
+        EC2NetworkAclRuleToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2NetworkAclRuleToAcl(),
+            EC2NetworkAclRuleToAclRel(),
         ],
     )

cartography/models/aws/ec2/network_acls.py

@@ -13,61 +13,67 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class EC2NetworkAclNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('Arn')
-    arn: PropertyRef = PropertyRef('Arn')
-    network_acl_id: PropertyRef = PropertyRef('Id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    is_default: PropertyRef = PropertyRef('IsDefault')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    vpc_id: PropertyRef = PropertyRef('VpcId')
+    id: PropertyRef = PropertyRef("Arn")
+    arn: PropertyRef = PropertyRef("Arn")
+    network_acl_id: PropertyRef = PropertyRef("Id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    is_default: PropertyRef = PropertyRef("IsDefault")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    vpc_id: PropertyRef = PropertyRef("VpcId")
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclToVpcRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkAclToVpcRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclToVpc(CartographyRelSchema):
-    target_node_label: str = 'AWSVpc'
+class EC2NetworkAclToVpcRel(CartographyRelSchema):
+    target_node_label: str = "AWSVpc"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'vpcid': PropertyRef('VpcId')},
+        {"vpcid": PropertyRef("VpcId")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "MEMBER_OF_AWS_VPC"
-    properties: EC2NetworkAclToVpcRelProperties = EC2NetworkAclToVpcRelProperties()
+    properties: EC2NetworkAclToVpcRelRelProperties = (
+        EC2NetworkAclToVpcRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclToSubnetRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkAclToSubnetRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclToSubnet(CartographyRelSchema):
-    target_node_label: str = 'EC2Subnet'
+class EC2NetworkAclToSubnetRel(CartographyRelSchema):
+    target_node_label: str = "EC2Subnet"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'subnetid': PropertyRef('SubnetId')},
+        {"subnetid": PropertyRef("SubnetId")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "PART_OF_SUBNET"
-    properties: EC2NetworkAclToSubnetRelProperties = EC2NetworkAclToSubnetRelProperties()
+    properties: EC2NetworkAclToSubnetRelRelProperties = (
+        EC2NetworkAclToSubnetRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkAclToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkAclToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2NetworkAclToAWSAccountRel(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: EC2NetworkAclToAwsAccountRelProperties = EC2NetworkAclToAwsAccountRelProperties()
+    properties: EC2NetworkAclToAWSAccountRelRelProperties = (
+        EC2NetworkAclToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -75,12 +81,15 @@ class EC2NetworkAclSchema(CartographyNodeSchema):
     """
     Network interface as known by describe-network-interfaces.
     """
-    label: str = 'EC2NetworkAcl'
+
+    label: str = "EC2NetworkAcl"
     properties: EC2NetworkAclNodeProperties = EC2NetworkAclNodeProperties()
-    sub_resource_relationship: EC2NetworkAclToAWSAccount = EC2NetworkAclToAWSAccount()
+    sub_resource_relationship: EC2NetworkAclToAWSAccountRel = (
+        EC2NetworkAclToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2NetworkAclToVpc(),
-            EC2NetworkAclToSubnet(),
+            EC2NetworkAclToVpcRel(),
+            EC2NetworkAclToSubnetRel(),
         ],
     )

cartography/models/aws/ec2/networkinterface_instance.py

@@ -16,80 +16,88 @@ class EC2NetworkInterfaceInstanceNodeProperties(CartographyNodeProperties):
     """
     Selection of properties of a network interface as known by an EC2 instance
     """
+
     # arn: PropertyRef = PropertyRef('Arn', extra_index=True) TODO use arn; issue #1024
-    id: PropertyRef = PropertyRef('NetworkInterfaceId')
-    status: PropertyRef = PropertyRef('Status')
-    mac_address: PropertyRef = PropertyRef('MacAddress', extra_index=True)
-    description: PropertyRef = PropertyRef('Description')
-    private_dns_name: PropertyRef = PropertyRef('PrivateDnsName', extra_index=True)
-    private_ip_address: PropertyRef = PropertyRef('PrivateIpAddress', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("NetworkInterfaceId")
+    status: PropertyRef = PropertyRef("Status")
+    mac_address: PropertyRef = PropertyRef("MacAddress", extra_index=True)
+    description: PropertyRef = PropertyRef("Description")
+    private_dns_name: PropertyRef = PropertyRef("PrivateDnsName", extra_index=True)
+    private_ip_address: PropertyRef = PropertyRef("PrivateIpAddress", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkInterfaceToAWSAccountRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2NetworkInterfaceToAWSAccountRel(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: EC2NetworkInterfaceToAwsAccountRelProperties = EC2NetworkInterfaceToAwsAccountRelProperties()
+    properties: EC2NetworkInterfaceToAWSAccountRelProperties = (
+        EC2NetworkInterfaceToAWSAccountRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkInterfaceToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class EC2NetworkInterfaceToEC2InstanceRel(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 = "NETWORK_INTERFACE"
-    properties: EC2NetworkInterfaceToEC2InstanceRelProperties = EC2NetworkInterfaceToEC2InstanceRelProperties()
+    properties: EC2NetworkInterfaceToEC2InstanceRelRelProperties = (
+        EC2NetworkInterfaceToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToEC2SubnetRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkInterfaceToEC2SubnetRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToEC2Subnet(CartographyRelSchema):
-    target_node_label: str = 'EC2Subnet'
+class EC2NetworkInterfaceToEC2SubnetRel(CartographyRelSchema):
+    target_node_label: str = "EC2Subnet"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('SubnetId')},
+        {"id": PropertyRef("SubnetId")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "PART_OF_SUBNET"
-    properties: EC2NetworkInterfaceToEC2SubnetRelProperties = EC2NetworkInterfaceToEC2SubnetRelProperties()
+    properties: EC2NetworkInterfaceToEC2SubnetRelRelProperties = (
+        EC2NetworkInterfaceToEC2SubnetRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToEC2SecurityGroupRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2NetworkInterfaceToEC2SecurityGroupRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2NetworkInterfaceToEC2SecurityGroup(CartographyRelSchema):
-    target_node_label: str = 'EC2SecurityGroup'
+class EC2NetworkInterfaceToEC2SecurityGroupRel(CartographyRelSchema):
+    target_node_label: str = "EC2SecurityGroup"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('GroupId')},
+        {"id": PropertyRef("GroupId")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "MEMBER_OF_EC2_SECURITY_GROUP"
-    properties: EC2NetworkInterfaceToEC2SecurityGroupRelProperties = \
-        EC2NetworkInterfaceToEC2SecurityGroupRelProperties()
+    properties: EC2NetworkInterfaceToEC2SecurityGroupRelRelProperties = (
+        EC2NetworkInterfaceToEC2SecurityGroupRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
@@ -97,13 +105,18 @@ class EC2NetworkInterfaceInstanceSchema(CartographyNodeSchema):
     """
     Network interface as known by an EC2 instance
     """
-    label: str = 'NetworkInterface'
-    properties: EC2NetworkInterfaceInstanceNodeProperties = EC2NetworkInterfaceInstanceNodeProperties()
-    sub_resource_relationship: EC2NetworkInterfaceToAWSAccount = EC2NetworkInterfaceToAWSAccount()
+
+    label: str = "NetworkInterface"
+    properties: EC2NetworkInterfaceInstanceNodeProperties = (
+        EC2NetworkInterfaceInstanceNodeProperties()
+    )
+    sub_resource_relationship: EC2NetworkInterfaceToAWSAccountRel = (
+        EC2NetworkInterfaceToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2NetworkInterfaceToEC2Instance(),
-            EC2NetworkInterfaceToEC2Subnet(),
-            EC2NetworkInterfaceToEC2SecurityGroup(),
+            EC2NetworkInterfaceToEC2InstanceRel(),
+            EC2NetworkInterfaceToEC2SubnetRel(),
+            EC2NetworkInterfaceToEC2SecurityGroupRel(),
         ],
     )