cartography 0.104.0rc1__tar.gz → 0.104.0rc3__tar.gz

{cartography-0.104.0rc1 → cartography-0.104.0rc3}/PKG-INFO

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

{cartography-0.104.0rc1 → cartography-0.104.0rc3}/cartography/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.104.0rc1'
-__version_tuple__ = version_tuple = (0, 104, 0, 'rc1')
+__version__ = version = '0.104.0rc3'
+__version_tuple__ = version_tuple = (0, 104, 0, 'rc3')

{cartography-0.104.0rc1 → cartography-0.104.0rc3}/cartography/intel/aws/cloudwatch.py

@@ -22,7 +22,7 @@ def get_cloudwatch_log_groups(
     boto3_session: boto3.Session, region: str
 ) -> List[Dict[str, Any]]:
     client = boto3_session.client(
-        "cloudwatch", region_name=region, config=get_botocore_config()
+        "logs", region_name=region, config=get_botocore_config()
     )
     paginator = client.get_paginator("describe_log_groups")
     logGroups = []

{cartography-0.104.0rc1 → cartography-0.104.0rc3}/cartography/intel/aws/secretsmanager.py

@@ -91,16 +91,30 @@ def get_secret_versions(
 ) -> List[Dict]:
     """
     Get all versions of a secret from AWS Secrets Manager.
+
+    Note: list_secret_version_ids is not paginatable through boto3's paginator,
+    so we implement manual pagination.
     """
     client = boto3_session.client("secretsmanager", region_name=region)
-    paginator = client.get_paginator("list_secret_version_ids")
+    next_token = None
     versions = []
 
-    for page in paginator.paginate(SecretId=secret_arn, IncludeDeprecated=True):
-        for version in page["Versions"]:
+    while True:
+        params = {"SecretId": secret_arn, "IncludeDeprecated": True}
+        if next_token:
+            params["NextToken"] = next_token
+
+        response = client.list_secret_version_ids(**params)
+
+        for version in response.get("Versions", []):
             version["SecretId"] = secret_arn
             version["ARN"] = f"{secret_arn}:version:{version['VersionId']}"
-        versions.extend(page["Versions"])
+
+        versions.extend(response.get("Versions", []))
+
+        next_token = response.get("NextToken")
+        if not next_token:
+            break
 
     return versions
 
@@ -119,7 +133,7 @@ def transform_secret_versions(
             "ARN": version["ARN"],
             "SecretId": version["SecretId"],
             "VersionId": version["VersionId"],
-            "VersionStages": version["VersionStages"],
+            "VersionStages": version.get("VersionStages"),
             "CreatedDate": dict_date_to_epoch(version, "CreatedDate"),
         }
 

{cartography-0.104.0rc1 → cartography-0.104.0rc3}/cartography.egg-info/PKG-INFO

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