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

cartography/models/aws/dynamodb/gsi.py

@@ -13,56 +13,64 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class DynamoDBGSINodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('Arn')
-    arn: PropertyRef = PropertyRef('Arn')
-    name: PropertyRef = PropertyRef('GSIName')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    provisioned_throughput_read_capacity_units: PropertyRef = PropertyRef('ProvisionedThroughputReadCapacityUnits')
-    provisioned_throughput_write_capacity_units: PropertyRef = PropertyRef('ProvisionedThroughputWriteCapacityUnits')
+    id: PropertyRef = PropertyRef("Arn")
+    arn: PropertyRef = PropertyRef("Arn")
+    name: PropertyRef = PropertyRef("GSIName")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    provisioned_throughput_read_capacity_units: PropertyRef = PropertyRef(
+        "ProvisionedThroughputReadCapacityUnits",
+    )
+    provisioned_throughput_write_capacity_units: PropertyRef = PropertyRef(
+        "ProvisionedThroughputWriteCapacityUnits",
+    )
 
 
 @dataclass(frozen=True)
-class DynamoDBGSIToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class DynamoDBGSIToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:DynamoDBGlobalSecondaryIndex)<-[:RESOURCE]-(:AWSAccount)
-class DynamoDBGSIToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class DynamoDBGSIToAWSAccountRel(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: DynamoDBGSIToAwsAccountRelProperties = DynamoDBGSIToAwsAccountRelProperties()
+    properties: DynamoDBGSIToAWSAccountRelRelProperties = (
+        DynamoDBGSIToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class DynamoDBGSIToDynamoDBTableRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class DynamoDBGSIToDynamoDBTableRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:DynamoDBGlobalSecondaryIndex)<-[:GLOBAL_SECONDARY_INDEX]-(:DynamoDBTable)
-class DynamoDBGSIToDynamoDBTable(CartographyRelSchema):
-    target_node_label: str = 'DynamoDBTable'
+class DynamoDBGSIToDynamoDBTableRel(CartographyRelSchema):
+    target_node_label: str = "DynamoDBTable"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'arn': PropertyRef('TableArn')},
+        {"arn": PropertyRef("TableArn")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "GLOBAL_SECONDARY_INDEX"
-    properties: DynamoDBGSIToDynamoDBTableRelProperties = DynamoDBGSIToDynamoDBTableRelProperties()
+    properties: DynamoDBGSIToDynamoDBTableRelRelProperties = (
+        DynamoDBGSIToDynamoDBTableRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class DynamoDBGSISchema(CartographyNodeSchema):
-    label: str = 'DynamoDBGlobalSecondaryIndex'
+    label: str = "DynamoDBGlobalSecondaryIndex"
     properties: DynamoDBGSINodeProperties = DynamoDBGSINodeProperties()
-    sub_resource_relationship: DynamoDBGSIToAWSAccount = DynamoDBGSIToAWSAccount()
+    sub_resource_relationship: DynamoDBGSIToAWSAccountRel = DynamoDBGSIToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            DynamoDBGSIToDynamoDBTable(),
+            DynamoDBGSIToDynamoDBTableRel(),
         ],
     )

cartography/models/aws/dynamodb/tables.py

@@ -12,36 +12,44 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class DynamoDBTableNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('Arn')
-    arn: PropertyRef = PropertyRef('Arn')
-    name: PropertyRef = PropertyRef('TableName')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    rows: PropertyRef = PropertyRef('Rows')
-    size: PropertyRef = PropertyRef('Size')
-    provisioned_throughput_read_capacity_units: PropertyRef = PropertyRef('ProvisionedThroughputReadCapacityUnits')
-    provisioned_throughput_write_capacity_units: PropertyRef = PropertyRef('ProvisionedThroughputWriteCapacityUnits')
+    id: PropertyRef = PropertyRef("Arn")
+    arn: PropertyRef = PropertyRef("Arn")
+    name: PropertyRef = PropertyRef("TableName")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    rows: PropertyRef = PropertyRef("Rows")
+    size: PropertyRef = PropertyRef("Size")
+    provisioned_throughput_read_capacity_units: PropertyRef = PropertyRef(
+        "ProvisionedThroughputReadCapacityUnits",
+    )
+    provisioned_throughput_write_capacity_units: PropertyRef = PropertyRef(
+        "ProvisionedThroughputWriteCapacityUnits",
+    )
 
 
 @dataclass(frozen=True)
