cartography 0.111.0__tar.gz → 0.112.0__tar.gz

cartography-0.112.0/.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Create a feature request to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+# Replace with title
+
+## Description
+> Describe your idea.  Please be detailed.  If a feature request, please
+> describe the desired behavior, what scenario it enables, and how it
+> would be used.
+
+
+## Motivation
+> Why is this feature needed? What problem does it solve or opportunity does it unlock?
+
+
+## Alternatives Considered
+> List other approaches or ideas considered, and why they were not chosen.
+
+
+## Relevant Links
+> Any extra documentation required to understand the issue.

cartography-0.112.0/.github/ISSUE_TEMPLATE/issue-report.md

@@ -0,0 +1,50 @@
+---
+name: Issue report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## <replace with one line description>
+
+### Expected behavior
+> Describe what should be happening instead of the bug, for example: Cartography should not crash, the expected value isn't returned, the data schema is wrong, etc.
+
+
+### Actual behavior
+> Describe what is actually happening.
+
+
+### To Reproduce
+> Steps to reproduce the behavior.  Provide all data and inputs required to reproduce the issue.
+
+
+### Logs
+> If applicable, copy and paste your console log with the failing stack trace.
+
+```
+put the logs here
+```
+
+
+### Screenshots
+> If applicable, add screenshots to help explain your problem.
+
+
+
+### Please complete the following information:
+>  - Cartography release version or commit hash [e.g. 0.12.0 or 95e8e11913e2a44a4d4682506d8364a638ceac69]
+
+
+>  - Python version: [e.g. 3.10.0]
+
+
+>  - OS (feel free to omit this if you don't think it's relevant to your issue): [e.g. Ubuntu bla bla, OSX bla bla]
+
+
+
+
+### Additional context
+> Add any other context about the problem here.

{cartography-0.111.0 → cartography-0.112.0}/.github/pull_request_template.md

@@ -21,3 +21,5 @@ If you are changing a node or relationship:
 
 If you are implementing a new intel module:
 - [ ] Use the NodeSchema [data model](https://cartography-cncf.github.io/cartography/dev/writing-intel-modules.html#defining-a-node).
+
+- [ ] Confirm that the linter actually passes (submitting a PR where the linter fails shows reviewers that you did not test your code and will delay your review).

{cartography-0.111.0 → cartography-0.112.0}/.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@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
         with:
           sarif_file: results.sarif

{cartography-0.111.0 → cartography-0.112.0}/.github/workflows/publish-to-ghcr-and-pypi.yml

@@ -19,7 +19,7 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"

{cartography-0.111.0 → cartography-0.112.0}/.github/workflows/sphinx.yml

@@ -31,7 +31,7 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"

{cartography-0.111.0 → cartography-0.112.0}/.github/workflows/test_suite.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
@@ -72,7 +72,7 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install uv
-        uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
+        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"

{cartography-0.111.0 → cartography-0.112.0}/AGENTS.md

@@ -31,9 +31,10 @@ This guide teaches you how to write intel modules for Cartography using the mode
 8. @Configuration and Credentials
 9. @Error Handling
 10. @Testing Your Module
-11. @Common Patterns and Examples
-12. @Troubleshooting Guide
-13. @Quick Reference
+11. @Refactoring Legacy Code to Data Model
+12. @Common Patterns and Examples
+13. @Troubleshooting Guide
+14. @Quick Reference
 
 ## 🚀 Quick Start: Copy an Existing Module {#quick-start}
 
@@ -235,12 +236,6 @@ def transform(api_result: dict[str, Any]) -> list[dict[str, Any]]:
             # Optional fields - use .get() with None default
             "name": user_data.get("name"),
             "last_login": user_data.get("last_login"),
-
-            # Convert timestamps if needed
-            "created_at": (
-                int(dt_parse.parse(user_data["created_at"]).timestamp() * 1000)
-                if user_data.get("created_at") else None
-            ),
         }
         result.append(transformed_user)
 
