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

cartography/intel/aws/redshift.py

@@ -14,30 +14,52 @@ logger = logging.getLogger(__name__)
 
 @timeit
 @aws_handle_regions
-def get_redshift_cluster_data(boto3_session: boto3.session.Session, region: str) -> List[Dict]:
-    client = boto3_session.client('redshift', region_name=region)
-    paginator = client.get_paginator('describe_clusters')
+def get_redshift_cluster_data(
+    boto3_session: boto3.session.Session,
+    region: str,
+) -> List[Dict]:
+    client = boto3_session.client("redshift", region_name=region)
+    paginator = client.get_paginator("describe_clusters")
     clusters: List[Dict] = []
     for page in paginator.paginate():
-        clusters.extend(page['Clusters'])
+        clusters.extend(page["Clusters"])
     return clusters
 
 
-def _make_redshift_cluster_arn(region: str, aws_account_id: str, cluster_identifier: str) -> str:
+def _make_redshift_cluster_arn(
+    region: str,
+    aws_account_id: str,
+    cluster_identifier: str,
+) -> str:
     """Cluster ARN format: https://docs.aws.amazon.com/redshift/latest/mgmt/redshift-iam-access-control-overview.html"""
-    return f'arn:aws:redshift:{region}:{aws_account_id}:cluster:{cluster_identifier}'
+    return f"arn:aws:redshift:{region}:{aws_account_id}:cluster:{cluster_identifier}"
 
 
-def transform_redshift_cluster_data(clusters: List[Dict], region: str, current_aws_account_id: str) -> None:
+def transform_redshift_cluster_data(
+    clusters: List[Dict],
+    region: str,
+    current_aws_account_id: str,
+) -> None:
     for cluster in clusters:
-        cluster['arn'] = _make_redshift_cluster_arn(region, current_aws_account_id, cluster["ClusterIdentifier"])
-        cluster['ClusterCreateTime'] = str(cluster['ClusterCreateTime']) if 'ClusterCreateTime' in cluster else None
+        cluster["arn"] = _make_redshift_cluster_arn(
+            region,
+            current_aws_account_id,
+            cluster["ClusterIdentifier"],
+        )
+        cluster["ClusterCreateTime"] = (
+            str(cluster["ClusterCreateTime"])
+            if "ClusterCreateTime" in cluster
+            else None
+        )
 
 
 @timeit
 def load_redshift_cluster_data(
-    neo4j_session: neo4j.Session, clusters: List[Dict], region: str,
-    current_aws_account_id: str, aws_update_tag: int,
+    neo4j_session: neo4j.Session,
+    clusters: List[Dict],
+    region: str,
+    current_aws_account_id: str,
+    aws_update_tag: int,
 ) -> None:
     ingest_cluster = """
     MERGE (cluster:RedshiftCluster{id: $Arn})
@@ -68,21 +90,21 @@ def load_redshift_cluster_data(
     for cluster in clusters:
         neo4j_session.run(
             ingest_cluster,
-            Arn=cluster['arn'],
-            AZ=cluster['AvailabilityZone'],
-            ClusterCreateTime=cluster['ClusterCreateTime'],
-            ClusterIdentifier=cluster['ClusterIdentifier'],
-            ClusterRevisionNumber=cluster['ClusterRevisionNumber'],
-            ClusterStatus=cluster['ClusterStatus'],
-            DBName=cluster['DBName'],
-            Encrypted=cluster['Encrypted'],
-            EndpointAddress=cluster.get('Endpoint').get('Address'),    # type: ignore
-            EndpointPort=cluster.get('Endpoint').get('Port'),   # type: ignore
-            MasterUsername=cluster['MasterUsername'],
-            NodeType=cluster['NodeType'],
-            NumberOfNodes=cluster['NumberOfNodes'],
-            PubliclyAccessible=cluster['PubliclyAccessible'],
-            VpcId=cluster.get('VpcId'),
+            Arn=cluster["arn"],
+            AZ=cluster["AvailabilityZone"],
+            ClusterCreateTime=cluster["ClusterCreateTime"],
+            ClusterIdentifier=cluster["ClusterIdentifier"],
+            ClusterRevisionNumber=cluster["ClusterRevisionNumber"],
+            ClusterStatus=cluster["ClusterStatus"],
+            DBName=cluster["DBName"],
+            Encrypted=cluster["Encrypted"],
+            EndpointAddress=cluster.get("Endpoint").get("Address"),  # type: ignore
+            EndpointPort=cluster.get("Endpoint").get("Port"),  # type: ignore
+            MasterUsername=cluster["MasterUsername"],
+            NodeType=cluster["NodeType"],
+            NumberOfNodes=cluster["NumberOfNodes"],
+            PubliclyAccessible=cluster["PubliclyAccessible"],
+            VpcId=cluster.get("VpcId"),
             Region=region,
             AWS_ACCOUNT_ID=current_aws_account_id,
             aws_update_tag=aws_update_tag,
@@ -93,7 +115,11 @@ def load_redshift_cluster_data(
 
 
 @timeit
-def _attach_ec2_security_groups(neo4j_session: neo4j.Session, cluster: Dict, aws_update_tag: int) -> None:
+def _attach_ec2_security_groups(
+    neo4j_session: neo4j.Session,
+    cluster: Dict,
+    aws_update_tag: int,
+) -> None:
     attach_cluster_to_group = """
     MATCH (c:RedshiftCluster{id:$ClusterArn})
     MERGE (sg:EC2SecurityGroup{id:$GroupId})
@@ -101,17 +127,21 @@ def _attach_ec2_security_groups(neo4j_session: neo4j.Session, cluster: Dict, aws
     ON CREATE SET m.firstseen = timestamp()
     SET m.lastupdated = $aws_update_tag
     """
-    for group in cluster.get('VpcSecurityGroups', []):
+    for group in cluster.get("VpcSecurityGroups", []):
         neo4j_session.run(
             attach_cluster_to_group,
-            ClusterArn=cluster['arn'],
-            GroupId=group['VpcSecurityGroupId'],
+            ClusterArn=cluster["arn"],
+            GroupId=group["VpcSecurityGroupId"],
             aws_update_tag=aws_update_tag,
         )
 
 
 @timeit
-def _attach_iam_roles(neo4j_session: neo4j.Session, cluster: Dict, aws_update_tag: int) -> None:
+def _attach_iam_roles(
+    neo4j_session: neo4j.Session,
+    cluster: Dict,
+    aws_update_tag: int,
+) -> None:
     attach_cluster_to_role = """
     MATCH (c:RedshiftCluster{id:$ClusterArn})
     MERGE (p:AWSPrincipal{arn:$RoleArn})
@@ -119,17 +149,21 @@ def _attach_iam_roles(neo4j_session: neo4j.Session, cluster: Dict, aws_update_ta
     ON CREATE SET s.firstseen = timestamp()
     SET s.lastupdated = $aws_update_tag
     """
-    for role in cluster.get('IamRoles', []):
+    for role in cluster.get("IamRoles", []):
         neo4j_session.run(
             attach_cluster_to_role,
-            ClusterArn=cluster['arn'],
-            RoleArn=role['IamRoleArn'],
+            ClusterArn=cluster["arn"],
+            RoleArn=role["IamRoleArn"],
             aws_update_tag=aws_update_tag,
         )
 
 
 @timeit
-def _attach_aws_vpc(neo4j_session: neo4j.Session, cluster: Dict, aws_update_tag: int) -> None:
+def _attach_aws_vpc(
+    neo4j_session: neo4j.Session,
+    cluster: Dict,
+    aws_update_tag: int,
+) -> None:
     attach_cluster_to_vpc = """
     MATCH (c:RedshiftCluster{id:$ClusterArn})
     MERGE (v:AWSVpc{id:$VpcId})
@@ -137,36 +171,63 @@ def _attach_aws_vpc(neo4j_session: neo4j.Session, cluster: Dict, aws_update_tag:
     ON CREATE SET m.firstseen = timestamp()
     SET m.lastupdated = $aws_update_tag
     """
-    if cluster.get('VpcId'):
+    if cluster.get("VpcId"):
         neo4j_session.run(
             attach_cluster_to_vpc,
-            ClusterArn=cluster['arn'],
-            VpcId=cluster['VpcId'],
+            ClusterArn=cluster["arn"],
+            VpcId=cluster["VpcId"],
             aws_update_tag=aws_update_tag,
         )
 
 
 @timeit
 def cleanup(neo4j_session: neo4j.Session, common_job_parameters: Dict) -> None:
-    run_cleanup_job('aws_import_redshift_clusters_cleanup.json', neo4j_session, common_job_parameters)
+    run_cleanup_job(
+        "aws_import_redshift_clusters_cleanup.json",
+        neo4j_session,
+        common_job_parameters,
+    )
 
 
 @timeit
 def sync_redshift_clusters(
-    neo4j_session: neo4j.Session, boto3_session: boto3.session.Session, region: str,
-    current_aws_account_id: str, aws_update_tag: int,
+    neo4j_session: neo4j.Session,
+    boto3_session: boto3.session.Session,
+    region: str,
+    current_aws_account_id: str,
+    aws_update_tag: int,
 ) -> None:
     data = get_redshift_cluster_data(boto3_session, region)
     transform_redshift_cluster_data(data, region, current_aws_account_id)
-    load_redshift_cluster_data(neo4j_session, data, region, current_aws_account_id, aws_update_tag)
+    load_redshift_cluster_data(
+        neo4j_session,
+        data,
+        region,
+        current_aws_account_id,
+        aws_update_tag,
+    )
 
 
 @timeit
 def sync(
-    neo4j_session: neo4j.Session, boto3_session: boto3.session.Session, regions: List[str], current_aws_account_id: str,
-    update_tag: int, common_job_parameters: Dict,
+    neo4j_session: neo4j.Session,
+    boto3_session: boto3.session.Session,
+    regions: List[str],
+    current_aws_account_id: str,
+    update_tag: int,
+    common_job_parameters: Dict,
 ) -> None:
     for region in regions:
-        logger.info("Syncing Redshift clusters for region '%s' in account '%s'.", region, current_aws_account_id)
-        sync_redshift_clusters(neo4j_session, boto3_session, region, current_aws_account_id, update_tag)
+        logger.info(
+            "Syncing Redshift clusters for region '%s' in account '%s'.",
+            region,
+            current_aws_account_id,
+        )
+        sync_redshift_clusters(
+            neo4j_session,
+            boto3_session,
+            region,
+            current_aws_account_id,
+            update_tag,
+        )
     cleanup(neo4j_session, common_job_parameters)

cartography/intel/aws/resourcegroupstaggingapi.py

@@ -22,7 +22,7 @@ def get_short_id_from_ec2_arn(arn: str) -> str:
     :param arn: The ARN
     :return: The resource ID
     """
-    return arn.split('/')[-1]
+    return arn.split("/")[-1]
 
 
 def get_bucket_name_from_arn(bucket_arn: str) -> str:
@@ -32,7 +32,7 @@ def get_bucket_name_from_arn(bucket_arn: str) -> str:
     :param arn: The S3 bucket's full ARN
     :return: The S3 bucket's name
     """
-    return bucket_arn.split(':')[-1]
+    return bucket_arn.split(":")[-1]
 
 
 def get_short_id_from_elb_arn(alb_arn: str) -> str:
@@ -42,7 +42,7 @@ def get_short_id_from_elb_arn(alb_arn: str) -> str:
     :param arn: The ELB's full ARN
     :return: The ELB's name
     """
-    return alb_arn.split('/')[-1]
+    return alb_arn.split("/")[-1]
 
 
 def get_short_id_from_lb2_arn(alb_arn: str) -> str:
@@ -53,7 +53,7 @@ def get_short_id_from_lb2_arn(alb_arn: str) -> str:
     :param arn: The (N|A)LB's full ARN
     :return: The (N|A)LB's name
     """
-    return alb_arn.split('/')[-2]
+    return alb_arn.split("/")[-2]
 
 
 # We maintain a mapping from AWS resource types to their associated labels and unique identifiers.
@@ -64,79 +64,121 @@ def get_short_id_from_lb2_arn(alb_arn: str) -> str:
 # cartography uses.
 # TODO - we should make EC2 and S3 assets query-able by their full ARN so that we don't need this workaround.
 TAG_RESOURCE_TYPE_MAPPINGS: Dict = {
-    'autoscaling:autoScalingGroup': {'label': 'AutoScalingGroup', 'property': 'arn'},
-    'dynamodb:table': {'label': 'DynamoDBTable', 'property': 'id'},
-    'ec2:instance': {'label': 'EC2Instance', 'property': 'id', 'id_func': get_short_id_from_ec2_arn},
-    'ec2:internet-gateway': {'label': 'AWSInternetGateway', 'property': 'id', 'id_func': get_short_id_from_ec2_arn},
-    'ec2:key-pair': {'label': 'EC2KeyPair', 'property': 'id'},
-    'ec2:network-interface': {'label': 'NetworkInterface', 'property': 'id', 'id_func': get_short_id_from_ec2_arn},
-    'ecr:repository': {'label': 'ECRRepository', 'property': 'id'},
-    'ec2:security-group': {'label': 'EC2SecurityGroup', 'property': 'id', 'id_func': get_short_id_from_ec2_arn},
-    'ec2:subnet': {'label': 'EC2Subnet', 'property': 'subnetid', 'id_func': get_short_id_from_ec2_arn},
-    'ec2:transit-gateway': {'label': 'AWSTransitGateway', 'property': 'id'},
-    'ec2:transit-gateway-attachment': {'label': 'AWSTransitGatewayAttachment', 'property': 'id'},
-    'ec2:vpc': {'label': 'AWSVpc', 'property': 'id', 'id_func': get_short_id_from_ec2_arn},
-    'ec2:volume': {'label': 'EBSVolume', 'property': 'id', 'id_func': get_short_id_from_ec2_arn},
-    'ec2:elastic-ip-address': {'label': 'ElasticIPAddress', 'property': 'id', 'id_func': get_short_id_from_ec2_arn},
-    'ecs:cluster': {'label': 'ECSCluster', 'property': 'id'},
-    'ecs:container': {'label': 'ECSContainer', 'property': 'id'},
-    'ecs:container-instance': {'label': 'ECSContainerInstance', 'property': 'id'},
-    'ecs:task': {'label': 'ECSTask', 'property': 'id'},
-    'ecs:task-definition': {'label': 'ECSTaskDefinition', 'property': 'id'},
-    'eks:cluster': {'label': 'EKSCluster', 'property': 'id'},
-    'elasticache:cluster': {'label': 'ElasticacheCluster', 'property': 'arn'},
-    'elasticloadbalancing:loadbalancer': {
-        'label': 'LoadBalancer', 'property':
-        'name', 'id_func': get_short_id_from_elb_arn,
+    "autoscaling:autoScalingGroup": {"label": "AutoScalingGroup", "property": "arn"},
+    "dynamodb:table": {"label": "DynamoDBTable", "property": "id"},
+    "ec2:instance": {
+        "label": "EC2Instance",
+        "property": "id",
+        "id_func": get_short_id_from_ec2_arn,
     },
-    'elasticloadbalancing:loadbalancer/app': {
-        'label': 'LoadBalancerV2',
-        'property': 'name', 'id_func': get_short_id_from_lb2_arn,
+    "ec2:internet-gateway": {
+        "label": "AWSInternetGateway",
+        "property": "id",
+        "id_func": get_short_id_from_ec2_arn,
     },
-    'elasticloadbalancing:loadbalancer/net': {
-        'label': 'LoadBalancerV2',
-        'property': 'name', 'id_func': get_short_id_from_lb2_arn,
+    "ec2:key-pair": {"label": "EC2KeyPair", "property": "id"},
+    "ec2:network-interface": {
+        "label": "NetworkInterface",
+        "property": "id",
+        "id_func": get_short_id_from_ec2_arn,
     },
-    'elasticmapreduce:cluster': {'label': 'EMRCluster', 'property': 'arn'},
-    'es:domain': {'label': 'ESDomain', 'property': 'arn'},
-    'kms:key': {'label': 'KMSKey', 'property': 'arn'},
-    'iam:group': {'label': 'AWSGroup', 'property': 'arn'},
-    'iam:role': {'label': 'AWSRole', 'property': 'arn'},
-    'iam:user': {'label': 'AWSUser', 'property': 'arn'},
-    'lambda:function': {'label': 'AWSLambda', 'property': 'id'},
-    'redshift:cluster': {'label': 'RedshiftCluster', 'property': 'id'},
-    'rds:db': {'label': 'RDSInstance', 'property': 'id'},
-    'rds:subgrp': {'label': 'DBSubnetGroup', 'property': 'id'},
-    'rds:cluster': {'label': 'RDSCluster', 'property': 'id'},
-    'rds:snapshot': {'label': 'RDSSnapshot', 'property': 'id'},
+    "ecr:repository": {"label": "ECRRepository", "property": "id"},
+    "ec2:security-group": {
+        "label": "EC2SecurityGroup",
+        "property": "id",
+        "id_func": get_short_id_from_ec2_arn,
+    },
+    "ec2:subnet": {
+        "label": "EC2Subnet",
+        "property": "subnetid",
+        "id_func": get_short_id_from_ec2_arn,
+    },
+    "ec2:transit-gateway": {"label": "AWSTransitGateway", "property": "id"},
+    "ec2:transit-gateway-attachment": {
+        "label": "AWSTransitGatewayAttachment",
+        "property": "id",
+    },
+    "ec2:vpc": {
+        "label": "AWSVpc",
+        "property": "id",
+        "id_func": get_short_id_from_ec2_arn,
+    },
+    "ec2:volume": {
+        "label": "EBSVolume",
+        "property": "id",
+        "id_func": get_short_id_from_ec2_arn,
+    },
+    "ec2:elastic-ip-address": {
+        "label": "ElasticIPAddress",
+        "property": "id",
+        "id_func": get_short_id_from_ec2_arn,
+    },
+    "ecs:cluster": {"label": "ECSCluster", "property": "id"},
+    "ecs:container": {"label": "ECSContainer", "property": "id"},
+    "ecs:container-instance": {"label": "ECSContainerInstance", "property": "id"},
+    "ecs:task": {"label": "ECSTask", "property": "id"},
+    "ecs:task-definition": {"label": "ECSTaskDefinition", "property": "id"},
+    "eks:cluster": {"label": "EKSCluster", "property": "id"},
+    "elasticache:cluster": {"label": "ElasticacheCluster", "property": "arn"},
+    "elasticloadbalancing:loadbalancer": {
+        "label": "LoadBalancer",
+        "property": "name",
+        "id_func": get_short_id_from_elb_arn,
+    },
+    "elasticloadbalancing:loadbalancer/app": {
+        "label": "LoadBalancerV2",
+        "property": "name",
+        "id_func": get_short_id_from_lb2_arn,
+    },
+    "elasticloadbalancing:loadbalancer/net": {
+        "label": "LoadBalancerV2",
+        "property": "name",
+        "id_func": get_short_id_from_lb2_arn,
+    },
+    "elasticmapreduce:cluster": {"label": "EMRCluster", "property": "arn"},
+    "es:domain": {"label": "ESDomain", "property": "arn"},
+    "kms:key": {"label": "KMSKey", "property": "arn"},
+    "iam:group": {"label": "AWSGroup", "property": "arn"},
+    "iam:role": {"label": "AWSRole", "property": "arn"},
+    "iam:user": {"label": "AWSUser", "property": "arn"},
+    "lambda:function": {"label": "AWSLambda", "property": "id"},
+    "redshift:cluster": {"label": "RedshiftCluster", "property": "id"},
+    "rds:db": {"label": "RDSInstance", "property": "id"},
+    "rds:subgrp": {"label": "DBSubnetGroup", "property": "id"},
+    "rds:cluster": {"label": "RDSCluster", "property": "id"},
+    "rds:snapshot": {"label": "RDSSnapshot", "property": "id"},
     # Buckets are the only objects in the S3 service: https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html
-    's3': {'label': 'S3Bucket', 'property': 'id', 'id_func': get_bucket_name_from_arn},
-    'secretsmanager:secret': {'label': 'SecretsManagerSecret', 'property': 'id'},
-    'sqs': {'label': 'SQSQueue', 'property': 'id'},
+    "s3": {"label": "S3Bucket", "property": "id", "id_func": get_bucket_name_from_arn},
+    "secretsmanager:secret": {"label": "SecretsManagerSecret", "property": "id"},
+    "sqs": {"label": "SQSQueue", "property": "id"},
 }
 
 
 @timeit
 @aws_handle_regions
-def get_tags(boto3_session: boto3.session.Session, resource_type: str, region: str) -> List[Dict]:
+def get_tags(
+    boto3_session: boto3.session.Session,
+    resource_type: str,
+    region: str,
+) -> List[Dict]:
     """
     Create boto3 client and retrieve tag data.
     """
     # this is a temporary workaround to populate AWS tags for IAM roles.
     # resourcegroupstaggingapi does not support IAM roles and no ETA is provided
     # TODO: when resourcegroupstaggingapi supports iam:role, remove this condition block
-    if resource_type == 'iam:role':
+    if resource_type == "iam:role":
         return get_role_tags(boto3_session)
 
-    client = boto3_session.client('resourcegroupstaggingapi', region_name=region)
-    paginator = client.get_paginator('get_resources')
+    client = boto3_session.client("resourcegroupstaggingapi", region_name=region)
+    paginator = client.get_paginator("get_resources")
     resources: List[Dict] = []
     for page in paginator.paginate(
         # Only ingest tags for resources that Cartography supports.
         # This is just a starting list; there may be others supported by this API.
         ResourceTypeFilters=[resource_type],
     ):
-        resources.extend(page['ResourceTagMappingList'])
+        resources.extend(page["ResourceTagMappingList"])
     return resources
 
 
@@ -148,7 +190,8 @@ def _load_tags_tx(
     current_aws_account_id: str,
     aws_update_tag: int,
 ) -> None:
-    INGEST_TAG_TEMPLATE = Template("""
+    INGEST_TAG_TEMPLATE = Template(
+        """
     UNWIND $TagData as tag_mapping
         UNWIND tag_mapping.Tags as input_tag
             MATCH
@@ -165,10 +208,11 @@ def _load_tags_tx(
             MERGE (resource)-[r:TAGGED]->(aws_tag)
             SET r.lastupdated = $UpdateTag,
             r.firstseen = timestamp()
-    """)
+    """,
+    )
     query = INGEST_TAG_TEMPLATE.safe_substitute(
-        resource_label=TAG_RESOURCE_TYPE_MAPPINGS[resource_type]['label'],
-        property=TAG_RESOURCE_TYPE_MAPPINGS[resource_type]['property'],
+        resource_label=TAG_RESOURCE_TYPE_MAPPINGS[resource_type]["label"],
+        property=TAG_RESOURCE_TYPE_MAPPINGS[resource_type]["property"],
     )
     tx.run(
         query,
@@ -205,20 +249,26 @@ def load_tags(
 @timeit
 def transform_tags(tag_data: Dict, resource_type: str) -> None:
     for tag_mapping in tag_data:
-        tag_mapping['resource_id'] = compute_resource_id(tag_mapping, resource_type)
+        tag_mapping["resource_id"] = compute_resource_id(tag_mapping, resource_type)
 
 
 def compute_resource_id(tag_mapping: Dict, resource_type: str) -> str:
-    resource_id = tag_mapping['ResourceARN']
-    if 'id_func' in TAG_RESOURCE_TYPE_MAPPINGS[resource_type]:
-        parse_resource_id_from_arn = TAG_RESOURCE_TYPE_MAPPINGS[resource_type]['id_func']
-        resource_id = parse_resource_id_from_arn(tag_mapping['ResourceARN'])
+    resource_id = tag_mapping["ResourceARN"]
+    if "id_func" in TAG_RESOURCE_TYPE_MAPPINGS[resource_type]:
+        parse_resource_id_from_arn = TAG_RESOURCE_TYPE_MAPPINGS[resource_type][
+            "id_func"
+        ]
+        resource_id = parse_resource_id_from_arn(tag_mapping["ResourceARN"])
     return resource_id
 
 
 @timeit
 def cleanup(neo4j_session: neo4j.Session, common_job_parameters: Dict) -> None:
-    run_cleanup_job('aws_import_tags_cleanup.json', neo4j_session, common_job_parameters)
+    run_cleanup_job(
+        "aws_import_tags_cleanup.json",
+        neo4j_session,
+        common_job_parameters,
+    )
 
 
 @timeit
@@ -232,11 +282,15 @@ def sync(
     tag_resource_type_mappings: Dict = TAG_RESOURCE_TYPE_MAPPINGS,
 ) -> None:
     for region in regions:
-        logger.info(f"Syncing AWS tags for account {current_aws_account_id} and region {region}")
+        logger.info(
+            f"Syncing AWS tags for account {current_aws_account_id} and region {region}",
+        )
         for resource_type in tag_resource_type_mappings.keys():
             tag_data = get_tags(boto3_session, resource_type, region)
             transform_tags(tag_data, resource_type)  # type: ignore
-            logger.info(f"Loading {len(tag_data)} tags for resource type {resource_type}")
+            logger.info(
+                f"Loading {len(tag_data)} tags for resource type {resource_type}",
+            )
             load_tags(
                 neo4j_session=neo4j_session,
                 tag_data=tag_data,  # type: ignore

cartography/intel/aws/resources.py

@@ -1,11 +1,16 @@
 from typing import Callable
 from typing import Dict
 
+from cartography.intel.aws.ec2.route_tables import sync_route_tables
+
 from . import apigateway
+from . import cloudtrail
+from . import cloudwatch
 from . import config
 from . import dynamodb
 from . import ecr
 from . import ecs
+from . import efs
 from . import eks
 from . import elasticache
 from . import elasticsearch
@@ -21,8 +26,10 @@ from . import redshift
 from . import resourcegroupstaggingapi
 from . import route53
 from . import s3
+from . import s3accountpublicaccessblock
 from . import secretsmanager
 from . import securityhub
+from . import sns
 from . import sqs
 from . import ssm
 from .ec2.auto_scaling_groups import sync_ec2_auto_scaling_groups
@@ -47,50 +54,56 @@ from .ec2.vpc_peerings import sync_vpc_peerings
 from .iam_instance_profiles import sync_iam_instance_profiles
 
 RESOURCE_FUNCTIONS: Dict[str, Callable[..., None]] = {
-    'iam': iam.sync,
-    'iaminstanceprofiles': sync_iam_instance_profiles,
-    's3': s3.sync,
-    'dynamodb': dynamodb.sync,
-    'ec2:launch_templates': sync_ec2_launch_templates,
-    'ec2:autoscalinggroup': sync_ec2_auto_scaling_groups,
+    "iam": iam.sync,
+    "iaminstanceprofiles": sync_iam_instance_profiles,
+    "s3": s3.sync,
+    "dynamodb": dynamodb.sync,
+    "ec2:launch_templates": sync_ec2_launch_templates,
+    "ec2:autoscalinggroup": sync_ec2_auto_scaling_groups,
     # `ec2:instance` must be included before `ssm` and `ec2:images`,
     # they rely on EC2Instance data provided by this module.
-    'ec2:instance': sync_ec2_instances,
-    'ec2:images': sync_ec2_images,
-    'ec2:keypair': sync_ec2_key_pairs,
-    'ec2:load_balancer': sync_load_balancers,
-    'ec2:load_balancer_v2': sync_load_balancer_v2s,
-    'ec2:network_acls': sync_network_acls,
-    'ec2:network_interface': sync_network_interfaces,
-    'ec2:security_group': sync_ec2_security_groupinfo,
-    'ec2:subnet': sync_subnets,
-    'ec2:tgw': sync_transit_gateways,
-    'ec2:vpc': sync_vpc,
-    'ec2:vpc_peering': sync_vpc_peerings,
-    'ec2:internet_gateway': sync_internet_gateways,
-    'ec2:reserved_instances': sync_ec2_reserved_instances,
-    'ec2:volumes': sync_ebs_volumes,
-    'ec2:snapshots': sync_ebs_snapshots,
-    'ecr': ecr.sync,
-    'ecs': ecs.sync,
-    'eks': eks.sync,
-    'elasticache': elasticache.sync,
-    'elastic_ip_addresses': sync_elastic_ip_addresses,
-    'emr': emr.sync,
-    'lambda_function': lambda_function.sync,
-    'kms': kms.sync,
-    'rds': rds.sync,
-    'redshift': redshift.sync,
-    'route53': route53.sync,
-    'elasticsearch': elasticsearch.sync,
-    'permission_relationships': permission_relationships.sync,
-    'resourcegroupstaggingapi': resourcegroupstaggingapi.sync,
-    'apigateway': apigateway.sync,
-    'secretsmanager': secretsmanager.sync,
-    'securityhub': securityhub.sync,
-    'sqs': sqs.sync,
-    'ssm': ssm.sync,
-    'inspector': inspector.sync,
-    'config': config.sync,
-    'identitycenter': identitycenter.sync_identity_center_instances,
+    "ec2:instance": sync_ec2_instances,
+    "ec2:images": sync_ec2_images,
+    "ec2:keypair": sync_ec2_key_pairs,
+    "ec2:load_balancer": sync_load_balancers,
+    "ec2:load_balancer_v2": sync_load_balancer_v2s,
+    "ec2:network_acls": sync_network_acls,
+    "ec2:network_interface": sync_network_interfaces,
+    "ec2:route_table": sync_route_tables,
+    "ec2:security_group": sync_ec2_security_groupinfo,
+    "ec2:subnet": sync_subnets,
+    "ec2:tgw": sync_transit_gateways,
+    "ec2:vpc": sync_vpc,
+    "ec2:vpc_peering": sync_vpc_peerings,
+    "ec2:internet_gateway": sync_internet_gateways,
+    "ec2:reserved_instances": sync_ec2_reserved_instances,
+    "ec2:volumes": sync_ebs_volumes,
+    "ec2:snapshots": sync_ebs_snapshots,
+    "ecr": ecr.sync,
+    "ecs": ecs.sync,
+    "eks": eks.sync,
+    "elasticache": elasticache.sync,
+    "elastic_ip_addresses": sync_elastic_ip_addresses,
+    "emr": emr.sync,
+    "lambda_function": lambda_function.sync,
+    "kms": kms.sync,
+    "rds": rds.sync,
+    "redshift": redshift.sync,
+    "route53": route53.sync,
+    "elasticsearch": elasticsearch.sync,
+    "permission_relationships": permission_relationships.sync,
+    "resourcegroupstaggingapi": resourcegroupstaggingapi.sync,
+    "apigateway": apigateway.sync,
+    "secretsmanager": secretsmanager.sync,
+    "securityhub": securityhub.sync,
+    "s3accountpublicaccessblock": s3accountpublicaccessblock.sync,
+    "sns": sns.sync,
+    "sqs": sqs.sync,
+    "ssm": ssm.sync,
+    "inspector": inspector.sync,
+    "config": config.sync,
+    "identitycenter": identitycenter.sync_identity_center_instances,
+    "cloudtrail": cloudtrail.sync,
+    "cloudwatch": cloudwatch.sync,
+    "efs": efs.sync,
 }