cartography 0.101.0rc2__tar.gz → 0.101.1rc1__tar.gz

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/.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.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartography
-Version: 0.101.0rc2
+Version: 0.101.1rc1
 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.1rc1}/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.1rc1}/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.1rc1'
+__version_tuple__ = version_tuple = (0, 101, 1)

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/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
@@ -56,8 +57,15 @@ 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'])
+    try:
+        for versions in v_paginator.paginate(LaunchTemplateId=launch_template_id):
+            template_versions.extend(versions['LaunchTemplateVersions'])
+    except botocore.exceptions.ClientError as e:
+        error_code = e.response['Error']['Code']
+        if error_code == 'InvalidLaunchTemplateId.NotFound':
+            logger.warning("Launch template %s no longer exists in region %s", launch_template_id, region)
+        else:
+            raise
     return template_versions
 
 

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

@@ -34,8 +34,8 @@ def load_host_data(
     UNWIND $Hosts AS host
         MERGE (h:CrowdstrikeHost{id: host.device_id})
         ON CREATE SET h.cid = host.cid,
-            h.cid = host.cid,
             h.instance_id = host.instance_id,
+            h.serial_number = host.serial_number,
             h.firstseen = timestamp()
         SET h.status = host.status,
             h.hostname = host.hostname,

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/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.1rc1}/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.1rc1}/cartography.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartography
-Version: 0.101.0rc2
+Version: 0.101.1rc1
 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.1rc1}/cartography.egg-info/SOURCES.txt

@@ -399,12 +399,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 +434,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 +829,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

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/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.1rc1}/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}"

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/conf.py

@@ -38,11 +38,11 @@ def setup(app):
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    "sphinx.ext.autosectionlabel",
     "sphinx.ext.extlinks",
     "sphinx.ext.ifconfig",
     "sphinx.ext.githubpages",
-    "sphinx_mdinclude",
+    "sphinxcontrib.mermaid",
+    "myst_parser",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -231,3 +231,12 @@ html_search_language = "en"
 # i18n
 locale_dirs = ['locale/']
 gettext_compact = False
+
+# myst_parser
+myst_enable_extensions = [
+    "linkify",
+    "colon_fence",
+]
+myst_linkify_fuzzy_links = False
+suppress_warnings = ["myst.header"]
+myst_fence_as_directive = ["mermaid"]

cartography-0.101.1rc1/docs/requirements.txt

@@ -0,0 +1,4 @@
+sphinx==8.1.3
+sphinx-material==0.0.36
+myst-parser[linkify]==4.0.1
+sphinxcontrib-mermaid==1.0.0

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/dev/developer-guide.md

@@ -1,6 +1,6 @@
 # Cartography Developer Guide
 
-## Develepment using a Python venv
+## Development using a Python venv
 
 ### Running the source code
 