@@ -285,7 +280,7 @@ class YourServiceUserNodeProperties(CartographyNodeProperties):
 ```
 
 **PropertyRef Parameters:**
-- First parameter: Key in your data dict or kwarg name
+- First parameter: Key in your data dict or kwarg name. Use keys when you are ingesting a list of records. Use kwargs when you want to set the same value for all records in the list of records.
 - `extra_index=True`: Create database index for better query performance
 - `set_in_kwargs=True`: Value comes from kwargs passed to `load()`, not from individual records
 
@@ -831,27 +826,6 @@ def start_your_service_ingestion(neo4j_session: neo4j.Session, config: Config) -
 
 Follow these principles for robust error handling:
 
-### DO: Catch Specific Exceptions
-```python
-import requests
-
-
-def get_users(api_key: str) -> dict[str, Any]:
-    try:
-        response = requests.get(f"https://api.service.com/users", headers={"Authorization": f"Bearer {api_key}"})
-        response.raise_for_status()
-        return response.json()
-    except requests.exceptions.HTTPError as e:
-        if e.response.status_code == 401:
-            logger.error("Invalid API key")
-        elif e.response.status_code == 429:
-            logger.error("Rate limit exceeded")
-        raise
-    except requests.exceptions.RequestException as e:
-        logger.error(f"Network error: {e}")
-        raise
-```
-
 ### DON'T: Catch Base Exception
 ```python
 # ❌ Don't do this - makes debugging impossible
@@ -896,6 +870,10 @@ Neo4j 4+ supports native Python datetime objects and ISO 8601 formatted strings.
 
 ## 🧪 Testing Your Module {#testing}
 
+**Key Principle: Test outcomes, not implementation details.**
+
+Focus on verifying that data is written to the graph as expected, rather than testing internal function parameters or implementation details. Mock external dependencies (APIs, databases) when necessary, but avoid brittle parameter testing.
+
 ### Test Data
 
 Create mock data in `tests/data/your_service/`:
@@ -926,30 +904,7 @@ MOCK_USERS_RESPONSE = {
 
 ### Unit Tests
 
-(Optional) Test your transform functions in `tests/unit/cartography/intel/your_service/`:
-
-```python
-# tests/unit/cartography/intel/your_service/test_users.py
-from cartography.intel.your_service.users import transform
-from tests.data.your_service.users import MOCK_USERS_RESPONSE
-
-
-def test_transform_users():
-    result = transform(MOCK_USERS_RESPONSE)
-
-    assert len(result) == 2
-
-    alice = result[0]
-    assert alice["id"] == "user-123"
-    assert alice["email"] == "alice@example.com"
-    assert alice["name"] == "Alice Smith"
-    assert alice["is_admin"] is False
-    assert alice["last_login"] is not None  # Converted timestamp
-
-    bob = result[1]
-    assert bob["id"] == "user-456"
-    assert bob["last_login"] is None  # Handled missing data
-```
+Unit tests are only for testing smaller functions and verifying that the outputs are as expected.
 
 ### Integration Tests
 
@@ -1050,6 +1005,250 @@ def test_sync_users(mock_api, neo4j_session):
 - ❌ Data transformation logic
 - ❌ The function that is being tested
 
+## 🔄 Refactoring Legacy Code to Data Model {#refactoring-legacy}
+
+**IMPORTANT**: A critical task for AI agents is refactoring legacy Cartography code from handwritten Cypher queries to the modern data model approach. This section provides a step-by-step procedure to safely perform these refactors.
+
+### Overview
+
+Legacy Cartography modules use handwritten Cypher queries to create nodes and relationships. The modern approach uses declarative data models that automatically generate optimized queries. Refactoring improves maintainability, performance, and consistency.
+
+### 🚨 Step 1: Prevent Regressions (CRITICAL)
+
+**Before touching any code**, ensure you have comprehensive test coverage:
+
+#### 1a. Identify the Sync Function
+- Locate the main `sync_*()` function for the module (refer to [#sync-pattern](#sync-pattern))
+- This is usually named like `sync_ec2_instances()`, `sync_users()`, etc.
+- Example: `cartography.intel.aws.ec2.instances.sync()`
+
+#### 1b. Ensure Integration Test Exists
+- Check for integration tests in `tests/integration/cartography/intel/[module]/`
+- The test MUST call the sync function directly (refer to [#testing](#testing))
+- If no test exists, **CREATE IT FIRST** before any refactoring:
+
+```python
+# Example: tests/integration/cartography/intel/aws/ec2/test_instances.py
+from unittest.mock import patch
+import cartography.intel.aws.ec2.instances
+from tests.data.aws.ec2.instances import MOCK_INSTANCES_DATA
+from tests.integration.util import check_nodes, check_rels
+
+TEST_UPDATE_TAG = 123456789
+TEST_AWS_ACCOUNT_ID = "123456789012"
+
+@patch.object(cartography.intel.aws.ec2.instances, "get", return_value=MOCK_INSTANCES_DATA)
+def test_sync_ec2_instances(mock_get, neo4j_session):
+    """Test that EC2 instances sync correctly"""
+    # Act - Call the sync function
+    cartography.intel.aws.ec2.instances.sync(
+        neo4j_session,
+        boto3_session=None,  # Mocked
+        regions=["us-east-1"],
+        current_aws_account_id=TEST_AWS_ACCOUNT_ID,
+        update_tag=TEST_UPDATE_TAG,
+        common_job_parameters={
+            "UPDATE_TAG": TEST_UPDATE_TAG,
+            "AWS_ID": TEST_AWS_ACCOUNT_ID,
+        },
+    )
+
+    # Assert - Check expected nodes exist
+    expected_nodes = {
+        ("i-1234567890abcdef0", "running"),
+        ("i-0987654321fedcba0", "stopped"),
+    }
+    assert check_nodes(neo4j_session, "EC2Instance", ["id", "state"]) == expected_nodes
+```
+
+- **CRITICAL**: Run the test and ensure it passes before proceeding
+- If the test doesn't exist or fails, fix it first - **no exceptions**
+
+### 🔧 Step 2: Convert to Data Model
+
+Now safely convert the legacy code to use the modern data model:
+
+#### 2a. Create Data Model Schema Files
+Create schema files in `cartography/models/[module]/`:
+
+```python
+# cartography/models/aws/ec2/instances.py
+from dataclasses import dataclass
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties, CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelSchema, LinkDirection, make_target_node_matcher
+
+@dataclass(frozen=True)
+class EC2InstanceNodeProperties(CartographyNodeProperties):
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    instanceid: PropertyRef = PropertyRef("InstanceId")
+    state: PropertyRef = PropertyRef("State")
+    # ... other properties
+
+@dataclass(frozen=True)
+class EC2InstanceToAWSAccountRel(CartographyRelSchema):
+    target_node_label: str = "AWSAccount"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher({
+        "id": PropertyRef("AWS_ID", set_in_kwargs=True),
+    })
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: EC2InstanceToAWSAccountRelProperties = EC2InstanceToAWSAccountRelProperties()
+
+@dataclass(frozen=True)
+class EC2InstanceSchema(CartographyNodeSchema):
+    label: str = "EC2Instance"
+    properties: EC2InstanceNodeProperties = EC2InstanceNodeProperties()
+    sub_resource_relationship: EC2InstanceToAWSAccountRel = EC2InstanceToAWSAccountRel()
+```
+
+#### 2b. Replace load_* Functions
+Replace handwritten Cypher in load functions with data model `load()` calls:
+
+```python
+# Before (legacy)
+def load_ec2_instances(neo4j_session, data, region, current_aws_account_id, update_tag):
+    ingest_instances = """
+    UNWIND $instances_list as instance
+    MERGE (i:EC2Instance{id: instance.id})
+    ON CREATE SET i.firstseen = timestamp()
+    SET i.instanceid = instance.InstanceId,
+        i.state = instance.State,
+        i.lastupdated = $update_tag
+    WITH i
+    MATCH (owner:AWSAccount{id: $aws_account_id})
+    MERGE (owner)-[r:RESOURCE]->(i)
+    ON CREATE SET r.firstseen = timestamp()
+    SET r.lastupdated = $update_tag
+    """
+    neo4j_session.run(ingest_instances, instances_list=data, aws_account_id=current_aws_account_id, update_tag=update_tag)
+
+# After (data model)
+def load_ec2_instances(neo4j_session, data, region, current_aws_account_id, update_tag):
+    load(
+        neo4j_session,
+        EC2InstanceSchema(),
+        data,
+        lastupdated=update_tag,
+        AWS_ID=current_aws_account_id,
+    )
+```
+
+#### 2c. Replace cleanup_* Functions
+Replace handwritten cleanup with data model cleanup:
+
+```python
+# Before (legacy)
+def cleanup_ec2_instances(neo4j_session, common_job_parameters):
+    run_cleanup_job('aws_import_ec2_instances_cleanup.json', neo4j_session, common_job_parameters)
+
+# After (data model)
+def cleanup_ec2_instances(neo4j_session, common_job_parameters):
+    GraphJob.from_node_schema(EC2InstanceSchema(), common_job_parameters).run(neo4j_session)
+```
+
+#### 2d. Test Continuously
+- Run your integration test after each change
+- Ensure it still passes - if not, debug before continuing
+- You may need to update minor details in tests due to data model differences
+
+### 🧹 Step 3: Cleanup Legacy Files
+
+Once tests pass, clean up legacy infrastructure:
+
+#### 3a. Remove Index Entries
+Remove manual index entries from `cartography/data/indexes.cypher`:
+
+```cypher
+# Remove entries like these - data model creates indexes automatically
+CREATE INDEX IF NOT EXISTS FOR (n:EC2Instance) ON (n.id);
+CREATE INDEX IF NOT EXISTS FOR (n:EC2Instance) ON (n.lastupdated);
+```
+
+**Note**: Only remove indexes for nodes you've converted to data model. Leave others untouched.
+
+#### 3b. Remove Cleanup Job Files
+Remove corresponding cleanup JSON files from `cartography/data/jobs/cleanup/`:
+
+```bash
+# Remove files like:
+rm cartography/data/jobs/cleanup/aws_import_ec2_instances_cleanup.json
+```
+
+**Note**: Only remove cleanup files for modules you've fully converted.
+
+### 🔍 Common Refactoring Patterns
+
+#### Pattern 1: Simple Node Migration
+Most legacy nodes can be directly converted to data model schemas.
+
+#### Pattern 2: Complex Relationships
+For modules with complex relationships, you may need:
+- **One-to-Many relationships** (see [#one-to-many](#one-to-many))
+- **Composite Node Pattern** for nodes that get data from multiple sources
+
+#### Pattern 3: MatchLinks for Complex Cases
+Use [MatchLinks](#matchlinks) sparingly, only when:
+- Connecting two existing node types from separate data sources
+- Rich relationship properties that don't belong in nodes
+
+### ⚠️ Things You May Encounter
+
+#### Multiple Intel Modules Modifying Same Nodes
+When refactoring modules that modify the same node type:
+- Use **Simple Relationship Pattern** if only referencing by ID
+- Use **Composite Node Pattern** for different views of the same entity from different data sources (see [Common Patterns](#common-patterns))
+
+#### Legacy Test Adjustments
+Older tests may need small tweaks:
+- Update expected property names if data model changes them
+- Adjust relationship directions if needed
+- Remove tests for manual cleanup jobs (data model handles this)
+
+#### Complex Cypher Queries
+Some legacy queries are complex. Break them down:
+1. Identify what nodes/relationships are being created
+2. Map to data model schemas
+3. Use multiple `load()` calls if needed
+
+### 🚫 What NOT to Test
+
+**Do NOT explicitly test cleanup functions** unless there's a specific concern:
+- Data model handles complex cleanup cases automatically
+- Testing cleanup adds unnecessary boilerplate
+- Focus tests on data ingestion, not cleanup behavior
+
+### 🛑 When to Stop and Ask
+
+Refactors can be complex. **Stop and ask the user** if you encounter:
+- Unclear business logic in legacy Cypher
+- Complex relationships that don't map clearly to data model
+- Test failures you can't resolve
+- Multiple modules that seem interdependent
+
+### 📋 Refactoring Checklist
+
+Before submitting a refactor:
+
+- [ ] ✅ **Integration test exists and passes** for the sync function
+- [ ] ✅ **Data model schemas** defined with proper relationships
+- [ ] ✅ **Legacy load functions** converted to use `load()`
+- [ ] ✅ **Legacy cleanup functions** converted to use `GraphJob.from_node_schema()`
+- [ ] ✅ **Tests still pass** after all changes
+- [ ] ✅ **Index entries removed** from `indexes.cypher`
+- [ ] ✅ **Cleanup JSON files removed** from cleanup directory
+- [ ] ✅ **No regressions** - all functionality preserved
+
+### 🎯 Success Criteria
+
+A successful refactor should:
+1. **Preserve all functionality** - tests pass
+2. **Use data model** - no handwritten Cypher for CRUD operations
+3. **Clean up legacy files** - indexes and cleanup jobs removed
+4. **Maintain performance** - no significant speed degradation
+5. **Follow patterns** - consistent with other modern modules
+
 ## 📚 Common Patterns and Examples {#common-patterns}
 
 ### Pattern 1: Simple Service with Users (LastPass Style)
@@ -1193,7 +1392,7 @@ Before submitting your module:
 - [ ] ✅ **Schema Fields**: Only use standard fields in `CartographyRelSchema`/`CartographyNodeSchema` subclasses
 - [ ] ✅ **Scoped Cleanup**: Verify `scoped_cleanup=True` (default) for tenant-scoped resources, `False` only for global data
 - [ ] ✅ **Error Handling**: Specific exceptions, required vs optional fields
-- [ ] ✅ **Testing**: Unit tests for transform, integration tests for loading
+- [ ] ✅ **Testing**: Integration tests for sync functions
 - [ ] ✅ **Documentation**: Schema docs, docstrings, inline comments
 - [ ] ✅ **Cleanup**: Proper cleanup job implementation
 - [ ] ✅ **Indexing**: Extra indexes on frequently queried fields

cartography-0.112.0/MAINTAINERS.md

@@ -0,0 +1,39 @@
+See https://github.com/cartography-cncf/cartography/#contributing for general contribution guidelines.
+
+## Maintainers
+
+List of community members who have shown they are committed to Cartography's continued development and are active in pull request reviews and community conversations. Alphabetical order.
+
+- Drishti Aggarwal (https://github.com/d-aggarwal)
+- Alex Chantavy (https://github.com/achantavy)
+- Jérémy Chapeau (https://github.com/jychp)
+- Chandan Chowdhury (https://github.com/chandanchowdhury)
+- Shyam Mukund (https://github.com/shyammukund)
+- Ramon Petgrave (https://github.com/ramonpetgrave64)
+- Dakota Riley (https://github.com/rileydakota)
+- Kunaal Sikka (https://github.com/kunaals)
+
+## Founding maintainers
+
+Cartography would not exist without the contributions of these key members. They are not actively involved in reviews anymore, but we acknowledge them here.
+
+- Sacha Faust (https://github.com/sachafaust)
+- Andrew Johnson (https://github.com/SecPrez)
+- Taya Steere (https://github.com/tmsteere)
+- Evan Davis (https://github.com/ecdavis)
+
+## Emeritus maintainers
+
+Maintainers who have worked on Cartography but are no longer actively involved in reviews.
+
+- Marco Lancini (https://github.com/marco-lancini)
+- Ryan Lane (https://github.com/ryan-lane)
+- Kedar Ghule (https://github.com/kedarghule)
+- Purusottam Mupunu (https://github.com/mpurusottamc)
+
+## Friends of Cartography
+
+Not maintainers but these members have been active in discussions and offer subject matter expertise or community advocacy (e.g. writing blog posts)
+
+- Daniel D'Agostino (https://github.com/danielsaporo): Deployment and use-cases
+- Ashley Lowde (https://github.com/alowde-ps): Deployment and use-cases

{cartography-0.111.0 → cartography-0.112.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: cartography
-Version: 0.111.0
+Version: 0.112.0
 Summary: Explore assets and their relationships across your technical infrastructure.
 Maintainer: Cartography Contributors
-License: apache2
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://cartography-cncf.github.io/cartography
 Project-URL: Documentation, https://cartography-cncf.github.io/cartography
 Project-URL: Repository, https://github.com/cartography-cncf/cartography
@@ -11,7 +11,6 @@ Project-URL: Issues, https://github.com/cartography-cncf/cartography/issues
 Project-URL: Changelog, https://github.com/cartography-cncf/cartography/releases
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -94,7 +93,7 @@ You can learn more about the story behind Cartography in our [presentation at BS
 - [Google GSuite](https://cartography-cncf.github.io/cartography/modules/gsuite/index.html) - users, groups
 - [Kandji](https://cartography-cncf.github.io/cartography/modules/kandji/index.html) - Devices
 - [Keycloak](https://cartography-cncf.github.io/cartography/modules/keycloak/index.html) - Realms, Users, Groups, Roles, Scopes, Clients, IdentityProviders, Authentication Flows, Authentication Executions, Organizations, Organization Domains
-- [Kubernetes](https://cartography-cncf.github.io/cartography/modules/kubernetes/index.html) - Cluster, Namespace, Service, Pod, Container, ServiceAccount, Role, RoleBinding, ClusterRole, ClusterRoleBinding
+- [Kubernetes](https://cartography-cncf.github.io/cartography/modules/kubernetes/index.html) - Cluster, Namespace, Service, Pod, Container, ServiceAccount, Role, RoleBinding, ClusterRole, ClusterRoleBinding, OIDCProvider
 - [Lastpass](https://cartography-cncf.github.io/cartography/modules/lastpass/index.html) - users
 - [Microsoft Azure](https://cartography-cncf.github.io/cartography/modules/azure/index.html) -  CosmosDB, SQL, Storage, Virtual Machine
 - [Microsoft Entra ID](https://cartography-cncf.github.io/cartography/modules/entra/index.html) -  Users
@@ -153,6 +152,10 @@ Now that data is in the graph, you can quickly start with our [querying tutorial
 Directly querying Neo4j is already very useful as a sort of "swiss army knife" for security data problems, but you can also build applications and data pipelines around Cartography. View this doc on [applications](https://cartography-cncf.github.io/cartography/usage/applications.html).
 
 
+## Docs
+
+See [here](https://cartography-cncf.github.io/cartography/)
+
 ## Community
 
 - Hang out with us on Slack: Join the CNCF Slack workspace [here](https://communityinviter.com/apps/cloud-native/cncf), and then join the `#cartography` channel.
@@ -168,7 +171,7 @@ This project is licensed under the [Apache 2.0 License](LICENSE).
 Thank you for considering contributing to Cartography!
 
 ### Code of conduct
-All contributors and participants of this project must follow the  [CNCF code of conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
+All contributors and participants of this project must follow the [CNCF code of conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
 
 ### Bug reports and feature requests and discussions
 Submit a GitHub issue to report a bug or request a new feature. If we decide that the issue needs more discussion - usually because the scope is too large or we need to make careful decision - we will convert the issue to a [GitHub Discussion](https://github.com/cartography-cncf/cartography/discussions).

{cartography-0.111.0 → cartography-0.112.0}/README.md

@@ -34,7 +34,7 @@ You can learn more about the story behind Cartography in our [presentation at BS
 - [Google GSuite](https://cartography-cncf.github.io/cartography/modules/gsuite/index.html) - users, groups
 - [Kandji](https://cartography-cncf.github.io/cartography/modules/kandji/index.html) - Devices
 - [Keycloak](https://cartography-cncf.github.io/cartography/modules/keycloak/index.html) - Realms, Users, Groups, Roles, Scopes, Clients, IdentityProviders, Authentication Flows, Authentication Executions, Organizations, Organization Domains
-- [Kubernetes](https://cartography-cncf.github.io/cartography/modules/kubernetes/index.html) - Cluster, Namespace, Service, Pod, Container, ServiceAccount, Role, RoleBinding, ClusterRole, ClusterRoleBinding
+- [Kubernetes](https://cartography-cncf.github.io/cartography/modules/kubernetes/index.html) - Cluster, Namespace, Service, Pod, Container, ServiceAccount, Role, RoleBinding, ClusterRole, ClusterRoleBinding, OIDCProvider
 - [Lastpass](https://cartography-cncf.github.io/cartography/modules/lastpass/index.html) - users
 - [Microsoft Azure](https://cartography-cncf.github.io/cartography/modules/azure/index.html) -  CosmosDB, SQL, Storage, Virtual Machine
 - [Microsoft Entra ID](https://cartography-cncf.github.io/cartography/modules/entra/index.html) -  Users
@@ -93,6 +93,10 @@ Now that data is in the graph, you can quickly start with our [querying tutorial
 Directly querying Neo4j is already very useful as a sort of "swiss army knife" for security data problems, but you can also build applications and data pipelines around Cartography. View this doc on [applications](https://cartography-cncf.github.io/cartography/usage/applications.html).
 
 
+## Docs
+
+See [here](https://cartography-cncf.github.io/cartography/)
+
 ## Community
 
 - Hang out with us on Slack: Join the CNCF Slack workspace [here](https://communityinviter.com/apps/cloud-native/cncf), and then join the `#cartography` channel.
@@ -108,7 +112,7 @@ This project is licensed under the [Apache 2.0 License](LICENSE).
 Thank you for considering contributing to Cartography!
 
 ### Code of conduct
-All contributors and participants of this project must follow the  [CNCF code of conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
+All contributors and participants of this project must follow the [CNCF code of conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
 
 ### Bug reports and feature requests and discussions
 Submit a GitHub issue to report a bug or request a new feature. If we decide that the issue needs more discussion - usually because the scope is too large or we need to make careful decision - we will convert the issue to a [GitHub Discussion](https://github.com/cartography-cncf/cartography/discussions).

{cartography-0.111.0 → cartography-0.112.0}/cartography/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.111.0'
-__version_tuple__ = version_tuple = (0, 111, 0)
+__version__ = version = '0.112.0'
+__version_tuple__ = version_tuple = (0, 112, 0)
 
-__commit_id__ = commit_id = 'g246f4a4b6'
+__commit_id__ = commit_id = 'gc784aa30d'

{cartography-0.111.0 → cartography-0.112.0}/cartography/cli.py

@@ -234,6 +234,11 @@ class CLI:
                 "The name of environment variable containing Azure Client Secret for Service Principal Authentication."
             ),
         )
+        parser.add_argument(
+            "--azure-subscription-id",
+            type=str,
+            help="The Azure Subscription ID to sync.",
+        )
         parser.add_argument(
             "--entra-tenant-id",
             type=str,
@@ -394,6 +399,12 @@ class CLI:
                 "The path to kubeconfig file specifying context to access K8s cluster(s)."
             ),
         )
+        parser.add_argument(
+            "--managed-kubernetes",
+            default=None,
+            type=str,
+            help=("Type of managed Kubernetes service (e.g., 'eks'). Optional."),
+        )
         parser.add_argument(
             "--nist-cve-url",
             type=str,