cr fixes

Author: Ran Isenberg

aws_lambda_powertools/utilities/parser/envelopes/__init__.py

@@ -1,12 +1,12 @@
 from .base import BaseEnvelope
-from .cloudwatch import CloudatchEnvelope
+from .cloudwatch import CloudatchLogsEnvelope
 from .dynamodb import DynamoDBStreamEnvelope
 from .event_bridge import EventBridgeEnvelope
 from .sns import SnsEnvelope
 from .sqs import SqsEnvelope
 
 __all__ = [
-    "CloudatchEnvelope",
+    "CloudatchLogsEnvelope",
     "DynamoDBStreamEnvelope",
     "EventBridgeEnvelope",
     "SnsEnvelope",

aws_lambda_powertools/utilities/parser/envelopes/cloudwatch.py

@@ -8,7 +8,7 @@
 logger = logging.getLogger(__name__)
 
 
-class CloudatchEnvelope(BaseEnvelope):
+class CloudatchLogsEnvelope(BaseEnvelope):
     """Cloudatch Envelope to extract a List of log records.
 
     The record's body parameter is a string (after being base64 decoded and gzipped), 

aws_lambda_powertools/utilities/parser/models/cloudwatch.py

@@ -1,11 +1,14 @@
 import base64
 import json
+import logging
 import zlib
 from datetime import datetime
 from typing import List
 
 from pydantic import BaseModel, Field, validator
 
+logger = logging.getLogger(__name__)
+
 
 class CloudWatchLogsLogEvent(BaseModel):
     id: str  # noqa AA03 VNE003
@@ -28,9 +31,11 @@ class CloudWatchLogsData(BaseModel):
     @validator("decoded_data", pre=True)
     def prepare_data(cls, value):
         try:
+            logger.debug("Decoding base64 cloudwatch log data before parsing")
             payload = base64.b64decode(value)
+            logger.debug("Decompressing cloudwatch log data before parsing")
             uncompressed = zlib.decompress(payload, zlib.MAX_WBITS | 32)
-            return json.loads(uncompressed.decode("UTF-8"))
+            return json.loads(uncompressed.decode("utf-8"))
         except Exception:
             raise ValueError("unable to decompress data")
 

tests/functional/parser/test_cloudwatch.py

@@ -12,7 +12,7 @@
 from tests.functional.parser.utils import load_event
 
 
-@event_parser(model=MyCloudWatchBusiness, envelope=envelopes.CloudatchEnvelope)
+@event_parser(model=MyCloudWatchBusiness, envelope=envelopes.CloudatchLogsEnvelope)
 def handle_cloudwatch_logs(event: List[MyCloudWatchBusiness], _: LambdaContext):
     assert len(event) == 1
     log: MyCloudWatchBusiness = event[0]