cartography 0.101.0rc2__tar.gz → 0.101.1rc2__tar.gz

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/.github/workflows/ossf-scorecard.yml

@@ -57,6 +57,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
         with:
           sarif_file: results.sarif

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
     -   id: flake8
 -   repo: https://github.com/hhatto/autopep8
@@ -39,7 +39,7 @@ repos:
     -   id: reorder-python-imports
         args: [--py3-plus]
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.15.0
     hooks:
     -   id: mypy
         additional_dependencies:

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartography
-Version: 0.101.0rc2
+Version: 0.101.1rc2
 Summary: Explore assets and their relationships across your technical infrastructure.
 Maintainer: Cartography Contributors
 License: apache2
@@ -59,10 +59,10 @@ Requires-Dist: moto; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest>=6.2.4; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
-Requires-Dist: pytest-cov==6.0.0; extra == "dev"
+Requires-Dist: pytest-cov==6.1.1; extra == "dev"
 Requires-Dist: pytest-rerunfailures; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
-Requires-Dist: types-requests<2.32.0.20250307; extra == "dev"
+Requires-Dist: types-requests<2.32.0.20250329; extra == "dev"
 Dynamic: license-file
 
 ![Cartography](docs/root/images/logo-horizontal.png)
@@ -182,6 +182,7 @@ Get started with our [developer documentation](https://cartography-cncf.github.i
 1. [MessageBird](https://messagebird.com)
 1. [Cloudanix](https://www.cloudanix.com/)
 1. [Corelight](https://www.corelight.com/)
+1. [SubImage](https://subimage.io)
 1. {Your company here} :-)
 
 If your organization uses Cartography, please file a PR and update this list. Say hi on Slack too!

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/README.md

@@ -115,6 +115,7 @@ Get started with our [developer documentation](https://cartography-cncf.github.i
 1. [MessageBird](https://messagebird.com)
 1. [Cloudanix](https://www.cloudanix.com/)
 1. [Corelight](https://www.corelight.com/)
+1. [SubImage](https://subimage.io)
 1. {Your company here} :-)
 
 If your organization uses Cartography, please file a PR and update this list. Say hi on Slack too!

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.101.0rc2'
-__version_tuple__ = version_tuple = (0, 101, 0)
+__version__ = version = '0.101.1rc2'
+__version_tuple__ = version_tuple = (0, 101, 1)

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/data/indexes.cypher

@@ -65,9 +65,6 @@ CREATE INDEX IF NOT EXISTS FOR (n:AccountAccessKey) ON (n.accesskeyid);
 CREATE INDEX IF NOT EXISTS FOR (n:AccountAccessKey) ON (n.lastupdated);
 CREATE INDEX IF NOT EXISTS FOR (n:AutoScalingGroup) ON (n.arn);
 CREATE INDEX IF NOT EXISTS FOR (n:AutoScalingGroup) ON (n.lastupdated);
-CREATE INDEX IF NOT EXISTS FOR (n:CrowdstrikeHost) ON (n.id);
-CREATE INDEX IF NOT EXISTS FOR (n:CrowdstrikeHost) ON (n.instance_id);
-CREATE INDEX IF NOT EXISTS FOR (n:CrowdstrikeHost) ON (n.lastupdated);
 CREATE INDEX IF NOT EXISTS FOR (n:CVE) ON (n.id);
 CREATE INDEX IF NOT EXISTS FOR (n:CVE) ON (n.lastupdated);
 CREATE INDEX IF NOT EXISTS FOR (n:Dependency) ON (n.id);

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/data/jobs/cleanup/crowdstrike_import_cleanup.json

@@ -5,11 +5,6 @@
       "iterative": true,
       "iterationsize": 100
     },
-    {
-      "query": "MATCH (h:CrowdstrikeHost) WHERE h.lastupdated <> $UPDATE_TAG WITH h LIMIT $LIMIT_SIZE DETACH DELETE (h)",
-      "iterative": true,
-      "iterationsize": 100
-    },
     {
       "query": "MATCH (:CrowdstrikeFinding)<-[hc:HAS_CVE]-(:SpotlightVulnerability) WHERE hc.lastupdated <> $UPDATE_TAG WITH hc LIMIT $LIMIT_SIZE DELETE (hc)",
       "iterative": true,

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/intel/aws/ec2/launch_templates.py

@@ -2,6 +2,7 @@ import logging
 from typing import Any
 
 import boto3
+import botocore
 import neo4j
 
 from .util import get_botocore_config
@@ -36,18 +37,37 @@ def get_launch_template_versions(
     boto3_session: boto3.session.Session,
     region: str,
     launch_templates: list[dict[str, Any]],
-) -> list[dict[str, Any]]:
-    template_versions: list[dict[str, Any]] = []
+) -> tuple[list[dict[str, Any]], list[dict[str, Any]]]:
+    found_versions: list[dict[str, Any]] = []
+    found_templates: list[dict[str, Any]] = []
     for template in launch_templates:
         launch_template_id = template['LaunchTemplateId']
-        versions = get_launch_template_versions_by_template(boto3_session, launch_template_id, region)
-        template_versions.extend(versions)
-
-    return template_versions
+        try:
+            versions = get_launch_template_versions_by_template(
+                boto3_session,
+                launch_template_id,
+                region,
+            )
+            # If the call succeeded, the template still exists.
+            # Add it and its versions (list might be empty if no versions exist).
+            found_templates.append(template)
+            found_versions.extend(versions)
+        except botocore.exceptions.ClientError as e:
+            if e.response['Error']['Code'] == 'InvalidLaunchTemplateId.NotFound':
+                logger.warning(
+                    "Launch template %s no longer exists in region %s, skipping.",
+                    launch_template_id, region,
+                )
+                # Skip this template, don't add it or its versions
+                continue
+            else:
+                # Re-raise any other client error
+                raise
+
+    return found_versions, found_templates
 
 
 @timeit
-@aws_handle_regions
 def get_launch_template_versions_by_template(
         boto3_session: boto3.session.Session,
         launch_template_id: str,
@@ -56,8 +76,8 @@ def get_launch_template_versions_by_template(
     client = boto3_session.client('ec2', region_name=region, config=get_botocore_config())
     v_paginator = client.get_paginator('describe_launch_template_versions')
     template_versions = []
-    for versions in v_paginator.paginate(LaunchTemplateId=launch_template_id):
-        template_versions.extend(versions['LaunchTemplateVersions'])
+    for versions_page in v_paginator.paginate(LaunchTemplateId=launch_template_id):
+        template_versions.extend(versions_page['LaunchTemplateVersions'])
     return template_versions
 
 
@@ -156,10 +176,12 @@ def sync_ec2_launch_templates(
     for region in regions:
         logger.info(f"Syncing launch templates for region '{region}' in account '{current_aws_account_id}'.")
         templates = get_launch_templates(boto3_session, region)
-        versions = get_launch_template_versions(boto3_session, region, templates)
-        templates = transform_launch_templates(templates)
-        load_launch_templates(neo4j_session, templates, region, current_aws_account_id, update_tag)
-        versions = transform_launch_template_versions(versions)
-        load_launch_template_versions(neo4j_session, versions, region, current_aws_account_id, update_tag)
+        versions, found_templates = get_launch_template_versions(boto3_session, region, templates)
+
+        # Transform and load only the templates that were found to exist
+        transformed_templates = transform_launch_templates(found_templates)
+        load_launch_templates(neo4j_session, transformed_templates, region, current_aws_account_id, update_tag)
+        transformed_versions = transform_launch_template_versions(versions)
+        load_launch_template_versions(neo4j_session, transformed_versions, region, current_aws_account_id, update_tag)
 
     cleanup(neo4j_session, common_job_parameters)

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/intel/crowdstrike/__init__.py

@@ -1,11 +1,14 @@
 import logging
+from typing import Any
 
 import neo4j
 
 from cartography.config import Config
+from cartography.graph.job import GraphJob
 from cartography.intel.crowdstrike.endpoints import sync_hosts
 from cartography.intel.crowdstrike.spotlight import sync_vulnerabilities
 from cartography.intel.crowdstrike.util import get_authorization
+from cartography.models.crowdstrike.hosts import CrowdstrikeHostSchema
 from cartography.stats import get_stats_client
 from cartography.util import merge_module_sync_metadata
 from cartography.util import run_cleanup_job
@@ -50,11 +53,7 @@ def start_crowdstrike_ingestion(
         config.update_tag,
         authorization,
     )
-    run_cleanup_job(
-        "crowdstrike_import_cleanup.json",
-        neo4j_session,
-        common_job_parameters,
-    )
+    cleanup(neo4j_session, common_job_parameters)
 
     group_id = "public"
     if config.crowdstrike_api_url:
@@ -67,3 +66,16 @@ def start_crowdstrike_ingestion(
         update_tag=config.update_tag,
         stat_handler=stat_handler,
     )
+
+
+@timeit
+def cleanup(neo4j_session: neo4j.Session, common_job_parameters: dict[str, Any]) -> None:
+    logger.info("Running Crowdstrike cleanup")
+    GraphJob.from_node_schema(CrowdstrikeHostSchema(), common_job_parameters).run(neo4j_session)
+
+    # Cleanup other crowdstrike assets not handled by the data model
+    run_cleanup_job(
+        "crowdstrike_import_cleanup.json",
+        neo4j_session,
+        common_job_parameters,
+    )

cartography-0.101.1rc2/cartography/intel/crowdstrike/endpoints.py

@@ -0,0 +1,73 @@
+import logging
+from typing import Dict
+from typing import List
+
+import neo4j
+from falconpy.hosts import Hosts
+from falconpy.oauth2 import OAuth2
+
+from cartography.client.core.tx import load
+from cartography.models.crowdstrike.hosts import CrowdstrikeHostSchema
+from cartography.util import timeit
+
+logger = logging.getLogger(__name__)
+
+
+@timeit
+def sync_hosts(
+    neo4j_session: neo4j.Session,
+    update_tag: int,
+    authorization: OAuth2,
+) -> None:
+    client = Hosts(auth_object=authorization)
+    all_ids = get_host_ids(client)
+    for ids in all_ids:
+        host_data = get_hosts(client, ids)
+        load_host_data(neo4j_session, host_data, update_tag)
+
+
+@timeit
+def load_host_data(
+    neo4j_session: neo4j.Session,
+    data: List[Dict],
+    update_tag: int,
+) -> None:
+    """
+    Load Crowdstrike host data into Neo4j.
+    """
+    logger.info(f"Loading {len(data)} crowdstrike hosts.")
+    load(
+        neo4j_session,
+        CrowdstrikeHostSchema(),
+        data,
+        lastupdated=update_tag,
+    )
+
+
+def get_host_ids(client: Hosts, crowdstrikeapi_filter: str = '', crowdstrikeapi_limit: int = 5000) -> List[List[str]]:
+    ids = []
+    parameters = {"filter": crowdstrikeapi_filter, "limit": crowdstrikeapi_limit}
+    response = client.QueryDevicesByFilter(parameters=parameters)
+    body = response.get("body", {})
+    resources = body.get("resources", [])
+    if not resources:
+        logger.warning("No host IDs in QueryDevicesByFilter.")
+        return []
+    ids.append(resources)
+    offset = body.get("meta", {}).get("pagination", {}).get("offset")
+    while offset:
+        parameters["offset"] = offset
+        response = client.QueryDevicesByFilter(parameters=parameters)
+        body = response.get("body", {})
+        resources = body.get("resources", [])
+        if not resources:
+            break
+        ids.append(resources)
+        offset = body.get("meta", {}).get("pagination", {}).get("offset")
+    return ids
+
+
+def get_hosts(client: Hosts, ids: List[str]) -> List[Dict]:
+    response = client.GetDeviceDetails(ids=",".join(ids))
+    body = response.get("body", {})
+    return body.get("resources", [])

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/intel/gcp/__init__.py

@@ -3,6 +3,7 @@ import logging
 from collections import namedtuple
 from typing import Dict
 from typing import List
+from typing import Optional
 from typing import Set
 
 import googleapiclient.discovery
@@ -328,7 +329,7 @@ def _sync_multiple_projects(
 
 
 @timeit
-def get_gcp_credentials() -> GoogleCredentials:
+def get_gcp_credentials() -> Optional[GoogleCredentials]:
     """
     Gets access tokens for GCP API access.
     :param: None
@@ -338,6 +339,7 @@ def get_gcp_credentials() -> GoogleCredentials:
         # Explicitly use Application Default Credentials.
         # See https://google-auth.readthedocs.io/en/master/user-guide.html#application-default-credentials
         credentials, project_id = default()
+        return credentials
     except DefaultCredentialsError as e:
         logger.debug("Error occurred calling GoogleCredentials.get_application_default().", exc_info=True)
         logger.error(
@@ -349,7 +351,7 @@ def get_gcp_credentials() -> GoogleCredentials:
             ),
             e,
         )
-        return credentials
+    return None
 
 
 @timeit
@@ -367,6 +369,9 @@ def start_gcp_ingestion(neo4j_session: neo4j.Session, config: Config) -> None:
     }
 
     credentials = get_gcp_credentials()
+    if credentials is None:
+        logger.warning("Unable to initialize GCP credentials. Skipping module.")
+        return
 
     resources = _initialize_resources(credentials)
 

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/intel/gsuite/__init__.py

@@ -67,6 +67,14 @@ def start_gsuite_ingestion(neo4j_session: neo4j.Session, config: Config) -> None
 
     creds: OAuth2Credentials | ServiceAccountCredentials
     if config.gsuite_auth_method == 'delegated':  # Legacy delegated method
+        if config.gsuite_config is None or not os.path.isfile(config.gsuite_config):
+            logger.warning(
+                (
+                    "The GSuite config file is not set or is not a valid file."
+                    "Skipping GSuite ingestion."
+                ),
+            )
+            return
         logger.info('Attempting to authenticate to GSuite using legacy delegated method')
         try:
             creds = service_account.Credentials.from_service_account_file(

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/intel/kandji/devices.py

@@ -25,10 +25,34 @@ def get(kandji_base_uri: str, kandji_token: str) -> List[Dict[str, Any]]:
         'Authorization': f'Bearer {kandji_token}',
     }
 
+    offset = 0
+    limit = 300
+    params: dict[str, str | int] = {
+        "sort": "serial_number",
+        "limit": limit,
+        "offset": offset,
+    }
+
+    devices: List[Dict[str, Any]] = []
     session = Session()
-    req = session.get(api_endpoint, headers=headers, timeout=_TIMEOUT)
-    req.raise_for_status()
-    return req.json()
+    while True:
+        logger.debug("Kandji device offset: %s", offset)
+
+        params["offset"] = offset
+        response = session.get(api_endpoint, headers=headers, timeout=_TIMEOUT, params=params)
+        response.raise_for_status()
+
+        result = response.json()
+        # If no more result, we are done
+        if len(result) == 0:
+            break
+
+        devices.extend(result)
+
+        offset += limit
+
+    logger.debug("Kandji device count: %d", len(devices))
+    return devices
 
 
 @timeit

cartography-0.101.1rc2/cartography/models/crowdstrike/hosts.py

@@ -0,0 +1,49 @@
+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
+
+
+@dataclass(frozen=True)
+class CrowdstrikeHostNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef('device_id')
+    cid: PropertyRef = PropertyRef('cid')
+    instance_id: PropertyRef = PropertyRef('instance_id', extra_index=True)
+    serial_number: PropertyRef = PropertyRef('serial_number', extra_index=True)
+    status: PropertyRef = PropertyRef('status')
+    hostname: PropertyRef = PropertyRef('hostname')
+    machine_domain: PropertyRef = PropertyRef('machine_domain')
+    crowdstrike_first_seen: PropertyRef = PropertyRef('first_seen')
+    crowdstrike_last_seen: PropertyRef = PropertyRef('last_seen')
+    local_ip: PropertyRef = PropertyRef('local_ip')
+    external_ip: PropertyRef = PropertyRef('external_ip')
+    cpu_signature: PropertyRef = PropertyRef('cpu_signature')
+    bios_manufacturer: PropertyRef = PropertyRef('bios_manufacturer')
+    bios_version: PropertyRef = PropertyRef('bios_version')
+    mac_address: PropertyRef = PropertyRef('mac_address')
+    os_version: PropertyRef = PropertyRef('os_version')
+    os_build: PropertyRef = PropertyRef('os_build')
+    platform_id: PropertyRef = PropertyRef('platform_id')
+    platform_name: PropertyRef = PropertyRef('platform_name')
+    service_provider: PropertyRef = PropertyRef('service_provider')
+    service_provider_account_id: PropertyRef = PropertyRef('service_provider_account_id')
+    agent_version: PropertyRef = PropertyRef('agent_version')
+    system_manufacturer: PropertyRef = PropertyRef('system_manufacturer')
+    system_product_name: PropertyRef = PropertyRef('system_product_name')
+    product_type: PropertyRef = PropertyRef('product_type')
+    product_type_desc: PropertyRef = PropertyRef('product_type_desc')
+    provision_status: PropertyRef = PropertyRef('provision_status')
+    reduced_functionality_mode: PropertyRef = PropertyRef('reduced_functionality_mode')
+    kernel_version: PropertyRef = PropertyRef('kernel_version')
+    major_version: PropertyRef = PropertyRef('major_version')
+    minor_version: PropertyRef = PropertyRef('minor_version')
+    tags: PropertyRef = PropertyRef('tags')
+    modified_timestamp: PropertyRef = PropertyRef('modified_timestamp')
+    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class CrowdstrikeHostSchema(CartographyNodeSchema):
+    label: str = 'CrowdstrikeHost'
+    properties: CrowdstrikeHostNodeProperties = CrowdstrikeHostNodeProperties()

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography/stats.py

@@ -97,7 +97,7 @@ def set_stats_client(stats_client: StatsClient) -> None:
     """
     This is used to set the module level stats client configured to talk with a statsd host
     """
-    global _scoped_stats_client
+    global _scoped_stats_client  # noqa: F824
     _scoped_stats_client.set_stats_client(stats_client)
 
 

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartography
-Version: 0.101.0rc2
+Version: 0.101.1rc2
 Summary: Explore assets and their relationships across your technical infrastructure.
 Maintainer: Cartography Contributors
 License: apache2
@@ -59,10 +59,10 @@ Requires-Dist: moto; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest>=6.2.4; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
-Requires-Dist: pytest-cov==6.0.0; extra == "dev"
+Requires-Dist: pytest-cov==6.1.1; extra == "dev"
 Requires-Dist: pytest-rerunfailures; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
-Requires-Dist: types-requests<2.32.0.20250307; extra == "dev"
+Requires-Dist: types-requests<2.32.0.20250329; extra == "dev"
 Dynamic: license-file
 
 ![Cartography](docs/root/images/logo-horizontal.png)
@@ -182,6 +182,7 @@ Get started with our [developer documentation](https://cartography-cncf.github.i
 1. [MessageBird](https://messagebird.com)
 1. [Cloudanix](https://www.cloudanix.com/)
 1. [Corelight](https://www.corelight.com/)
+1. [SubImage](https://subimage.io)
 1. {Your company here} :-)
 
 If your organization uses Cartography, please file a PR and update this list. Say hi on Slack too!

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography.egg-info/SOURCES.txt

@@ -364,6 +364,8 @@ cartography/models/core/__init__.py
 cartography/models/core/common.py
 cartography/models/core/nodes.py
 cartography/models/core/relationships.py
+cartography/models/crowdstrike/__init__.py
+cartography/models/crowdstrike/hosts.py
 cartography/models/cve/__init__.py
 cartography/models/cve/cve.py
 cartography/models/cve/cve_feed.py
@@ -399,12 +401,12 @@ docs/build.sh
 docs/conf.py
 docs/requirements.txt
 docs/root/contact.md
-docs/root/index.rst
+docs/root/index.md
 docs/root/info.md
 docs/root/install.md
 docs/root/ops.md
 docs/root/dev/developer-guide.md
-docs/root/dev/index.rst
+docs/root/dev/index.md
 docs/root/dev/writing-analysis-jobs.md
 docs/root/dev/writing-intel-modules.md
 docs/root/images/accountsandrds.png
@@ -434,72 +436,72 @@ docs/root/images/selectnode.png
 docs/root/images/unencryptedcounts.png
 docs/root/images/unencryptedinstances.png
 docs/root/images/yourowntestmachine.png
-docs/root/modules/index.rst
 docs/root/modules/_cartography-metadata/schema.md
 docs/root/modules/aws/config.md
-docs/root/modules/aws/index.rst
+docs/root/modules/aws/index.md
 docs/root/modules/aws/permissions-mapping.md
 docs/root/modules/aws/schema.md
 docs/root/modules/azure/config.md
-docs/root/modules/azure/index.rst
+docs/root/modules/azure/index.md
 docs/root/modules/azure/schema.md
 docs/root/modules/bigfix/config.md
-docs/root/modules/bigfix/index.rst
+docs/root/modules/bigfix/index.md
 docs/root/modules/bigfix/schema.md
 docs/root/modules/crowdstrike/config.md
-docs/root/modules/crowdstrike/index.rst
+docs/root/modules/crowdstrike/index.md
 docs/root/modules/crowdstrike/schema.md
 docs/root/modules/cve/config.md
-docs/root/modules/cve/index.rst
+docs/root/modules/cve/index.md
 docs/root/modules/cve/schema.md
 docs/root/modules/digitalocean/config.md
-docs/root/modules/digitalocean/index.rst
+docs/root/modules/digitalocean/index.md
 docs/root/modules/digitalocean/schema.md
 docs/root/modules/duo/config.md
-docs/root/modules/duo/index.rst
+docs/root/modules/duo/index.md
 docs/root/modules/duo/schema.md
 docs/root/modules/gcp/config.md
-docs/root/modules/gcp/index.rst
+docs/root/modules/gcp/index.md
 docs/root/modules/gcp/schema.md
 docs/root/modules/github/config.md
-docs/root/modules/github/index.rst
+docs/root/modules/github/index.md
 docs/root/modules/github/schema.md
 docs/root/modules/gsuite/config.md
-docs/root/modules/gsuite/index.rst
+docs/root/modules/gsuite/index.md
 docs/root/modules/gsuite/schema.md
-docs/root/modules/jamf/index.rst
+docs/root/modules/jamf/index.md
 docs/root/modules/jamf/schema.md
 docs/root/modules/kandji/config.md
-docs/root/modules/kandji/index.rst
+docs/root/modules/kandji/index.md
 docs/root/modules/kandji/schema.md
 docs/root/modules/kubernetes/config.md
-docs/root/modules/kubernetes/index.rst
+docs/root/modules/kubernetes/index.md
 docs/root/modules/kubernetes/schema.md
 docs/root/modules/lastpass/config.md
-docs/root/modules/lastpass/index.rst
+docs/root/modules/lastpass/index.md
 docs/root/modules/lastpass/schema.md
 docs/root/modules/oci/config.md
-docs/root/modules/oci/index.rst
+docs/root/modules/oci/index.md
 docs/root/modules/oci/schema.md
 docs/root/modules/okta/config.md
-docs/root/modules/okta/index.rst
+docs/root/modules/okta/index.md
 docs/root/modules/okta/schema.md
 docs/root/modules/pagerduty/config.md
-docs/root/modules/pagerduty/index.rst
+docs/root/modules/pagerduty/index.md
 docs/root/modules/pagerduty/schema.md
 docs/root/modules/semgrep/config.md
-docs/root/modules/semgrep/index.rst
+docs/root/modules/semgrep/index.md
 docs/root/modules/semgrep/schema.md
 docs/root/modules/snipeit/config.md
-docs/root/modules/snipeit/index.rst
+docs/root/modules/snipeit/index.md
 docs/root/modules/snipeit/schema.md
 docs/root/usage/applications.md
 docs/root/usage/drift-detect.md
-docs/root/usage/index.rst
+docs/root/usage/index.md
 docs/root/usage/samplequeries.md
 docs/root/usage/schema.md
 docs/root/usage/tutorial.md
 tests/__init__.py
+tests/utils.py
 tests/data/__init__.py
 tests/data/aws/__init__.py
 tests/data/aws/apigateway.py
@@ -829,6 +831,8 @@ tests/unit/cartography/intel/aws/test_inspector.py
 tests/unit/cartography/intel/aws/test_permission_relationships.py
 tests/unit/cartography/intel/aws/test_resourcegroupstaggingapi.py
 tests/unit/cartography/intel/aws/test_util.py
+tests/unit/cartography/intel/aws/ec2/__init__.py
+tests/unit/cartography/intel/aws/ec2/test_launch_templates.py
 tests/unit/cartography/intel/aws/iam/__init__.py
 tests/unit/cartography/intel/aws/iam/test_iam.py
 tests/unit/cartography/intel/aws/iam/test_principal_policies.py
@@ -842,6 +846,7 @@ tests/unit/cartography/intel/github/test_repos.py
 tests/unit/cartography/intel/github/test_teams.py
 tests/unit/cartography/intel/gsuite/__init__.py
 tests/unit/cartography/intel/gsuite/test_api.py
+tests/unit/cartography/intel/kandji/test_devices.py
 tests/unit/cartography/intel/oci/__init__.py
 tests/unit/cartography/intel/oci/test_iam.py
 tests/unit/cartography/intel/oci/test_organizations.py

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/cartography.egg-info/requires.txt

@@ -36,7 +36,7 @@ moto
 pre-commit
 pytest>=6.2.4
 pytest-mock
-pytest-cov==6.0.0
+pytest-cov==6.1.1
 pytest-rerunfailures
 types-PyYAML
-types-requests<2.32.0.20250307
+types-requests<2.32.0.20250329

{cartography-0.101.0rc2 → cartography-0.101.1rc2}/docs/build.sh

@@ -31,5 +31,4 @@ rsync -av "${SCRIPT_DIR}"/root/ "${SCRIPT_DIR}"/conf.py "${GENERATED_RST_DIR}"
 
 export EXIT_ON_BAD_CONFIG='false'
 set -x
-sphinx-autogen -o "${GENERATED_RST_DIR}" "${GENERATED_RST_DIR}"/*.rst
 sphinx-build -j auto --keep-going -b html "${GENERATED_RST_DIR}" "${DOCS_OUTPUT_DIR}"