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

cartography/intel/semgrep/findings.py

@@ -54,11 +54,18 @@ def get_sca_vulns(semgrep_app_token: str, deployment_slug: str) -> List[Dict[str
     while has_more:
 
         try:
-            response = requests.get(sca_url, params=request_data, headers=headers, timeout=_TIMEOUT)
+            response = requests.get(
+                sca_url,
+                params=request_data,
+                headers=headers,
+                timeout=_TIMEOUT,
+            )
             response.raise_for_status()
             data = response.json()
         except (ReadTimeout, HTTPError):
-            logger.warning(f"Failed to retrieve Semgrep SCA vulns for page {page}. Retrying...")
+            logger.warning(
+                f"Failed to retrieve Semgrep SCA vulns for page {page}. Retrying...",
+            )
             retries += 1
             if retries >= _MAX_RETRIES:
                 raise
@@ -104,14 +111,16 @@ def _determine_exposure(vuln: Dict[str, Any]) -> str | None:
 
 
 def _build_vuln_url(vuln: str) -> str | None:
-    if 'CVE' in vuln:
+    if "CVE" in vuln:
         return f"https://nvd.nist.gov/vuln/detail/{vuln}"
-    if 'GHSA' in vuln:
+    if "GHSA" in vuln:
         return f"https://github.com/advisories/{vuln}"
     return None
 
 
-def transform_sca_vulns(raw_vulns: List[Dict[str, Any]]) -> Tuple[List[Dict[str, Any]], List[Dict[str, str]]]:
+def transform_sca_vulns(
+    raw_vulns: List[Dict[str, Any]],
+) -> Tuple[List[Dict[str, Any]], List[Dict[str, str]]]:
     """
     Transforms the raw SCA vulns response from Semgrep API into a list of dicts
     that can be used to create the SemgrepSCAFinding nodes.
@@ -124,7 +133,7 @@ def transform_sca_vulns(raw_vulns: List[Dict[str, Any]]) -> Tuple[List[Dict[str,
         repository_name = vuln["repository"]["name"]
         rule_id = vuln["rule"]["name"]
         vulnerability_class = _get_vuln_class(vuln)
-        package = vuln['found_dependency']['package']
+        package = vuln["found_dependency"]["package"]
         sca_vuln["id"] = vuln["id"]
         sca_vuln["repositoryName"] = repository_name
         sca_vuln["branch"] = vuln["ref"]
@@ -133,9 +142,15 @@ def transform_sca_vulns(raw_vulns: List[Dict[str, Any]]) -> Tuple[List[Dict[str,
         sca_vuln["description"] = vuln["rule"]["message"]
         sca_vuln["ecosystem"] = vuln["found_dependency"]["ecosystem"]
         sca_vuln["severity"] = vuln["severity"].upper()
-        sca_vuln["reachability"] = vuln["reachability"].upper()  # Check done to determine rechabilitity
-        sca_vuln["reachableIf"] = vuln["reachable_condition"].upper() if vuln["reachable_condition"] else None
-        sca_vuln["exposureType"] = _determine_exposure(vuln)  # Determintes if reachable or unreachable
+        sca_vuln["reachability"] = vuln[
+            "reachability"
+        ].upper()  # Check done to determine rechabilitity
+        sca_vuln["reachableIf"] = (
+            vuln["reachable_condition"].upper() if vuln["reachable_condition"] else None
+        )
+        sca_vuln["exposureType"] = _determine_exposure(
+            vuln,
+        )  # Determintes if reachable or unreachable
         dependency = f"{package}|{vuln['found_dependency']['version']}"
         sca_vuln["matchedDependency"] = dependency
         dep_url = vuln["found_dependency"]["lockfile_line_url"]
@@ -145,14 +160,16 @@ def transform_sca_vulns(raw_vulns: List[Dict[str, Any]]) -> Tuple[List[Dict[str,
             sca_vuln["dependencyFileLocation_url"] = dep_url
         else:
             if sca_vuln.get("location"):
-                sca_vuln["dependencyFileLocation_path"] = sca_vuln["location"]["file_path"]
+                sca_vuln["dependencyFileLocation_path"] = sca_vuln["location"][
+                    "file_path"
+                ]
         sca_vuln["transitivity"] = vuln["found_dependency"]["transitivity"].upper()
         if vuln.get("vulnerability_identifier"):
             vuln_id = vuln["vulnerability_identifier"].upper()
             sca_vuln["cveId"] = vuln_id
             sca_vuln["ref_urls"] = [_build_vuln_url(vuln_id)]
-        if vuln.get('fix_recommendations') and len(vuln['fix_recommendations']) > 0:
-            fix = vuln['fix_recommendations'][0]
+        if vuln.get("fix_recommendations") and len(vuln["fix_recommendations"]) > 0:
+            fix = vuln["fix_recommendations"][0]
             dep_fix = f"{fix['package']}|{fix['version']}"
             sca_vuln["closestSafeDependency"] = dep_fix
         sca_vuln["openedAt"] = vuln["created_at"]
@@ -213,16 +230,19 @@ def load_semgrep_sca_usages(
 
 @timeit
 def cleanup(
-    neo4j_session: neo4j.Session, common_job_parameters: Dict[str, Any],
+    neo4j_session: neo4j.Session,
+    common_job_parameters: Dict[str, Any],
 ) -> None:
     logger.info("Running Semgrep SCA findings cleanup job.")
     findings_cleanup_job = GraphJob.from_node_schema(
-        SemgrepSCAFindingSchema(), common_job_parameters,
+        SemgrepSCAFindingSchema(),
+        common_job_parameters,
     )
     findings_cleanup_job.run(neo4j_session)
     logger.info("Running Semgrep SCA Locations cleanup job.")
     locations_cleanup_job = GraphJob.from_node_schema(
-        SemgrepSCALocationSchema(), common_job_parameters,
+        SemgrepSCALocationSchema(),
+        common_job_parameters,
     )
     locations_cleanup_job.run(neo4j_session)
 
@@ -249,14 +269,18 @@ def sync_findings(
     vulns, usages = transform_sca_vulns(raw_vulns)
     load_semgrep_sca_vulns(neo4j_session, vulns, deployment_id, update_tag)
     load_semgrep_sca_usages(neo4j_session, usages, deployment_id, update_tag)
-    run_scoped_analysis_job('semgrep_sca_risk_analysis.json', neo4j_session, common_job_parameters)
+    run_scoped_analysis_job(
+        "semgrep_sca_risk_analysis.json",
+        neo4j_session,
+        common_job_parameters,
+    )
 
     cleanup(neo4j_session, common_job_parameters)
     merge_module_sync_metadata(
         neo4j_session=neo4j_session,
-        group_type='Semgrep',
+        group_type="Semgrep",
         group_id=deployment_id,
-        synced_type='SCA',
+        synced_type="SCA",
         update_tag=update_tag,
         stat_handler=stat_handler,
     )

cartography/intel/snipeit/__init__.py

@@ -14,7 +14,11 @@ stat_handler = get_stats_client(__name__)
 
 @timeit
 def start_snipeit_ingestion(neo4j_session: neo4j.Session, config: Config) -> None:
-    if config.snipeit_base_uri is None or config.snipeit_token is None or config.snipeit_tenant_id is None:
+    if (
+        config.snipeit_base_uri is None
+        or config.snipeit_token is None
+        or config.snipeit_tenant_id is None
+    ):
         logger.warning(
             "Required parameter(s) missing. Skipping sync.",
         )
@@ -26,5 +30,15 @@ def start_snipeit_ingestion(neo4j_session: neo4j.Session, config: Config) -> Non
     }
 
     # Ingest SnipeIT users and assets
-    user.sync(neo4j_session, common_job_parameters, config.snipeit_base_uri, config.snipeit_token)
-    asset.sync(neo4j_session, common_job_parameters, config.snipeit_base_uri, config.snipeit_token)
+    user.sync(
+        neo4j_session,
+        common_job_parameters,
+        config.snipeit_base_uri,
+        config.snipeit_token,
+    )
+    asset.sync(
+        neo4j_session,
+        common_job_parameters,
+        config.snipeit_base_uri,
+        config.snipeit_token,
+    )

cartography/intel/snipeit/asset.py

@@ -5,13 +5,13 @@ from typing import List
 
 import neo4j
 
-from .util import call_snipeit_api
 from cartography.client.core.tx import load
 from cartography.graph.job import GraphJob
 from cartography.models.snipeit.asset import SnipeitAssetSchema
 from cartography.models.snipeit.tenant import SnipeitTenantSchema
 from cartography.util import timeit
 
+from .util import call_snipeit_api
 
 logger = logging.getLogger(__name__)
 
@@ -24,9 +24,9 @@ def get(base_uri: str, token: str) -> List[Dict]:
         offset = len(results)
         api_endpoint = f"{api_endpoint}?order='asc'&offset={offset}"
         response = call_snipeit_api(api_endpoint, base_uri, token)
-        results.extend(response['rows'])
+        results.extend(response["rows"])
 
-        total = response['total']
+        total = response["total"]
         results_count = len(results)
         if results_count >= total:
             break
@@ -44,7 +44,7 @@ def load_assets(
     load(
         neo4j_session,
         SnipeitTenantSchema(),
-        [{'id': common_job_parameters["TENANT_ID"]}],
+        [{"id": common_job_parameters["TENANT_ID"]}],
         lastupdated=common_job_parameters["UPDATE_TAG"],
     )
 
@@ -59,7 +59,9 @@ def load_assets(
 
 @timeit
 def cleanup(neo4j_session: neo4j.Session, common_job_parameters: Dict) -> None:
-    GraphJob.from_node_schema(SnipeitAssetSchema(), common_job_parameters).run(neo4j_session)
+    GraphJob.from_node_schema(SnipeitAssetSchema(), common_job_parameters).run(
+        neo4j_session,
+    )
 
 
 @timeit
@@ -70,5 +72,9 @@ def sync(
     token: str,
 ) -> None:
     assets = get(base_uri=base_uri, token=token)
-    load_assets(neo4j_session=neo4j_session, common_job_parameters=common_job_parameters, data=assets)
+    load_assets(
+        neo4j_session=neo4j_session,
+        common_job_parameters=common_job_parameters,
+        data=assets,
+    )
     cleanup(neo4j_session, common_job_parameters)

cartography/intel/snipeit/user.py

@@ -5,13 +5,14 @@ from typing import List
 
 import neo4j
 
-from .util import call_snipeit_api
 from cartography.client.core.tx import load
 from cartography.graph.job import GraphJob
 from cartography.models.snipeit.tenant import SnipeitTenantSchema
 from cartography.models.snipeit.user import SnipeitUserSchema
 from cartography.util import timeit
 
+from .util import call_snipeit_api
+
 logger = logging.getLogger(__name__)
 
 
@@ -23,9 +24,9 @@ def get(base_uri: str, token: str) -> List[Dict]:
         offset = len(results)
         api_endpoint = f"{api_endpoint}?order='asc'&offset={offset}"
         response = call_snipeit_api(api_endpoint, base_uri, token)
-        results.extend(response['rows'])
+        results.extend(response["rows"])
 
-        total = response['total']
+        total = response["total"]
         results_count = len(results)
         if results_count >= total:
             break
@@ -45,7 +46,7 @@ def load_users(
     load(
         neo4j_session,
         SnipeitTenantSchema(),
-        [{'id': common_job_parameters["TENANT_ID"]}],
+        [{"id": common_job_parameters["TENANT_ID"]}],
         lastupdated=common_job_parameters["UPDATE_TAG"],
     )
 
@@ -60,7 +61,9 @@ def load_users(
 
 @timeit
 def cleanup(neo4j_session: neo4j.Session, common_job_parameters: Dict) -> None:
-    GraphJob.from_node_schema(SnipeitUserSchema(), common_job_parameters).run(neo4j_session)
+    GraphJob.from_node_schema(SnipeitUserSchema(), common_job_parameters).run(
+        neo4j_session,
+    )
 
 
 @timeit

cartography/intel/snipeit/util.py

@@ -12,17 +12,22 @@ _TIMEOUT = (60, 60)
 
 
 @timeit
-def call_snipeit_api(api_and_parameters: str, base_uri: str, token: str) -> Dict[str, Any]:
+def call_snipeit_api(
+    api_and_parameters: str,
+    base_uri: str,
+    token: str,
+) -> Dict[str, Any]:
     uri = base_uri + api_and_parameters
     try:
         logger.debug(
-            "SnipeIT: Get %s", uri,
+            "SnipeIT: Get %s",
+            uri,
         )
         response = requests.get(
             uri,
             headers={
-                'Accept': 'application/json',
-                'Authorization': f'Bearer {token}',
+                "Accept": "application/json",
+                "Authorization": f"Bearer {token}",
             },
             timeout=_TIMEOUT,
         )

cartography/models/aws/apigateway.py

@@ -12,36 +12,40 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class APIGatewayRestAPINodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id', extra_index=True)
-    createddate: PropertyRef = PropertyRef('createdDate')
-    version: PropertyRef = PropertyRef('version')
-    minimumcompressionsize: PropertyRef = PropertyRef('minimumCompressionSize')
-    disableexecuteapiendpoint: PropertyRef = PropertyRef('disableExecuteApiEndpoint')
-    region: PropertyRef = PropertyRef('region', set_in_kwargs=True)
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    anonymous_access: PropertyRef = PropertyRef('anonymous_access')
-    anonymous_actions: PropertyRef = PropertyRef('anonymous_actions')
+    id: PropertyRef = PropertyRef("id", extra_index=True)
+    createddate: PropertyRef = PropertyRef("createdDate")
+    version: PropertyRef = PropertyRef("version")
+    minimumcompressionsize: PropertyRef = PropertyRef("minimumCompressionSize")
+    disableexecuteapiendpoint: PropertyRef = PropertyRef("disableExecuteApiEndpoint")
+    region: PropertyRef = PropertyRef("region", set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    anonymous_access: PropertyRef = PropertyRef("anonymous_access")
+    anonymous_actions: PropertyRef = PropertyRef("anonymous_actions")
 
 
 @dataclass(frozen=True)
-class APIGatewayRestAPIToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class APIGatewayRestAPIToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:APIGatewayRestAPI)<-[:RESOURCE]-(:AWSAccount)
-class APIGatewayRestAPIToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class APIGatewayRestAPIToAWSAccountRel(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: APIGatewayRestAPIToAwsAccountRelProperties = APIGatewayRestAPIToAwsAccountRelProperties()
+    properties: APIGatewayRestAPIToAWSAccountRelRelProperties = (
+        APIGatewayRestAPIToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class APIGatewayRestAPISchema(CartographyNodeSchema):
-    label: str = 'APIGatewayRestAPI'
+    label: str = "APIGatewayRestAPI"
     properties: APIGatewayRestAPINodeProperties = APIGatewayRestAPINodeProperties()
-    sub_resource_relationship: APIGatewayRestAPIToAWSAccount = APIGatewayRestAPIToAWSAccount()
+    sub_resource_relationship: APIGatewayRestAPIToAWSAccountRel = (
+        APIGatewayRestAPIToAWSAccountRel()
+    )

cartography/models/aws/apigatewaycertificate.py

@@ -13,54 +13,60 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class APIGatewayClientCertificateNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('clientCertificateId')
-    createddate: PropertyRef = PropertyRef('createdDate')
-    expirationdate: PropertyRef = PropertyRef('expirationDate')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("clientCertificateId")
+    createddate: PropertyRef = PropertyRef("createdDate")
+    expirationdate: PropertyRef = PropertyRef("expirationDate")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class APIGatewayClientCertificateToStageRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class APIGatewayClientCertificateToStageRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class CertToStageRelProps(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class CertToStageRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:APIGatewayStage)-[:HAS_CERTIFICATE]->(:APIGatewayClientCertificate)
-class APIGatewayClientCertificateToStage(CartographyRelSchema):
-    target_node_label: str = 'APIGatewayStage'
+class APIGatewayClientCertificateToStageRel(CartographyRelSchema):
+    target_node_label: str = "APIGatewayStage"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('stageArn')},
+        {"id": PropertyRef("stageArn")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS_CERTIFICATE"
-    properties: CertToStageRelProps = CertToStageRelProps()
+    properties: CertToStageRelProperties = CertToStageRelProperties()
 
 
 @dataclass(frozen=True)
-class CertToAccountRelProps(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class CertToAccountRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:APIGatewayClientCertificate)<-[:RESOURCE]-(:AWSAccount)
-class APIGatewayClientCertificateToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class APIGatewayClientCertificateToAWSAccountRel(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: CertToAccountRelProps = CertToAccountRelProps()
+    properties: CertToAccountRelProperties = CertToAccountRelProperties()
 
 
 @dataclass(frozen=True)
 class APIGatewayClientCertificateSchema(CartographyNodeSchema):
-    label: str = 'APIGatewayClientCertificate'
-    properties: APIGatewayClientCertificateNodeProperties = APIGatewayClientCertificateNodeProperties()
-    sub_resource_relationship: APIGatewayClientCertificateToAWSAccount = APIGatewayClientCertificateToAWSAccount()
-    other_relationships: OtherRelationships = OtherRelationships([APIGatewayClientCertificateToStage()])
+    label: str = "APIGatewayClientCertificate"
+    properties: APIGatewayClientCertificateNodeProperties = (
+        APIGatewayClientCertificateNodeProperties()
+    )
+    sub_resource_relationship: APIGatewayClientCertificateToAWSAccountRel = (
+        APIGatewayClientCertificateToAWSAccountRel()
+    )
+    other_relationships: OtherRelationships = OtherRelationships(
+        [APIGatewayClientCertificateToStageRel()],
+    )

cartography/models/aws/apigatewayresource.py

@@ -13,50 +13,58 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class APIGatewayResourceNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    path: PropertyRef = PropertyRef('path')
-    pathpart: PropertyRef = PropertyRef('pathPart')
-    parentid: PropertyRef = PropertyRef('parentId')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    path: PropertyRef = PropertyRef("path")
+    pathpart: PropertyRef = PropertyRef("pathPart")
+    parentid: PropertyRef = PropertyRef("parentId")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class APIGatewayResourceToRestAPIRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class APIGatewayResourceToRestAPIRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:APIGatewayResource)<-[:RESOURCE]-(:APIGatewayRestAPI)
-class APIGatewayResourceToRestAPI(CartographyRelSchema):
-    target_node_label: str = 'APIGatewayRestAPI'
+class APIGatewayResourceToRestAPIRel(CartographyRelSchema):
+    target_node_label: str = "APIGatewayRestAPI"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('apiId')},
+        {"id": PropertyRef("apiId")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: APIGatewayResourceToRestAPIRelProperties = APIGatewayResourceToRestAPIRelProperties()
+    properties: APIGatewayResourceToRestAPIRelRelProperties = (
+        APIGatewayResourceToRestAPIRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class APIGatewayResourceToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class APIGatewayResourceToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:APIGatewayResource)<-[:RESOURCE]-(:AWSAccount)
-class APIGatewayResourceToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class APIGatewayResourceToAWSAccountRel(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: APIGatewayResourceToAwsAccountRelProperties = APIGatewayResourceToAwsAccountRelProperties()
+    properties: APIGatewayResourceToAWSAccountRelRelProperties = (
+        APIGatewayResourceToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class APIGatewayResourceSchema(CartographyNodeSchema):
-    label: str = 'APIGatewayResource'
+    label: str = "APIGatewayResource"
     properties: APIGatewayResourceNodeProperties = APIGatewayResourceNodeProperties()
-    sub_resource_relationship: APIGatewayResourceToAWSAccount = APIGatewayResourceToAWSAccount()
-    other_relationships: OtherRelationships = OtherRelationships([APIGatewayResourceToRestAPI()])
+    sub_resource_relationship: APIGatewayResourceToAWSAccountRel = (
+        APIGatewayResourceToAWSAccountRel()
+    )
+    other_relationships: OtherRelationships = OtherRelationships(
+        [APIGatewayResourceToRestAPIRel()],
+    )

cartography/models/aws/apigatewaystage.py

@@ -13,55 +13,63 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class APIGatewayStageNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('arn')
-    stagename: PropertyRef = PropertyRef('stageName')
-    createddate: PropertyRef = PropertyRef('createdDate')
-    deploymentid: PropertyRef = PropertyRef('deploymentId')
-    clientcertificateid: PropertyRef = PropertyRef('clientCertificateId')
-    cacheclusterenabled: PropertyRef = PropertyRef('cacheClusterEnabled')
-    cacheclusterstatus: PropertyRef = PropertyRef('cacheClusterStatus')
-    tracingenabled: PropertyRef = PropertyRef('tracingEnabled')
-    webaclarn: PropertyRef = PropertyRef('webAclArn')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("arn")
+    stagename: PropertyRef = PropertyRef("stageName")
+    createddate: PropertyRef = PropertyRef("createdDate")
+    deploymentid: PropertyRef = PropertyRef("deploymentId")
+    clientcertificateid: PropertyRef = PropertyRef("clientCertificateId")
+    cacheclusterenabled: PropertyRef = PropertyRef("cacheClusterEnabled")
+    cacheclusterstatus: PropertyRef = PropertyRef("cacheClusterStatus")
+    tracingenabled: PropertyRef = PropertyRef("tracingEnabled")
+    webaclarn: PropertyRef = PropertyRef("webAclArn")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
-class APIGatewayStageToRestAPIRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class APIGatewayStageToRestAPIRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:APIGatewayStage)<-[:ASSOCIATED_WITH]-(:APIGatewayRestAPI)
-class APIGatewayStageToRestAPI(CartographyRelSchema):
-    target_node_label: str = 'APIGatewayRestAPI'
+class APIGatewayStageToRestAPIRel(CartographyRelSchema):
+    target_node_label: str = "APIGatewayRestAPI"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('apiId')},
+        {"id": PropertyRef("apiId")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "ASSOCIATED_WITH"
-    properties: APIGatewayStageToRestAPIRelProperties = APIGatewayStageToRestAPIRelProperties()
+    properties: APIGatewayStageToRestAPIRelRelProperties = (
+        APIGatewayStageToRestAPIRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
-class APIGatewayStageToAwsAccountRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class APIGatewayStageToAWSAccountRelRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:APIGatewayStage)<-[:RESOURCE]-(:AWSAccount)
-class APIGatewayStageToAWSAccount(CartographyRelSchema):
-    target_node_label: str = 'AWSAccount'
+class APIGatewayStageToAWSAccountRel(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: APIGatewayStageToAwsAccountRelProperties = APIGatewayStageToAwsAccountRelProperties()
+    properties: APIGatewayStageToAWSAccountRelRelProperties = (
+        APIGatewayStageToAWSAccountRelRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class APIGatewayStageSchema(CartographyNodeSchema):
-    label: str = 'APIGatewayStage'
+    label: str = "APIGatewayStage"
     properties: APIGatewayStageNodeProperties = APIGatewayStageNodeProperties()
-    sub_resource_relationship: APIGatewayStageToAWSAccount = APIGatewayStageToAWSAccount()
-    other_relationships: OtherRelationships = OtherRelationships([APIGatewayStageToRestAPI()])
+    sub_resource_relationship: APIGatewayStageToAWSAccountRel = (
+        APIGatewayStageToAWSAccountRel()
+    )
+    other_relationships: OtherRelationships = OtherRelationships(
+        [APIGatewayStageToRestAPIRel()],
+    )