Merge branch 'develop' into rf/bedrock-events

leandrodamascena · web-flow · commit 2eacca12c6e4 · 2023-10-31T14:56:01.000Z
Signed-off-by: Leandro Damascena &lt;lcdama@amazon.pt&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,33 +19,37 @@
 
 ## Maintenance
 
-* **deps:** bump the layer-balancer group in /layer/scripts/layer-balancer with 1 update ([#3215](https://github.com/aws-powertools/powertools-lambda-python/issues/3215))
-* **deps:** bump squidfunk/mkdocs-material from `cb38dc2` to `df9409b` in /docs ([#3216](https://github.com/aws-powertools/powertools-lambda-python/issues/3216))
-* **deps:** bump release-drafter/release-drafter from 5.24.0 to 5.25.0 ([#3219](https://github.com/aws-powertools/powertools-lambda-python/issues/3219))
-* **deps:** bump actions/checkout from 4.1.0 to 4.1.1 ([#3220](https://github.com/aws-powertools/powertools-lambda-python/issues/3220))
 * **deps:** bump the layer-balancer group in /layer/scripts/layer-balancer with 2 updates ([#3248](https://github.com/aws-powertools/powertools-lambda-python/issues/3248))
-* **deps:** bump datadog-lambda from 4.80.0 to 4.81.0 ([#3228](https://github.com/aws-powertools/powertools-lambda-python/issues/3228))
-* **deps:** bump actions/setup-node from 3.8.1 to 4.0.0 ([#3244](https://github.com/aws-powertools/powertools-lambda-python/issues/3244))
 * **deps:** bump urllib3 from 1.26.17 to 1.26.18 ([#3222](https://github.com/aws-powertools/powertools-lambda-python/issues/3222))
+* **deps:** bump datadog-lambda from 4.80.0 to 4.81.0 ([#3228](https://github.com/aws-powertools/powertools-lambda-python/issues/3228))
 * **deps:** bump ossf/scorecard-action from 2.3.0 to 2.3.1 ([#3245](https://github.com/aws-powertools/powertools-lambda-python/issues/3245))
-* **deps-dev:** bump ruff from 0.0.292 to 0.1.0 ([#3213](https://github.com/aws-powertools/powertools-lambda-python/issues/3213))
+* **deps:** bump actions/checkout from 4.1.0 to 4.1.1 ([#3220](https://github.com/aws-powertools/powertools-lambda-python/issues/3220))
+* **deps:** bump release-drafter/release-drafter from 5.24.0 to 5.25.0 ([#3219](https://github.com/aws-powertools/powertools-lambda-python/issues/3219))
+* **deps:** bump the layer-balancer group in /layer/scripts/layer-balancer with 1 update ([#3215](https://github.com/aws-powertools/powertools-lambda-python/issues/3215))
+* **deps:** bump squidfunk/mkdocs-material from `df9409b` to `772e14e` in /docs ([#3265](https://github.com/aws-powertools/powertools-lambda-python/issues/3265))
+* **deps:** bump actions/setup-node from 3.8.1 to 4.0.0 ([#3244](https://github.com/aws-powertools/powertools-lambda-python/issues/3244))
+* **deps:** bump squidfunk/mkdocs-material from `cb38dc2` to `df9409b` in /docs ([#3216](https://github.com/aws-powertools/powertools-lambda-python/issues/3216))
 * **deps-dev:** bump aws-cdk from 2.101.1 to 2.102.0 ([#3232](https://github.com/aws-powertools/powertools-lambda-python/issues/3232))
+* **deps-dev:** bump ruff from 0.1.0 to 0.1.1 ([#3235](https://github.com/aws-powertools/powertools-lambda-python/issues/3235))
+* **deps-dev:** bump cfn-lint from 0.82.0 to 0.82.2 ([#3229](https://github.com/aws-powertools/powertools-lambda-python/issues/3229))
+* **deps-dev:** bump the boto-typing group with 2 updates ([#3242](https://github.com/aws-powertools/powertools-lambda-python/issues/3242))
+* **deps-dev:** bump the boto-typing group with 1 update ([#3231](https://github.com/aws-powertools/powertools-lambda-python/issues/3231))
 * **deps-dev:** bump cfn-lint from 0.81.0 to 0.82.0 ([#3224](https://github.com/aws-powertools/powertools-lambda-python/issues/3224))
 * **deps-dev:** bump aws-cdk from 2.101.0 to 2.101.1 ([#3223](https://github.com/aws-powertools/powertools-lambda-python/issues/3223))
-* **deps-dev:** bump the boto-typing group with 1 update ([#3231](https://github.com/aws-powertools/powertools-lambda-python/issues/3231))
-* **deps-dev:** bump urllib3 from 1.26.17 to 1.26.18 in /layer ([#3221](https://github.com/aws-powertools/powertools-lambda-python/issues/3221))
-* **deps-dev:** bump ruff from 0.1.0 to 0.1.1 ([#3235](https://github.com/aws-powertools/powertools-lambda-python/issues/3235))
 * **deps-dev:** bump ruff from 0.1.1 to 0.1.2 ([#3250](https://github.com/aws-powertools/powertools-lambda-python/issues/3250))
+* **deps-dev:** bump urllib3 from 1.26.17 to 1.26.18 in /layer ([#3221](https://github.com/aws-powertools/powertools-lambda-python/issues/3221))
 * **deps-dev:** bump pytest from 7.4.2 to 7.4.3 ([#3249](https://github.com/aws-powertools/powertools-lambda-python/issues/3249))
+* **deps-dev:** bump cfn-lint from 0.83.0 to 0.83.1 ([#3274](https://github.com/aws-powertools/powertools-lambda-python/issues/3274))
+* **deps-dev:** bump ruff from 0.0.292 to 0.1.0 ([#3213](https://github.com/aws-powertools/powertools-lambda-python/issues/3213))
 * **deps-dev:** bump aws-cdk-lib from 2.100.0 to 2.101.1 ([#3217](https://github.com/aws-powertools/powertools-lambda-python/issues/3217))
 * **deps-dev:** bump aws-cdk from 2.100.0 to 2.101.0 ([#3214](https://github.com/aws-powertools/powertools-lambda-python/issues/3214))
 * **deps-dev:** bump aws-cdk-lib from 2.102.0 to 2.103.0 ([#3258](https://github.com/aws-powertools/powertools-lambda-python/issues/3258))
-* **deps-dev:** bump the boto-typing group with 2 updates ([#3242](https://github.com/aws-powertools/powertools-lambda-python/issues/3242))
-* **deps-dev:** bump cfn-lint from 0.82.2 to 0.83.0 ([#3243](https://github.com/aws-powertools/powertools-lambda-python/issues/3243))
-* **deps-dev:** bump the boto-typing group with 2 updates ([#3211](https://github.com/aws-powertools/powertools-lambda-python/issues/3211))
 * **deps-dev:** bump ruff from 0.1.2 to 0.1.3 ([#3257](https://github.com/aws-powertools/powertools-lambda-python/issues/3257))
 * **deps-dev:** bump aws-cdk from 2.102.0 to 2.103.0 ([#3259](https://github.com/aws-powertools/powertools-lambda-python/issues/3259))
-* **deps-dev:** bump cfn-lint from 0.82.0 to 0.82.2 ([#3229](https://github.com/aws-powertools/powertools-lambda-python/issues/3229))
+* **deps-dev:** bump the boto-typing group with 2 updates ([#3211](https://github.com/aws-powertools/powertools-lambda-python/issues/3211))
+* **deps-dev:** bump aws-cdk-lib from 2.103.0 to 2.103.1 ([#3263](https://github.com/aws-powertools/powertools-lambda-python/issues/3263))
+* **deps-dev:** bump aws-cdk from 2.103.0 to 2.103.1 ([#3264](https://github.com/aws-powertools/powertools-lambda-python/issues/3264))
+* **deps-dev:** bump cfn-lint from 0.82.2 to 0.83.0 ([#3243](https://github.com/aws-powertools/powertools-lambda-python/issues/3243))
 
 
 <a name="v2.26.0"></a>
diff --git a/aws_lambda_powertools/utilities/data_classes/kinesis_firehose_event.py b/aws_lambda_powertools/utilities/data_classes/kinesis_firehose_event.py
@@ -201,7 +201,7 @@ def sequence_number(self) -> str:
         return self._metadata["sequenceNumber"]
 
     @property
-    def subsequence_number(self) -> str:
+    def subsequence_number(self) -> int:
         """Kinesis stream sub-sequence number; present only when Kinesis Stream is source
 
         Note: this will only be present for Kinesis streams using record aggregation
diff --git a/aws_lambda_powertools/utilities/parser/models/kinesis_firehose.py b/aws_lambda_powertools/utilities/parser/models/kinesis_firehose.py
@@ -10,7 +10,7 @@ class KinesisFirehoseRecordMetadata(BaseModel):
     partitionKey: str
     approximateArrivalTimestamp: PositiveInt
     sequenceNumber: str
-    subsequenceNumber: str
+    subsequenceNumber: int
 
 
 class KinesisFirehoseRecord(BaseModel):
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -71,7 +71,7 @@ pytest-benchmark = "^4.0.0"
 mypy-boto3-appconfig = "^1.28.68"
 mypy-boto3-cloudformation = "^1.28.64"
 mypy-boto3-cloudwatch = "^1.28.36"
-mypy-boto3-dynamodb = "^1.28.66"
+mypy-boto3-dynamodb = "^1.28.73"
 mypy-boto3-lambda = "^1.28.63"
 mypy-boto3-logs = "^1.28.52"
 mypy-boto3-secretsmanager = "^1.28.36"
@@ -101,7 +101,7 @@ datadog = ["datadog-lambda"]
 datamasking-aws-sdk = ["aws-encryption-sdk"]
 
 [tool.poetry.group.dev.dependencies]
-cfn-lint = "0.83.0"
+cfn-lint = "0.83.1"
 mypy = "^1.1.1"
 types-python-dateutil = "^2.8.19.6"
 httpx = ">=0.23.3,<0.25.0"
diff --git a/tests/events/kinesisFirehoseKinesisEvent.json b/tests/events/kinesisFirehoseKinesisEvent.json
@@ -13,7 +13,7 @@
                 "partitionKey": "4d1ad2b9-24f8-4b9d-a088-76e9947c317a",
                 "approximateArrivalTimestamp": 1664028820148,
                 "sequenceNumber": "49546986683135544286507457936321625675700192471156785154",
-                "subsequenceNumber": ""
+                "subsequenceNumber": 0
             }
         },
         {
@@ -25,7 +25,7 @@
                 "partitionKey": "4d1ad2b9-24f8-4b9d-a088-76e9947c318a",
                 "approximateArrivalTimestamp": 1664028793294,
                 "sequenceNumber": "49546986683135544286507457936321625675700192471156785155",
-                "subsequenceNumber": ""
+                "subsequenceNumber": 0
             }
         }
     ]
diff --git a/tests/unit/parser/test_kinesis_firehose.py b/tests/unit/parser/test_kinesis_firehose.py
@@ -62,7 +62,7 @@ def test_firehose_trigger_event_kinesis_no_envelope():
 
     metadata_01: KinesisFirehoseRecordMetadata = record_01.kinesisRecordMetadata
     assert metadata_01.partitionKey == "4d1ad2b9-24f8-4b9d-a088-76e9947c317a"
-    assert metadata_01.subsequenceNumber == ""
+    assert metadata_01.subsequenceNumber == 0
     assert metadata_01.shardId == "shardId-000000000000"
     assert metadata_01.approximateArrivalTimestamp == 1664028820148
     assert metadata_01.sequenceNumber == "49546986683135544286507457936321625675700192471156785154"
@@ -74,7 +74,7 @@ def test_firehose_trigger_event_kinesis_no_envelope():
 
     metadata_02: KinesisFirehoseRecordMetadata = record_02.kinesisRecordMetadata
     assert metadata_02.partitionKey == "4d1ad2b9-24f8-4b9d-a088-76e9947c318a"
-    assert metadata_02.subsequenceNumber == ""
+    assert metadata_02.subsequenceNumber == 0
     assert metadata_02.shardId == "shardId-000000000001"
     assert metadata_02.approximateArrivalTimestamp == 1664028793294
     assert metadata_02.sequenceNumber == "49546986683135544286507457936321625675700192471156785155"

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"partitionKey": "4d1ad2b9-24f8-4b9d-a088-76e9947c317a",`
`14`	`14`	`"approximateArrivalTimestamp": 1664028820148,`
`15`	`15`	`"sequenceNumber": "49546986683135544286507457936321625675700192471156785154",`
`16`		`- "subsequenceNumber": ""`
	`16`	`+ "subsequenceNumber": 0`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`	`{`
`@@ -25,7 +25,7 @@`
`25`	`25`	`"partitionKey": "4d1ad2b9-24f8-4b9d-a088-76e9947c318a",`
`26`	`26`	`"approximateArrivalTimestamp": 1664028793294,`
`27`	`27`	`"sequenceNumber": "49546986683135544286507457936321625675700192471156785155",`
`28`		`- "subsequenceNumber": ""`
	`28`	`+ "subsequenceNumber": 0`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`]`