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

cartography/models/aws/inspector/findings.py

@@ -14,128 +14,140 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class AWSInspectorNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    arn: PropertyRef = PropertyRef('arn', extra_index=True)
-    awsaccount: PropertyRef = PropertyRef('awsaccount')
-    name: PropertyRef = PropertyRef('title')
-    instanceid: PropertyRef = PropertyRef('instanceid')
-    ecrimageid: PropertyRef = PropertyRef('ecrimageid')
-    ecrrepositoryid: PropertyRef = PropertyRef('ecrrepositoryid')
-    severity: PropertyRef = PropertyRef('severity')
-    firstobservedat: PropertyRef = PropertyRef('firstobservedat')
-    updatedat: PropertyRef = PropertyRef('updatedat')
-    description: PropertyRef = PropertyRef('description')
-    type: PropertyRef = PropertyRef('type')
-    cvssscore: PropertyRef = PropertyRef('cvssscore', extra_index=True)
-    protocol: PropertyRef = PropertyRef('protocol')
-    portrange: PropertyRef = PropertyRef('portrange')
-    portrangebegin: PropertyRef = PropertyRef('portrangebegin')
-    portrangeend: PropertyRef = PropertyRef('portrangeend')
-    vulnerabilityid: PropertyRef = PropertyRef('vulnerabilityid')
-    referenceurls: PropertyRef = PropertyRef('referenceurls')
-    relatedvulnerabilities: PropertyRef = PropertyRef('relatedvulnerabilities')
-    source: PropertyRef = PropertyRef('source')
-    sourceurl: PropertyRef = PropertyRef('sourceurl')
-    status: PropertyRef = PropertyRef('status')
-    vendorcreatedat: PropertyRef = PropertyRef('vendorcreatedat')
-    vendorseverity: PropertyRef = PropertyRef('vendorseverity')
-    vendorupdatedat: PropertyRef = PropertyRef('vendorupdatedat')
-    vulnerablepackageids: PropertyRef = PropertyRef('vulnerablepackageids')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    arn: PropertyRef = PropertyRef("arn", extra_index=True)
+    awsaccount: PropertyRef = PropertyRef("awsaccount")
+    name: PropertyRef = PropertyRef("title")
+    instanceid: PropertyRef = PropertyRef("instanceid")
+    ecrimageid: PropertyRef = PropertyRef("ecrimageid")
+    ecrrepositoryid: PropertyRef = PropertyRef("ecrrepositoryid")
+    severity: PropertyRef = PropertyRef("severity")
+    firstobservedat: PropertyRef = PropertyRef("firstobservedat")
+    updatedat: PropertyRef = PropertyRef("updatedat")
+    description: PropertyRef = PropertyRef("description")
+    type: PropertyRef = PropertyRef("type")
+    cvssscore: PropertyRef = PropertyRef("cvssscore", extra_index=True)
+    protocol: PropertyRef = PropertyRef("protocol")
+    portrange: PropertyRef = PropertyRef("portrange")
+    portrangebegin: PropertyRef = PropertyRef("portrangebegin")
+    portrangeend: PropertyRef = PropertyRef("portrangeend")
+    vulnerabilityid: PropertyRef = PropertyRef("vulnerabilityid")
+    referenceurls: PropertyRef = PropertyRef("referenceurls")
+    relatedvulnerabilities: PropertyRef = PropertyRef("relatedvulnerabilities")
+    source: PropertyRef = PropertyRef("source")
+    sourceurl: PropertyRef = PropertyRef("sourceurl")
+    status: PropertyRef = PropertyRef("status")
+    vendorcreatedat: PropertyRef = PropertyRef("vendorcreatedat")
+    vendorseverity: PropertyRef = PropertyRef("vendorseverity")
+    vendorupdatedat: PropertyRef = PropertyRef("vendorupdatedat")
+    vulnerablepackageids: PropertyRef = PropertyRef("vulnerablepackageids")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorFindingToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class InspectorFindingToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorFindingToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class InspectorFindingToAWSAccountRel(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: InspectorFindingToAwsAccountRelProperties = InspectorFindingToAwsAccountRelProperties()
+    properties: InspectorFindingToAWSAccountRelRelProperties = (
+        InspectorFindingToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class InspectorFindingToAwsAccountDelegateRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class InspectorFindingToAWSAccountRelDelegateRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorFindingToAWSAccountDelegate(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class InspectorFindingToAWSAccountRelDelegateRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('awsaccount')},
+        {"id": PropertyRef("awsaccount")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "MEMBER"
-    properties: InspectorFindingToAwsAccountDelegateRelProperties = InspectorFindingToAwsAccountDelegateRelProperties()
+    properties: InspectorFindingToAWSAccountRelDelegateRelRelProperties = (
+        InspectorFindingToAWSAccountRelDelegateRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class InspectorFindingToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class InspectorFindingToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorFindingToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class InspectorFindingToEC2InstanceRel(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 = "AFFECTS"
-    properties: InspectorFindingToEC2InstanceRelProperties = InspectorFindingToEC2InstanceRelProperties()
+    properties: InspectorFindingToEC2InstanceRelRelProperties = (
+        InspectorFindingToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class InspectorFindingToECRRepositoryRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class InspectorFindingToECRRepositoryRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorFindingToECRRepository(CartographyRelSchema):
-    target_node_label: str = 'ECRRepository'
+class InspectorFindingToECRRepositoryRel(CartographyRelSchema):
+    target_node_label: str = "ECRRepository"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('ecrrepositoryid')},
+        {"id": PropertyRef("ecrrepositoryid")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "AFFECTS"
-    properties: InspectorFindingToECRRepositoryRelProperties = InspectorFindingToECRRepositoryRelProperties()
+    properties: InspectorFindingToECRRepositoryRelRelProperties = (
+        InspectorFindingToECRRepositoryRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class InspectorFindingToECRImageRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class InspectorFindingToECRImageRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorFindingToECRImage(CartographyRelSchema):
-    target_node_label: str = 'ECRImage'
+class InspectorFindingToECRImageRel(CartographyRelSchema):
+    target_node_label: str = "ECRImage"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('ecrimageid')},
+        {"id": PropertyRef("ecrimageid")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "AFFECTS"
-    properties: InspectorFindingToECRImageRelProperties = InspectorFindingToECRImageRelProperties()
+    properties: InspectorFindingToECRImageRelRelProperties = (
+        InspectorFindingToECRImageRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class AWSInspectorFindingSchema(CartographyNodeSchema):
-    label: str = 'AWSInspectorFinding'
+    label: str = "AWSInspectorFinding"
     properties: AWSInspectorNodeProperties = AWSInspectorNodeProperties()
     extra_node_labels: ExtraNodeLabels = ExtraNodeLabels(["Risk"])
-    sub_resource_relationship: InspectorFindingToAWSAccount = InspectorFindingToAWSAccount()
+    sub_resource_relationship: InspectorFindingToAWSAccountRel = (
+        InspectorFindingToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            InspectorFindingToEC2Instance(),
-            InspectorFindingToECRRepository(),
-            InspectorFindingToECRImage(),
-            InspectorFindingToAWSAccountDelegate(),
+            InspectorFindingToEC2InstanceRel(),
+            InspectorFindingToECRRepositoryRel(),
+            InspectorFindingToECRImageRel(),
+            InspectorFindingToAWSAccountRelDelegateRel(),
         ],
     )

cartography/models/aws/inspector/packages.py

@@ -13,61 +13,67 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class AWSInspectorPackageNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    awsaccount: PropertyRef = PropertyRef('AWS_ID', set_in_kwargs=True)
-    findingarn: PropertyRef = PropertyRef('findingarn', extra_index=True)
-    name: PropertyRef = PropertyRef('name', extra_index=True)
-    arch: PropertyRef = PropertyRef('arch')
-    version: PropertyRef = PropertyRef('version', extra_index=True)
-    release: PropertyRef = PropertyRef('release', extra_index=True)
-    epoch: PropertyRef = PropertyRef('epoch')
-    manager: PropertyRef = PropertyRef('packageManager')
-    filepath: PropertyRef = PropertyRef('filePath')
-    fixedinversion: PropertyRef = PropertyRef('fixedInVersion')
-    sourcelayerhash: PropertyRef = PropertyRef('sourceLayerHash')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    awsaccount: PropertyRef = PropertyRef("AWS_ID", set_in_kwargs=True)
+    findingarn: PropertyRef = PropertyRef("findingarn", extra_index=True)
+    name: PropertyRef = PropertyRef("name", extra_index=True)
+    arch: PropertyRef = PropertyRef("arch")
+    version: PropertyRef = PropertyRef("version", extra_index=True)
+    release: PropertyRef = PropertyRef("release", extra_index=True)
+    epoch: PropertyRef = PropertyRef("epoch")
+    manager: PropertyRef = PropertyRef("packageManager")
+    filepath: PropertyRef = PropertyRef("filePath")
+    fixedinversion: PropertyRef = PropertyRef("fixedInVersion")
+    sourcelayerhash: PropertyRef = PropertyRef("sourceLayerHash")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorPackageToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class InspectorPackageToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorPackageToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class InspectorPackageToAWSAccountRel(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: InspectorPackageToAwsAccountRelProperties = InspectorPackageToAwsAccountRelProperties()
+    properties: InspectorPackageToAWSAccountRelRelProperties = (
+        InspectorPackageToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class InspectorPackageToFindingRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class InspectorPackageToFindingRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class InspectorPackageToFinding(CartographyRelSchema):
-    target_node_label: str = 'AWSInspectorFinding'
+class InspectorPackageToFindingRel(CartographyRelSchema):
+    target_node_label: str = "AWSInspectorFinding"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('findingarn')},
+        {"id": PropertyRef("findingarn")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS"
-    properties: InspectorPackageToFindingRelProperties = InspectorPackageToFindingRelProperties()
+    properties: InspectorPackageToFindingRelRelProperties = (
+        InspectorPackageToFindingRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class AWSInspectorPackageSchema(CartographyNodeSchema):
-    label: str = 'AWSInspectorPackage'
+    label: str = "AWSInspectorPackage"
     properties: AWSInspectorPackageNodeProperties = AWSInspectorPackageNodeProperties()
-    sub_resource_relationship: InspectorPackageToAWSAccount = InspectorPackageToAWSAccount()
+    sub_resource_relationship: InspectorPackageToAWSAccountRel = (
+        InspectorPackageToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            InspectorPackageToFinding(),
+            InspectorPackageToFindingRel(),
         ],
     )

cartography/models/aws/s3/account_public_access_block.py

@@ -0,0 +1,51 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class S3AccountPublicAccessBlockNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    account_id: PropertyRef = PropertyRef("account_id")
+    region: PropertyRef = PropertyRef("region", set_in_kwargs=True)
+    block_public_acls: PropertyRef = PropertyRef("block_public_acls")
+    ignore_public_acls: PropertyRef = PropertyRef("ignore_public_acls")
+    block_public_policy: PropertyRef = PropertyRef("block_public_policy")
+    restrict_public_buckets: PropertyRef = PropertyRef("restrict_public_buckets")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class S3AccountPublicAccessBlockRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class S3AccountPublicAccessBlockToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: S3AccountPublicAccessBlockRelProperties = (
+        S3AccountPublicAccessBlockRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class S3AccountPublicAccessBlockSchema(CartographyNodeSchema):
+    label: str = "S3AccountPublicAccessBlock"
+    properties: S3AccountPublicAccessBlockNodeProperties = (
+        S3AccountPublicAccessBlockNodeProperties()
+    )
+    sub_resource_relationship: S3AccountPublicAccessBlockToAWSAccountRel = (
+        S3AccountPublicAccessBlockToAWSAccountRel()
+    )

cartography/models/aws/sns/topic.py

@@ -0,0 +1,50 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class SNSTopicNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("TopicArn")
+    arn: PropertyRef = PropertyRef("TopicArn", extra_index=True)
+    name: PropertyRef = PropertyRef("TopicName")
+    displayname: PropertyRef = PropertyRef("DisplayName")
+    owner: PropertyRef = PropertyRef("Owner")
+    subscriptionspending: PropertyRef = PropertyRef("SubscriptionsPending")
+    subscriptionsconfirmed: PropertyRef = PropertyRef("SubscriptionsConfirmed")
+    subscriptionsdeleted: PropertyRef = PropertyRef("SubscriptionsDeleted")
+    deliverypolicy: PropertyRef = PropertyRef("DeliveryPolicy")
+    effectivedeliverypolicy: PropertyRef = PropertyRef("EffectiveDeliveryPolicy")
+    kmsmasterkeyid: PropertyRef = PropertyRef("KmsMasterKeyId")
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class SNSTopicToAwsAccountRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class SNSTopicToAWSAccount(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("AWS_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: SNSTopicToAwsAccountRelProperties = SNSTopicToAwsAccountRelProperties()
+
+
+@dataclass(frozen=True)
+class SNSTopicSchema(CartographyNodeSchema):
+    label: str = "SNSTopic"
+    properties: SNSTopicNodeProperties = SNSTopicNodeProperties()
+    sub_resource_relationship: SNSTopicToAWSAccount = SNSTopicToAWSAccount()

cartography/models/aws/ssm/instance_information.py

@@ -13,70 +13,82 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class SSMInstanceInformationNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('InstanceId')
-    instance_id: PropertyRef = PropertyRef('InstanceId', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    ping_status: PropertyRef = PropertyRef('PingStatus')
-    last_ping_date_time: PropertyRef = PropertyRef('LastPingDateTime')
-    agent_version: PropertyRef = PropertyRef('AgentVersion')
-    is_latest_version: PropertyRef = PropertyRef('IsLatestVersion')
-    platform_type: PropertyRef = PropertyRef('PlatformType')
-    platform_name: PropertyRef = PropertyRef('PlatformName')
-    platform_version: PropertyRef = PropertyRef('PlatformVersion')
-    activation_id: PropertyRef = PropertyRef('ActivationId')
-    iam_role: PropertyRef = PropertyRef('IamRole')
-    registration_date: PropertyRef = PropertyRef('RegistrationDate')
-    resource_type: PropertyRef = PropertyRef('ResourceType')
-    name: PropertyRef = PropertyRef('Name')
-    ip_address: PropertyRef = PropertyRef('IPAddress')
-    computer_name: PropertyRef = PropertyRef('ComputerName')
-    association_status: PropertyRef = PropertyRef('AssociationStatus')
-    last_association_execution_date: PropertyRef = PropertyRef('LastAssociationExecutionDate')
-    last_successful_association_execution_date: PropertyRef = PropertyRef('LastSuccessfulAssociationExecutionDate')
-    source_id: PropertyRef = PropertyRef('SourceId')
-    source_type: PropertyRef = PropertyRef('SourceType')
+    id: PropertyRef = PropertyRef("InstanceId")
+    instance_id: PropertyRef = PropertyRef("InstanceId", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    ping_status: PropertyRef = PropertyRef("PingStatus")
+    last_ping_date_time: PropertyRef = PropertyRef("LastPingDateTime")
+    agent_version: PropertyRef = PropertyRef("AgentVersion")
+    is_latest_version: PropertyRef = PropertyRef("IsLatestVersion")
+    platform_type: PropertyRef = PropertyRef("PlatformType")
+    platform_name: PropertyRef = PropertyRef("PlatformName")
+    platform_version: PropertyRef = PropertyRef("PlatformVersion")
+    activation_id: PropertyRef = PropertyRef("ActivationId")
+    iam_role: PropertyRef = PropertyRef("IamRole")
+    registration_date: PropertyRef = PropertyRef("RegistrationDate")
+    resource_type: PropertyRef = PropertyRef("ResourceType")
+    name: PropertyRef = PropertyRef("Name")
+    ip_address: PropertyRef = PropertyRef("IPAddress")
+    computer_name: PropertyRef = PropertyRef("ComputerName")
+    association_status: PropertyRef = PropertyRef("AssociationStatus")
+    last_association_execution_date: PropertyRef = PropertyRef(
+        "LastAssociationExecutionDate",
+    )
+    last_successful_association_execution_date: PropertyRef = PropertyRef(
+        "LastSuccessfulAssociationExecutionDate",
+    )
+    source_id: PropertyRef = PropertyRef("SourceId")
+    source_type: PropertyRef = PropertyRef("SourceType")
 
 
 @dataclass(frozen=True)
-class SSMInstanceInformationToAWSAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class SSMInstanceInformationToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class SSMInstanceInformationToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class SSMInstanceInformationToAWSAccountRel(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: SSMInstanceInformationToAWSAccountRelProperties = SSMInstanceInformationToAWSAccountRelProperties()
+    properties: SSMInstanceInformationToAWSAccountRelRelProperties = (
+        SSMInstanceInformationToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class SSMInstanceInformationToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class SSMInstanceInformationToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class SSMInstanceInformationToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class SSMInstanceInformationToEC2InstanceRel(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 = "HAS_INFORMATION"
-    properties: SSMInstanceInformationToEC2InstanceRelProperties = SSMInstanceInformationToEC2InstanceRelProperties()
+    properties: SSMInstanceInformationToEC2InstanceRelRelProperties = (
+        SSMInstanceInformationToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SSMInstanceInformationSchema(CartographyNodeSchema):
-    label: str = 'SSMInstanceInformation'
-    properties: SSMInstanceInformationNodeProperties = SSMInstanceInformationNodeProperties()
-    sub_resource_relationship: SSMInstanceInformationToAWSAccount = SSMInstanceInformationToAWSAccount()
+    label: str = "SSMInstanceInformation"
+    properties: SSMInstanceInformationNodeProperties = (
+        SSMInstanceInformationNodeProperties()
+    )
+    sub_resource_relationship: SSMInstanceInformationToAWSAccountRel = (
+        SSMInstanceInformationToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            SSMInstanceInformationToEC2Instance(),
+            SSMInstanceInformationToEC2InstanceRel(),
         ],
     )

cartography/models/aws/ssm/instance_patch.py

@@ -13,58 +13,64 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class SSMInstancePatchNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('Id')
-    instance_id: PropertyRef = PropertyRef('_instance_id', extra_index=True)
-    region: PropertyRef = PropertyRef('Region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    title: PropertyRef = PropertyRef('Title', extra_index=True)
-    kb_id: PropertyRef = PropertyRef('KBId', extra_index=True)
-    classification: PropertyRef = PropertyRef('Classification')
-    severity: PropertyRef = PropertyRef('Severity')
-    state: PropertyRef = PropertyRef('State')
-    installed_time: PropertyRef = PropertyRef('InstalledTime')
-    cve_ids: PropertyRef = PropertyRef('CVEIds')
+    id: PropertyRef = PropertyRef("Id")
+    instance_id: PropertyRef = PropertyRef("_instance_id", extra_index=True)
+    region: PropertyRef = PropertyRef("Region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    title: PropertyRef = PropertyRef("Title", extra_index=True)
+    kb_id: PropertyRef = PropertyRef("KBId", extra_index=True)
+    classification: PropertyRef = PropertyRef("Classification")
+    severity: PropertyRef = PropertyRef("Severity")
+    state: PropertyRef = PropertyRef("State")
+    installed_time: PropertyRef = PropertyRef("InstalledTime")
+    cve_ids: PropertyRef = PropertyRef("CVEIds")
 
 
 @dataclass(frozen=True)
-class SSMInstancePatchToAWSAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class SSMInstancePatchToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class SSMInstancePatchToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class SSMInstancePatchToAWSAccountRel(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: SSMInstancePatchToAWSAccountRelProperties = SSMInstancePatchToAWSAccountRelProperties()
+    properties: SSMInstancePatchToAWSAccountRelRelProperties = (
+        SSMInstancePatchToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class SSMInstancePatchToEC2InstanceRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class SSMInstancePatchToEC2InstanceRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class SSMInstancePatchToEC2Instance(CartographyRelSchema):
-    target_node_label: str = 'EC2Instance'
+class SSMInstancePatchToEC2InstanceRel(CartographyRelSchema):
+    target_node_label: str = "EC2Instance"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('_instance_id')},
+        {"id": PropertyRef("_instance_id")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS_PATCH"
-    properties: SSMInstancePatchToEC2InstanceRelProperties = SSMInstancePatchToEC2InstanceRelProperties()
+    properties: SSMInstancePatchToEC2InstanceRelRelProperties = (
+        SSMInstancePatchToEC2InstanceRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SSMInstancePatchSchema(CartographyNodeSchema):
-    label: str = 'SSMInstancePatch'
+    label: str = "SSMInstancePatch"
     properties: SSMInstancePatchNodeProperties = SSMInstancePatchNodeProperties()
-    sub_resource_relationship: SSMInstancePatchToAWSAccount = SSMInstancePatchToAWSAccount()
+    sub_resource_relationship: SSMInstancePatchToAWSAccountRel = (
+        SSMInstancePatchToAWSAccountRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            SSMInstancePatchToEC2Instance(),
+            SSMInstancePatchToEC2InstanceRel(),
         ],
     )