-class DynamoDBTableToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class DynamoDBTableToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:DynamoDBTable)<-[:RESOURCE]-(:AWSAccount)
-class DynamoDBTableToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class DynamoDBTableToAWSAccountRel(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: DynamoDBTableToAwsAccountRelProperties = DynamoDBTableToAwsAccountRelProperties()
+    properties: DynamoDBTableToAWSAccountRelRelProperties = (
+        DynamoDBTableToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class DynamoDBTableSchema(CartographyNodeSchema):
-    label: str = 'DynamoDBTable'
+    label: str = "DynamoDBTable"
     properties: DynamoDBTableNodeProperties = DynamoDBTableNodeProperties()
-    sub_resource_relationship: DynamoDBTableToAWSAccount = DynamoDBTableToAWSAccount()
+    sub_resource_relationship: DynamoDBTableToAWSAccountRel = (
+        DynamoDBTableToAWSAccountRel()
+    )

cartography/models/aws/ec2/auto_scaling_groups.py

@@ -13,192 +13,212 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class AutoScalingGroupNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('AutoScalingGroupARN')
-    arn: PropertyRef = PropertyRef('AutoScalingGroupARN')
-    capacityrebalance: PropertyRef = PropertyRef('CapacityRebalance')
-    createdtime: PropertyRef = PropertyRef('CreatedTime')
-    defaultcooldown: PropertyRef = PropertyRef('DefaultCooldown')
-    desiredcapacity: PropertyRef = PropertyRef('DesiredCapacity')
-    healthcheckgraceperiod: PropertyRef = PropertyRef('HealthCheckGracePeriod')
-    healthchecktype: PropertyRef = PropertyRef('HealthCheckType')
-    launchconfigurationname: PropertyRef = PropertyRef('LaunchConfigurationName')
-    launchtemplatename: PropertyRef = PropertyRef('LaunchTemplateName')
-    launchtemplateid: PropertyRef = PropertyRef('LaunchTemplateId')
-    launchtemplateversion: PropertyRef = PropertyRef('LaunchTemplateVersion')
-    maxinstancelifetime: PropertyRef = PropertyRef('MaxInstanceLifetime')
-    maxsize: PropertyRef = PropertyRef('MaxSize')
-    minsize: PropertyRef = PropertyRef('MinSize')
-    name: PropertyRef = PropertyRef('AutoScalingGroupName')
-    newinstancesprotectedfromscalein: PropertyRef = PropertyRef('NewInstancesProtectedFromScaleIn')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    status: PropertyRef = PropertyRef('Status')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("AutoScalingGroupARN")
+    arn: PropertyRef = PropertyRef("AutoScalingGroupARN")
+    capacityrebalance: PropertyRef = PropertyRef("CapacityRebalance")
+    createdtime: PropertyRef = PropertyRef("CreatedTime")
+    defaultcooldown: PropertyRef = PropertyRef("DefaultCooldown")
+    desiredcapacity: PropertyRef = PropertyRef("DesiredCapacity")
+    healthcheckgraceperiod: PropertyRef = PropertyRef("HealthCheckGracePeriod")
+    healthchecktype: PropertyRef = PropertyRef("HealthCheckType")
+    launchconfigurationname: PropertyRef = PropertyRef("LaunchConfigurationName")
+    launchtemplatename: PropertyRef = PropertyRef("LaunchTemplateName")
+    launchtemplateid: PropertyRef = PropertyRef("LaunchTemplateId")
+    launchtemplateversion: PropertyRef = PropertyRef("LaunchTemplateVersion")
+    maxinstancelifetime: PropertyRef = PropertyRef("MaxInstanceLifetime")
+    maxsize: PropertyRef = PropertyRef("MaxSize")
+    minsize: PropertyRef = PropertyRef("MinSize")
+    name: PropertyRef = PropertyRef("AutoScalingGroupName")
+    newinstancesprotectedfromscalein: PropertyRef = PropertyRef(
+        "NewInstancesProtectedFromScaleIn",
+    )
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    status: PropertyRef = PropertyRef("Status")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 # EC2 to AutoScalingGroup
 @dataclass(frozen=True)
-class EC2InstanceToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2InstanceToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2InstanceToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2InstanceToAWSAccountRel(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: EC2InstanceToAwsAccountRelProperties = EC2InstanceToAwsAccountRelProperties()
+    properties: EC2InstanceToAWSAccountRelRelProperties = (
+        EC2InstanceToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class EC2InstanceToAutoScalingGroupRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2InstanceToAutoScalingGroupRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2InstanceToAutoScalingGroup(CartographyRelSchema):
-    target_node_label: str = 'AutoScalingGroup'
+class EC2InstanceToAutoScalingGroupRel(CartographyRelSchema):
+    target_node_label: str = "AutoScalingGroup"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('AutoScalingGroupARN')},
+        {"id": PropertyRef("AutoScalingGroupARN")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "MEMBER_AUTO_SCALE_GROUP"
-    properties: EC2InstanceToAutoScalingGroupRelProperties = EC2InstanceToAutoScalingGroupRelProperties()
+    properties: EC2InstanceToAutoScalingGroupRelRelProperties = (
+        EC2InstanceToAutoScalingGroupRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class EC2InstanceAutoScalingGroupProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('InstanceId')
-    instanceid: PropertyRef = PropertyRef('InstanceId', extra_index=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("InstanceId")
+    instanceid: PropertyRef = PropertyRef("InstanceId", extra_index=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class EC2InstanceAutoScalingGroupSchema(CartographyNodeSchema):
-    label: str = 'EC2Instance'
-    properties: EC2InstanceAutoScalingGroupProperties = EC2InstanceAutoScalingGroupProperties()
-    sub_resource_relationship: EC2InstanceToAWSAccount = EC2InstanceToAWSAccount()
+    label: str = "EC2Instance"
+    properties: EC2InstanceAutoScalingGroupProperties = (
+        EC2InstanceAutoScalingGroupProperties()
+    )
+    sub_resource_relationship: EC2InstanceToAWSAccountRel = EC2InstanceToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2InstanceToAutoScalingGroup(),
+            EC2InstanceToAutoScalingGroupRel(),
         ],
     )
 
 
 # EC2Subnet to AutoScalingGroup
 @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 EC2SubnetToAutoScalingGroupRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2SubnetToAutoScalingGroupRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2SubnetToAutoScalingGroup(CartographyRelSchema):
-    target_node_label: str = 'AutoScalingGroup'
+class EC2SubnetToAutoScalingGroupRel(CartographyRelSchema):
+    target_node_label: str = "AutoScalingGroup"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('AutoScalingGroupARN')},
+        {"id": PropertyRef("AutoScalingGroupARN")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "VPC_IDENTIFIER"
-    properties: EC2SubnetToAutoScalingGroupRelProperties = EC2SubnetToAutoScalingGroupRelProperties()
+    properties: EC2SubnetToAutoScalingGroupRelRelProperties = (
+        EC2SubnetToAutoScalingGroupRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class EC2SubnetAutoScalingGroupNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('VPCZoneIdentifier')
-    subnetid: PropertyRef = PropertyRef('VPCZoneIdentifier', extra_index=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("VPCZoneIdentifier")
+    subnetid: PropertyRef = PropertyRef("VPCZoneIdentifier", extra_index=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class EC2SubnetAutoScalingGroupSchema(CartographyNodeSchema):
-    label: str = 'EC2Subnet'
-    properties: EC2SubnetAutoScalingGroupNodeProperties = EC2SubnetAutoScalingGroupNodeProperties()
-    sub_resource_relationship: EC2SubnetToAWSAccount = EC2SubnetToAWSAccount()
+    label: str = "EC2Subnet"
+    properties: EC2SubnetAutoScalingGroupNodeProperties = (
+        EC2SubnetAutoScalingGroupNodeProperties()
+    )
+    sub_resource_relationship: EC2SubnetToAWSAccountRel = EC2SubnetToAWSAccountRel()
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            EC2SubnetToAutoScalingGroup(),
+            EC2SubnetToAutoScalingGroupRel(),
         ],
     )
 
 
 # AutoScalingGroup
 @dataclass(frozen=True)
-class AutoScalingGroupToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class AutoScalingGroupToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class AutoScalingGroupToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class AutoScalingGroupToAWSAccountRel(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: AutoScalingGroupToAwsAccountRelProperties = AutoScalingGroupToAwsAccountRelProperties()
+    properties: AutoScalingGroupToAWSAccountRelRelProperties = (
+        AutoScalingGroupToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class AutoScalingGroupToLaunchTemplateRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class AutoScalingGroupToLaunchTemplateRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class AutoScalingGroupToLaunchTemplate(CartographyRelSchema):
-    target_node_label: str = 'LaunchTemplate'
+class AutoScalingGroupToLaunchTemplateRel(CartographyRelSchema):
+    target_node_label: str = "LaunchTemplate"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('LaunchTemplateId')},
+        {"id": PropertyRef("LaunchTemplateId")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "HAS_LAUNCH_TEMPLATE"
-    properties: AutoScalingGroupToLaunchTemplateRelProperties = AutoScalingGroupToLaunchTemplateRelProperties()
+    properties: AutoScalingGroupToLaunchTemplateRelRelProperties = (
+        AutoScalingGroupToLaunchTemplateRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class AutoScalingGroupToLaunchConfigurationRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class AutoScalingGroupToLaunchConfigurationRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class AutoScalingGroupToLaunchConfiguration(CartographyRelSchema):
-    target_node_label: str = 'LaunchConfiguration'
+class AutoScalingGroupToLaunchConfigurationRel(CartographyRelSchema):
+    target_node_label: str = "LaunchConfiguration"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'name': PropertyRef('LaunchConfigurationName')},
+        {"name": PropertyRef("LaunchConfigurationName")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "HAS_LAUNCH_CONFIG"
-    properties: AutoScalingGroupToLaunchConfigurationRelProperties = (
-        AutoScalingGroupToLaunchConfigurationRelProperties()
+    properties: AutoScalingGroupToLaunchConfigurationRelRelProperties = (
+        AutoScalingGroupToLaunchConfigurationRelRelProperties()
     )
 
 
 @dataclass(frozen=True)
 class AutoScalingGroupSchema(CartographyNodeSchema):
-    label: str = 'AutoScalingGroup'
+    label: str = "AutoScalingGroup"
     properties: AutoScalingGroupNodeProperties = AutoScalingGroupNodeProperties()
-    sub_resource_relationship: AutoScalingGroupToAWSAccount = AutoScalingGroupToAWSAccount()
+    sub_resource_relationship: AutoScalingGroupToAWSAccountRel = (
+        AutoScalingGroupToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            AutoScalingGroupToLaunchTemplate(),
-            AutoScalingGroupToLaunchConfiguration(),
+            AutoScalingGroupToLaunchTemplateRel(),
+            AutoScalingGroupToLaunchConfigurationRel(),
         ],
     )

cartography/models/aws/ec2/images.py

@@ -12,52 +12,54 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class EC2ImageNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('ID')
-    imageid: PropertyRef = PropertyRef('ImageId', extra_index=True)
-    name: PropertyRef = PropertyRef('Name', extra_index=True)
-    creationdate: PropertyRef = PropertyRef('CreationDate')
-    architecture: PropertyRef = PropertyRef('Architecture')
-    location: PropertyRef = PropertyRef('ImageLocation')
-    type: PropertyRef = PropertyRef('ImageType')
-    ispublic: PropertyRef = PropertyRef('Public')
-    platform: PropertyRef = PropertyRef('Platform')
-    platform_details: PropertyRef = PropertyRef('PlatformDetails')
-    usageoperation: PropertyRef = PropertyRef('UsageOperation')
-    state: PropertyRef = PropertyRef('State')
-    description: PropertyRef = PropertyRef('Description')
-    enasupport: PropertyRef = PropertyRef('EnaSupport')
-    hypervisor: PropertyRef = PropertyRef('Hypervisor')
-    rootdevicename: PropertyRef = PropertyRef('RootDeviceName')
-    rootdevicetype: PropertyRef = PropertyRef('RootDeviceType')
-    virtualizationtype: PropertyRef = PropertyRef('VirtualizationType')
-    sriov_net_support: PropertyRef = PropertyRef('SriovNetSupport')
-    bootmode: PropertyRef = PropertyRef('BootMode')
-    owner: PropertyRef = PropertyRef('OwnerId')
-    image_owner_alias: PropertyRef = PropertyRef('ImageOwnerAlias')
-    kernel_id: PropertyRef = PropertyRef('KernelId')
-    ramdisk_id: PropertyRef = PropertyRef('RamdiskId')
-    region: PropertyRef = PropertyRef('Region')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("ID")
+    imageid: PropertyRef = PropertyRef("ImageId", extra_index=True)
+    name: PropertyRef = PropertyRef("Name", extra_index=True)
+    creationdate: PropertyRef = PropertyRef("CreationDate")
+    architecture: PropertyRef = PropertyRef("Architecture")
+    location: PropertyRef = PropertyRef("ImageLocation")
+    type: PropertyRef = PropertyRef("ImageType")
+    ispublic: PropertyRef = PropertyRef("Public")
+    platform: PropertyRef = PropertyRef("Platform")
+    platform_details: PropertyRef = PropertyRef("PlatformDetails")
+    usageoperation: PropertyRef = PropertyRef("UsageOperation")
+    state: PropertyRef = PropertyRef("State")
+    description: PropertyRef = PropertyRef("Description")
+    enasupport: PropertyRef = PropertyRef("EnaSupport")
+    hypervisor: PropertyRef = PropertyRef("Hypervisor")
+    rootdevicename: PropertyRef = PropertyRef("RootDeviceName")
+    rootdevicetype: PropertyRef = PropertyRef("RootDeviceType")
+    virtualizationtype: PropertyRef = PropertyRef("VirtualizationType")
+    sriov_net_support: PropertyRef = PropertyRef("SriovNetSupport")
+    bootmode: PropertyRef = PropertyRef("BootMode")
+    owner: PropertyRef = PropertyRef("OwnerId")
+    image_owner_alias: PropertyRef = PropertyRef("ImageOwnerAlias")
+    kernel_id: PropertyRef = PropertyRef("KernelId")
+    ramdisk_id: PropertyRef = PropertyRef("RamdiskId")
+    region: PropertyRef = PropertyRef("Region")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2ImageToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class EC2ImageToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class EC2ImageToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class EC2ImageToAWSAccountRel(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: EC2ImageToAwsAccountRelProperties = EC2ImageToAwsAccountRelProperties()
+    properties: EC2ImageToAWSAccountRelRelProperties = (
+        EC2ImageToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class EC2ImageSchema(CartographyNodeSchema):
-    label: str = 'EC2Image'
+    label: str = "EC2Image"
     properties: EC2ImageNodeProperties = EC2ImageNodeProperties()
-    sub_resource_relationship: EC2ImageToAWSAccount = EC2ImageToAWSAccount()
+    sub_resource_relationship: EC2ImageToAWSAccountRel = EC2ImageToAWSAccountRel()