@@ -43,7 +43,9 @@ If you prefer docker instead, skip this and scroll down to [these instructions](
     - `make test_lint` runs [pre-commit](https://pre-commit.com) linting against the codebase.
     - `make test_unit` runs the unit test suite.
 
-    ⚠️ Important!  The below commands will **DELETE ALL NODES** on your local Neo4j instance as part of our testing procedure. Only run any of the below commands if you are ok with this. ⚠️
+    :::{warning}
+    The below commands will **DELETE ALL NODES** on your local Neo4j instance as part of our testing procedure. Only run any of the below commands if you are ok with this.
+    :::
 
     - `make test_integration` runs the integration test suite.
     For more granular testing, you can invoke `pytest` directly:
@@ -101,7 +103,7 @@ We include a dev.Dockerfile that can help streamline common dev tasks. It is dif
 
 To use it, build dev.Dockerfile with
 ```bash
-cd /path/to/cartography/repo
+cd /path/to/cartography/repo  # We are assuming that you've already cloned the cartography source code
 docker build -t cartography-cncf/cartography-dev -f dev.Dockerfile ./
 ```
 

cartography-0.101.1rc1/docs/root/dev/index.md

@@ -0,0 +1,7 @@
+# Developer docs
+
+```{toctree}
+developer-guide
+writing-analysis-jobs
+writing-intel-modules
+```

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/dev/writing-intel-modules.md

@@ -253,7 +253,7 @@ On every cartography node and relationship, we set the `lastupdated` field to th
 
 #### One-to-many relationships
 We can use the Cartography data model to represent one-to-many relationships. For example, an AWS IAM instance profile
-([API docs]()) maps to one or more roles.
+([API docs](https://docs.aws.amazon.com/IAM/latest/APIReference/API_InstanceProfile.html)) maps to one or more roles.
 
 An example instance profile object looks like this:
 
@@ -289,53 +289,53 @@ Note that the `Roles` field in this data object is a list of objects (and that t
 
 Here's how to represent this in the Cartography data model:
 
-1. Transform the data so that `Roles` becomes a list of IDs and not dicts. Here we will use ARNs. The result should be:
-
-```python
-TRANSFORMED_INSTANCE_PROFILES = [
-    {
-        "Path": "/",
-        "InstanceProfileName": "my-instance-profile",
-        "InstanceProfileId": "AIPA4SD",
-        "Arn": "arn:aws:iam::1234:instance-profile/my-instance-profile",
-        "CreateDate": datetime.datetime(2024, 12, 21, 23, 54, 16),
-        "Roles": [
-            "arn:aws:iam::1234:role/role1",
-            "arn:aws:iam::1234:role/role2",
-        ]
-    },
-]
-```
-
-1. Define the InstanceProfile node (irrelevant fields omitted for brevity):
-
-```python
-@dataclass(frozen=True)
-class InstanceProfileSchema(CartographyNodeSchema):
-    label: str = 'AWSInstanceProfile'
-    properties: ...
-    sub_resource_relationship: ...
-    other_relationships: OtherRelationships = OtherRelationships([
-        InstanceProfileToAWSRole(),
-    ])
-```
-
-1. Define its association with AWS roles
-
-```python
-@dataclass(frozen=True)
-class InstanceProfileToAWSRole(CartographyRelSchema):
-    target_node_label: str = 'AWSRole'
-    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'arn': PropertyRef('Roles', one_to_many=True)},
-    )
-    direction: LinkDirection = LinkDirection.OUTWARD
-    rel_label: str = "ASSOCIATED_WITH"
-    properties: ...
-```
-
-The key part is setting `one_to_many=True` in the PropertyRef for the TargetNodeMatcher. This instructs the data model
-to look for AWSRoles in the graph where their `arn` field is in the list pointed to by the `Roles` key on the data dict.
+  1. Transform the data so that `Roles` becomes a list of IDs and not dicts. Here we will use ARNs. The result should be:
+
+      ```python
+      TRANSFORMED_INSTANCE_PROFILES = [
+          {
+              "Path": "/",
+              "InstanceProfileName": "my-instance-profile",
+              "InstanceProfileId": "AIPA4SD",
+              "Arn": "arn:aws:iam::1234:instance-profile/my-instance-profile",
+              "CreateDate": datetime.datetime(2024, 12, 21, 23, 54, 16),
+              "Roles": [
+                  "arn:aws:iam::1234:role/role1",
+                  "arn:aws:iam::1234:role/role2",
+              ]
+          },
+      ]
+      ```
+
+  1. Define the InstanceProfile node (irrelevant fields omitted for brevity):
+
+      ```python
+      @dataclass(frozen=True)
+      class InstanceProfileSchema(CartographyNodeSchema):
+          label: str = 'AWSInstanceProfile'
+          properties: ...
+          sub_resource_relationship: ...
+          other_relationships: OtherRelationships = OtherRelationships([
+              InstanceProfileToAWSRole(),
+          ])
+      ```
+
+  1. Define its association with AWS roles
+
+      ```python
+      @dataclass(frozen=True)
+      class InstanceProfileToAWSRole(CartographyRelSchema):
+          target_node_label: str = 'AWSRole'
+          target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+              {'arn': PropertyRef('Roles', one_to_many=True)},
+          )
+          direction: LinkDirection = LinkDirection.OUTWARD
+          rel_label: str = "ASSOCIATED_WITH"
+          properties: ...
+      ```
+
+        The key part is setting `one_to_many=True` in the PropertyRef for the TargetNodeMatcher. This instructs the data model
+        to look for AWSRoles in the graph where their `arn` field is in the list pointed to by the `Roles` key on the data dict.
 
 Now we can use the same steps described above in this doc to finish data ingestion.
 
@@ -390,12 +390,12 @@ with every change!
 - Before making tests, read through and follow the setup steps in [the Cartography developer guide](developer-guide.html).
 
 - Add fake data for testing at `tests/data`. We can see
-the GCP VPC example [here](https://github.com/lyft/cartography/blob/0652c2b6dede589e805156925353bffc72da6c2b/tests/data/gcp/compute.py#L2).
+the AWS EC2 instance example [here](https://github.com/cartography-cncf/cartography/blob/d42253b9223ced996fa9c51dee3a51942e0a08f4/tests/data/aws/ec2/instances.py#L4).
 
-- Add unit tests to `tests/unit/cartography/intel`. See this [example](https://github.com/lyft/cartography/blob/828ed600f2b14adae9d0b78ef82de0acaf24b86a/tests/unit/cartography/intel/gcp/test_compute.py).
-  These tests ensure that `transform*` manipulates the data in expected ways.
+- If needed, add unit tests to `tests/unit/cartography/intel`. As seen in this GCP [example](https://github.com/lyft/cartography/blob/828ed600f2b14adae9d0b78ef82de0acaf24b86a/tests/unit/cartography/intel/gcp/test_compute.py),
+  these tests ensure that `transform*` manipulates the data in expected ways.
 
-- Add integration tests to  `tests/integration/cartography/intel`. See this [example](https://github.com/lyft/cartography/blob/828ed600f2b14adae9d0b78ef82de0acaf24b86a/tests/integration/cartography/intel/gcp/test_compute.py).
+- Add integration tests to  `tests/integration/cartography/intel`. See this AWS EC2 instance [example](https://github.com/cartography-cncf/cartography/blob/d42253b9223ced996fa9c51dee3a51942e0a08f4/tests/integration/cartography/intel/aws/ec2/test_ec2_instances.py#L17-L22).
   These tests assume that you have neo4j running at localhost:7687 with no password, and ensure that nodes loaded to the
   graph match your mock data.
 

cartography-0.101.1rc1/docs/root/index.md

@@ -0,0 +1,38 @@
+```{include} info.md
+```
+
+
+```{toctree}
+info
+```
+
+```{toctree}
+:caption: Basic Use
+:hidden: true
+
+install
+usage/index
+ops
+```
+
+```{toctree}
+:caption: Intel Modules
+:hidden: true
+:glob: true
+
+modules/*/index
+```
+
+```{toctree}
+:caption: Development Docs
+:hidden: true
+
+dev/index
+```
+
+```{toctree}
+:caption: Get In Touch
+:hidden: true
+
+contact
+```

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/info.md

@@ -4,7 +4,9 @@
 
 Cartography is a Python tool that consolidates infrastructure assets and the relationships between them in an intuitive graph view powered by a [Neo4j](https://www.neo4j.com) database.
 
-![example](images/accountsandrds.png)
+```{image} images/accountsandrds.png
+:target: _images/accountsandrds.png
+```
 
 # Why Cartography?
 

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/install.md

@@ -1,18 +1,30 @@
-# Install and Run Cartography On Test Machine
-
-.. _cartography-installation:
+# Quick start: Install and Run Cartography On Test Machine
 
 Time to set up a test machine to run Cartography.
 
 ## Option 1: Run docker-compose (preferred)
 
-This is the quickest way to get started (assuming docker does what it's supposed to do).
+This is the quickest way to get started: you will run a cartography cron job and a Neo4j docker container on your
+machine to pull data from AWS.
 
 ![dockercompose-flow.png](images/dockercompose-flow.png)
 
+1. Clone the Cartography repo to your machine.
+
+    ```bash
+    git clone git@github.com:cartography-cncf/cartography.git
+    ```
+
+    or
+
+    ```bash
+    git clone https://github.com/cartography-cncf/cartography
+    ```
+
 1. **Start up the Neo4j graph database.**
 
     ```bash
+    cd cartography
     docker-compose up -d
     ```
 

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/modules/_cartography-metadata/schema.md

@@ -1,7 +1,5 @@
 ## Cartography metadata schema
 
-.. _metadata_schema:
-
 Some Cartography sync jobs write nodes to convey information about the job itself. See https://github.com/lyft/cartography/issues/758 for more background on this.
 
 ### SyncMetadata:ModuleSyncMetadata

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/modules/aws/config.md

@@ -1,6 +1,5 @@
 ## AWS Configuration
 
-.. _aws_config:
 
 Follow these steps to analyze AWS assets with Cartography.
 

cartography-0.101.1rc1/docs/root/modules/aws/index.md

@@ -0,0 +1,7 @@
+# Amazon Web Services (AWS)
+
+```{toctree}
+config
+permissions-mapping
+schema
+```

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/modules/aws/schema.md

@@ -1,6 +1,5 @@
 ## AWS Schema
 
-.. _aws_schema:
 
 ### AWSAccount
 

{cartography-0.101.0rc2 → cartography-0.101.1rc1}/docs/root/modules/azure/config.md

@@ -1,7 +1,5 @@
 ## Azure Configuration
 
-.. _azure_config:
-
 Follow these steps to analyze Microsoft Azure assets with Cartography:
 
 1. Set up an Azure identity for Cartography to use, and ensure that this identity has the built-in Azure [Reader role](https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#reader) attached: