add positive int and fix develop conflict

Author: Ran Isenberg

aws_lambda_powertools/utilities/parser/models/__init__.py

@@ -26,9 +26,22 @@
     DynamoDBStreamRecordModel,
 )
 from .event_bridge import EventBridgeModel
-from .kafka import KafkaBaseEventModel, KafkaMskEventModel, KafkaRecordModel, KafkaSelfManagedEventModel
-from .kinesis import KinesisDataStreamModel, KinesisDataStreamRecord, KinesisDataStreamRecordPayload
-from .kinesis_firehose import KinesisFirehoseModel, KinesisFirehoseRecord, KinesisFirehoseRecordMetadata
+from .kafka import (
+    KafkaBaseEventModel,
+    KafkaMskEventModel,
+    KafkaRecordModel,
+    KafkaSelfManagedEventModel,
+)
+from .kinesis import (
+    KinesisDataStreamModel,
+    KinesisDataStreamRecord,
+    KinesisDataStreamRecordPayload,
+)
+from .kinesis_firehose import (
+    KinesisFirehoseModel,
+    KinesisFirehoseRecord,
+    KinesisFirehoseRecordMetadata,
+)
 from .lambda_function_url import LambdaFunctionUrlModel
 from .s3 import S3Model, S3RecordModel
 from .s3_object_event import (

aws_lambda_powertools/utilities/parser/models/kinesis_firehose.py

@@ -1,22 +1,22 @@
 from typing import List, Optional, Type, Union
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, PositiveInt, validator
 
 from aws_lambda_powertools.shared.functions import base64_decode
 
 
 class KinesisFirehoseRecordMetadata(BaseModel):
     shardId: str
     partitionKey: str
-    approximateArrivalTimestamp: int
+    approximateArrivalTimestamp: PositiveInt
     sequenceNumber: str
     subsequenceNumber: str
 
 
 class KinesisFirehoseRecord(BaseModel):
     data: Union[bytes, Type[BaseModel]]  # base64 encoded str is parsed into bytes
     recordId: str
-    approximateArrivalTimestamp: int
+    approximateArrivalTimestamp: PositiveInt
     kinesisRecordMetadata: Optional[KinesisFirehoseRecordMetadata]
 
     @validator("data", pre=True, allow_reuse=True)

tests/functional/parser/test_kinesis_firehose.py

@@ -2,7 +2,11 @@
 
 import pytest
 
-from aws_lambda_powertools.utilities.parser import ValidationError, envelopes, event_parser
+from aws_lambda_powertools.utilities.parser import (
+    ValidationError,
+    envelopes,
+    event_parser,
+)
 from aws_lambda_powertools.utilities.parser.models import (
     KinesisFirehoseModel,
     KinesisFirehoseRecord,
@@ -94,3 +98,17 @@ def test_kinesis_trigger_bad_base64_event():
     event_dict["records"][0]["data"] = {"bad base64"}
     with pytest.raises(ValidationError):
         handle_firehose_no_envelope_kinesis(event_dict, LambdaContext())
+
+
+def test_kinesis_trigger_bad_timestamp_event():
+    event_dict = load_event("kinesisFirehoseKinesisEvent.json")
+    event_dict["records"][0]["approximateArrivalTimestamp"] = -1
+    with pytest.raises(ValidationError):
+        handle_firehose_no_envelope_kinesis(event_dict, LambdaContext())
+
+
+def test_kinesis_trigger_bad_metadata_timestamp_event():
+    event_dict = load_event("kinesisFirehoseKinesisEvent.json")
+    event_dict["records"][0]["kinesisRecordMetadata"]["approximateArrivalTimestamp"] = "-1"
+    with pytest.raises(ValidationError):
+        handle_firehose_no_envelope_kinesis(event_dict, LambdaContext())