cr fixes

Author: Ran Isenberg

aws_lambda_powertools/utilities/parser/envelopes/kinesis.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Any, Dict, List, Optional, Union
 
-from ..models import KinesisStreamModel
+from ..models import KinesisDataStreamModel
 from ..types import Model
 from .base import BaseEnvelope
 
@@ -34,8 +34,8 @@ def parse(self, data: Optional[Union[Dict[str, Any], Any]], model: Model) -> Lis
         List
             List of records parsed with model provided
         """
-        logger.debug(f"Parsing incoming data with Kinesis model {KinesisStreamModel}")
-        parsed_envelope: KinesisStreamModel = KinesisStreamModel.parse_obj(data)
+        logger.debug(f"Parsing incoming data with Kinesis model {KinesisDataStreamModel}")
+        parsed_envelope: KinesisDataStreamModel = KinesisDataStreamModel.parse_obj(data)
         output = []
         logger.debug(f"Parsing Kinesis records in `body` with {model}")
         for record in parsed_envelope.Records:

aws_lambda_powertools/utilities/parser/models/__init__.py

@@ -1,6 +1,6 @@
 from .dynamodb import DynamoDBStreamChangedRecordModel, DynamoDBStreamModel, DynamoDBStreamRecordModel
 from .event_bridge import EventBridgeModel
-from .kinesis import KinesisDataStreamRecordPayload, KinesisStreamModel, KinesisStreamRecord
+from .kinesis import KinesisDataStreamModel, KinesisDataStreamRecord, KinesisDataStreamRecordPayload
 from .ses import SesModel, SesRecordModel
 from .sns import SnsModel, SnsNotificationModel, SnsRecordModel
 from .sqs import SqsModel, SqsRecordModel
@@ -10,8 +10,8 @@
     "EventBridgeModel",
     "DynamoDBStreamChangedRecordModel",
     "DynamoDBStreamRecordModel",
-    "KinesisStreamModel",
-    "KinesisStreamRecord",
+    "KinesisDataStreamModel",
+    "KinesisDataStreamRecord",
     "KinesisDataStreamRecordPayload",
     "SesModel",
     "SesRecordModel",

aws_lambda_powertools/utilities/parser/models/kinesis.py

@@ -26,7 +26,7 @@ def data_base64_decode(cls, value):
             raise ValueError("base64 decode failed")
 
 
-class KinesisStreamRecord(BaseModel):
+class KinesisDataStreamRecord(BaseModel):
     eventSource: Literal["aws:kinesis"]
     eventVersion: str
     eventID: str
@@ -37,5 +37,5 @@ class KinesisStreamRecord(BaseModel):
     kinesis: KinesisDataStreamRecordPayload
 
 
-class KinesisStreamModel(BaseModel):
-    Records: List[KinesisStreamRecord]
+class KinesisDataStreamModel(BaseModel):
+    Records: List[KinesisDataStreamRecord]

tests/functional/parser/test_kinesis.py

@@ -3,7 +3,7 @@
 import pytest
 
 from aws_lambda_powertools.utilities.parser import ValidationError, envelopes, event_parser
-from aws_lambda_powertools.utilities.parser.models import KinesisDataStreamRecordPayload, KinesisStreamModel
+from aws_lambda_powertools.utilities.parser.models import KinesisDataStreamModel, KinesisDataStreamRecordPayload
 from aws_lambda_powertools.utilities.typing import LambdaContext
 from tests.functional.parser.schemas import MyKinesisBusiness
 from tests.functional.parser.utils import load_event
@@ -12,16 +12,16 @@
 @event_parser(model=MyKinesisBusiness, envelope=envelopes.KinesisDataStreamEnvelope)
 def handle_kinesis(event: List[MyKinesisBusiness], _: LambdaContext):
     assert len(event) == 1
-    record: KinesisStreamModel = event[0]
+    record: KinesisDataStreamModel = event[0]
     assert record.message == "test message"
     assert record.username == "test"
 
 
-@event_parser(model=KinesisStreamModel)
-def handle_kinesis_no_envelope(event: KinesisStreamModel, _: LambdaContext):
+@event_parser(model=KinesisDataStreamModel)
+def handle_kinesis_no_envelope(event: KinesisDataStreamModel, _: LambdaContext):
     records = event.Records
     assert len(records) == 2
-    record: KinesisStreamModel = records[0]
+    record: KinesisDataStreamModel = records[0]
 
     assert record.awsRegion == "us-east-2"
     assert record.eventID == "shardId-000000000006:49590338271490256608559692538361571095921575989136588898"