cartography 0.100.0rc3__tar.gz → 0.100.0rc4__tar.gz

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/.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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/.github/workflows/publish-to-ghcr-and-pypi.yml

@@ -61,7 +61,7 @@ jobs:
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           # This is the user that triggered the Workflow. In this case, it will

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/.gitignore

@@ -22,3 +22,4 @@ cartography/_version.py
 uv.lock
 .cursor-server
 .gitconfig
+.python-version

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cartography
-Version: 0.100.0rc3
+Version: 0.100.0rc4
 Summary: Explore assets and their relationships across your technical infrastructure.
 Maintainer: Cartography Contributors
 License: apache2

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/cartography/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.100.0rc3'
+__version__ = version = '0.100.0rc4'
 __version_tuple__ = version_tuple = (0, 100, 0)

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/cartography/intel/aws/ec2/launch_templates.py

@@ -3,7 +3,6 @@ from typing import Any
 
 import boto3
 import neo4j
-from botocore.exceptions import ClientError
 
 from .util import get_botocore_config
 from cartography.client.core.tx import load
@@ -21,27 +20,29 @@ logger = logging.getLogger(__name__)
 def get_launch_templates(
     boto3_session: boto3.session.Session,
     region: str,
-) -> tuple[list[dict[str, Any]], list[dict[str, Any]]]:
+) -> list[dict[str, Any]]:
     client = boto3_session.client('ec2', region_name=region, config=get_botocore_config())
     paginator = client.get_paginator('describe_launch_templates')
     templates: list[dict[str, Any]] = []
-    template_versions: list[dict[str, Any]] = []
     for page in paginator.paginate():
         paginated_templates = page['LaunchTemplates']
-        for template in paginated_templates:
-            template_id = template['LaunchTemplateId']
-            try:
-                versions = get_launch_template_versions_by_template(boto3_session, template_id, region)
-            except ClientError as e:
-                logger.warning(
-                    f"Failed to get launch template versions for {template_id}: {e}",
-                    exc_info=True,
-                )
-                versions = []
-            # Using a key not defined in latest boto3 documentation
-            template_versions.extend(versions)
         templates.extend(paginated_templates)
-    return templates, template_versions
+    return templates
+
+
+@timeit
+@aws_handle_regions
+def get_launch_template_versions(
+    boto3_session: boto3.session.Session,
+    region: str,
+) -> list[dict[str, Any]]:
+    client = boto3_session.client('ec2', region_name=region, config=get_botocore_config())
+    paginator = client.get_paginator('describe_launch_template_versions')
+    template_versions: list[dict[str, Any]] = []
+    for page in paginator.paginate():
+        paginated_versions = page['LaunchTemplateVersions']
+        template_versions.extend(paginated_versions)
+    return template_versions
 
 
 def transform_launch_templates(templates: list[dict[str, Any]]) -> list[dict[str, Any]]:
@@ -71,21 +72,6 @@ def load_launch_templates(
     )
 
 
-@timeit
-@aws_handle_regions
-def get_launch_template_versions_by_template(
-        boto3_session: boto3.session.Session,
-        template: str,
-        region: str,
-) -> list[dict[str, Any]]:
-    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=template):
-        template_versions.extend(versions['LaunchTemplateVersions'])
-    return template_versions
-
-
 def transform_launch_template_versions(versions: list[dict[str, Any]]) -> list[dict[str, Any]]:
     result: list[dict[str, Any]] = []
     for version in versions:
@@ -153,7 +139,8 @@ def sync_ec2_launch_templates(
 ) -> None:
     for region in regions:
         logger.info(f"Syncing launch templates for region '{region}' in account '{current_aws_account_id}'.")
-        templates, versions = get_launch_templates(boto3_session, region)
+        templates = get_launch_templates(boto3_session, region)
+        versions = get_launch_template_versions(boto3_session, region)
         templates = transform_launch_templates(templates)
         load_launch_templates(neo4j_session, templates, region, current_aws_account_id, update_tag)
         versions = transform_launch_template_versions(versions)

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/cartography.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cartography
-Version: 0.100.0rc3
+Version: 0.100.0rc4
 Summary: Explore assets and their relationships across your technical infrastructure.
 Maintainer: Cartography Contributors
 License: apache2

{cartography-0.100.0rc3 → cartography-0.100.0rc4}/tests/integration/cartography/intel/aws/ec2/test_launch_templates.py

@@ -1,11 +1,3 @@
-from unittest.mock import patch
-
-import boto3
-from botocore.exceptions import ClientError
-from moto import mock_aws
-
-import cartography.intel.aws.ec2.launch_templates
-from cartography.intel.aws.ec2.launch_templates import get_launch_templates
 from cartography.intel.aws.ec2.launch_templates import load_launch_template_versions
 from cartography.intel.aws.ec2.launch_templates import load_launch_templates
 from cartography.intel.aws.ec2.launch_templates import transform_launch_template_versions
@@ -19,48 +11,6 @@ TEST_REGION = 'us-east-1'
 TEST_UPDATE_TAG = 123456789
 
 
-@mock_aws(config={'core': {'reset_boto3_session': True, 'mock_credentials': True}})
-@patch.object(
-    cartography.intel.aws.ec2.launch_templates,
-    'get_launch_template_versions_by_template',
-)
-def test_get_launch_template_throws_exception(mock_get_template_versions, *args):
-    # Arrange
-    template_data = {
-        "ImageId": "ami-abc123",
-        "TagSpecifications": [
-            {
-                "ResourceType": "instance", "Tags": [
-                    {"Key": "eks:cluster-name", "Value": "eks-cluster-example"},
-                    {"Key": "eks:nodegroup-name", "Value": "private-node-group-example"},
-                ],
-            },
-        ],
-        "SecurityGroupIds": ["sg-1234"],
-    }
-    client = boto3.client('ec2', region_name=TEST_REGION)
-    mock_template = client.create_launch_template(
-        LaunchTemplateName='eks-00000000-0000-0000-0000-000000000000',
-        LaunchTemplateData=template_data,
-    )
-    template_id = mock_template['LaunchTemplate']['LaunchTemplateId']
-    error_response = {
-        "Error": {
-            "Code": "InvalidLaunchTemplateId.NotFound",
-            "Message": f"The specified launch template, with template ID {template_id}, does not exist.",
-        },
-    }
-    mock_get_template_versions.side_effect = ClientError(error_response, "DescribeLaunchTemplateVersions")
-    session = boto3.Session(region_name=TEST_REGION)
-    # Act: get the launch template versions
-
-    templates, versions = get_launch_templates(session, TEST_REGION)
-
-    # Assert: the launch template versions are as expected
-    assert len(templates) == 1
-    assert len(versions) == 0
-
-
 def test_load_launch_templates(neo4j_session, *args):
     # Arrange: an AWSAccount must exist
     neo4j_session.run(