Merge branch 'develop' into ci/add-docs-build-workflow

leandrodamascena · web-flow · commit 840c859b8893 · 2025-07-17T13:12:20.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,21 @@
 <a name="unreleased"></a>
 # Unreleased
 
+## Features
+
+* **typing:** add tenant_id property ([#6985](https://github.com/aws-powertools/powertools-lambda-python/issues/6985))
+
 ## Maintenance
 
+* **ci:** new pre-release 3.17.1a0 ([#6989](https://github.com/aws-powertools/powertools-lambda-python/issues/6989))
+* **ci:** new pre-release 3.17.1a1 ([#6997](https://github.com/aws-powertools/powertools-lambda-python/issues/6997))
+* **deps-dev:** bump aws-cdk from 2.1020.2 to 2.1021.0 ([#6992](https://github.com/aws-powertools/powertools-lambda-python/issues/6992))
+* **deps-dev:** bump boto3-stubs from 1.39.4 to 1.39.7 ([#6994](https://github.com/aws-powertools/powertools-lambda-python/issues/6994))
+* **deps-dev:** bump sentry-sdk from 2.32.0 to 2.33.0 ([#6988](https://github.com/aws-powertools/powertools-lambda-python/issues/6988))
+* **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.204.0a0 to 2.205.0a0 ([#6986](https://github.com/aws-powertools/powertools-lambda-python/issues/6986))
+* **deps-dev:** bump aws-cdk-lib from 2.205.0 to 2.206.0 ([#6996](https://github.com/aws-powertools/powertools-lambda-python/issues/6996))
+* **deps-dev:** bump pytest-asyncio from 0.26.0 to 1.1.0 ([#6995](https://github.com/aws-powertools/powertools-lambda-python/issues/6995))
+* **deps-dev:** bump aws-cdk-aws-lambda-python-alpha from 2.205.0a0 to 2.206.0a0 ([#6993](https://github.com/aws-powertools/powertools-lambda-python/issues/6993))
 
 
 <a name="v3.17.0"></a>
diff --git a/aws_lambda_powertools/shared/version.py b/aws_lambda_powertools/shared/version.py
@@ -1,3 +1,3 @@
 """Exposes version constant to avoid circular dependencies."""
 
-VERSION = "3.17.0"
+VERSION = "3.17.1a1"
diff --git a/aws_lambda_powertools/utilities/parser/models/__init__.py b/aws_lambda_powertools/utilities/parser/models/__init__.py
@@ -27,9 +27,8 @@
     RequestContextV2AuthorizerJwt,
     RequestContextV2Http,
 )
-from .appsync import (
-    AppSyncResolverEventModel,
-)
+from .appsync import AppSyncResolverEventModel
+from .appsync_events import AppSyncEventsModel
 from .bedrock_agent import (
     BedrockAgentEventModel,
     BedrockAgentFunctionEventModel,
@@ -170,6 +169,7 @@
     "AlbRequestContext",
     "AlbRequestContextData",
     "AppSyncResolverEventModel",
+    "AppSyncEventsModel",
     "DynamoDBStreamModel",
     "EventBridgeModel",
     "DynamoDBStreamChangedRecordModel",
diff --git a/aws_lambda_powertools/utilities/parser/models/appsync_events.py b/aws_lambda_powertools/utilities/parser/models/appsync_events.py
@@ -0,0 +1,35 @@
+from typing import Any, Dict, List, Literal, Optional
+
+from pydantic import BaseModel
+
+from aws_lambda_powertools.utilities.parser.models.appsync import AppSyncIdentity, AppSyncRequestModel
+
+
+class AppSyncEventsInfoChannelModel(BaseModel):
+    path: str
+    segments: List[str]
+
+
+class AppSyncEventsInfoChannelNamespaceModel(BaseModel):
+    name: str
+
+
+class AppSyncEventsInfoModel(BaseModel):
+    channel: AppSyncEventsInfoChannelModel
+    channelNamespace: AppSyncEventsInfoChannelNamespaceModel
+    operation: Literal["PUBLISH", "SUBSCRIBE"]
+
+
+class AppSyncEventsEventModel(BaseModel):
+    id: str
+    payload: Dict[str, Any]
+
+
+class AppSyncEventsModel(BaseModel):
+    identity: Optional[AppSyncIdentity] = None
+    request: AppSyncRequestModel
+    info: AppSyncEventsInfoModel
+    prev: Optional[str] = None
+    outErrors: Optional[List[str]] = None
+    stash: Optional[Dict[str, Any]] = None
+    events: Optional[List[AppSyncEventsEventModel]] = None
diff --git a/aws_lambda_powertools/utilities/typing/lambda_context.py b/aws_lambda_powertools/utilities/typing/lambda_context.py
@@ -34,6 +34,7 @@ class LambdaContext:
     _aws_request_id: str
     _log_group_name: str
     _log_stream_name: str
+    _tenant_id: str | None = None
     _identity: LambdaCognitoIdentity
     _client_context: LambdaClientContext
 
@@ -75,14 +76,19 @@ def log_stream_name(self) -> str:
 
     @property
     def identity(self) -> LambdaCognitoIdentity:
-        """(mobile apps) Information about the Amazon Cognito identity that authorized the request."""
+        """Information about the Amazon Cognito identity that authorized the request."""
         return self._identity
 
     @property
     def client_context(self) -> LambdaClientContext:
-        """(mobile apps) Client context that's provided to Lambda by the client application."""
+        """Client context that's provided to Lambda by the client application."""
         return self._client_context
 
+    @property
+    def tenant_id(self) -> str | None:
+        """The tenant_id"""
+        return self._tenant_id
+
     @staticmethod
     def get_remaining_time_in_millis() -> int:
         """Returns the number of milliseconds left before the execution times out."""
diff --git a/docs/core/event_handler/api_gateway.md b/docs/core/event_handler/api_gateway.md
@@ -11,7 +11,8 @@ Event handler for Amazon API Gateway REST and HTTP APIs, Application Load Balanc
 * Support for CORS, binary and Gzip compression, Decimals JSON encoding and bring your own JSON serializer
 * Built-in integration with [Event Source Data Classes utilities](../../utilities/data_classes.md){target="_blank"} for self-documented event schema
 * Works with micro function (one or a few routes) and monolithic functions (all routes)
-* Support for OpenAPI and data validation for requests/responses
+* Support for OpenAPI schema generation
+* Support data validation for requests/responses
 
 ## Getting started
 
@@ -430,7 +431,7 @@ This value will override the value of the failed response validation http code s
 
 #### Validating query strings
 
-!!! info "We will automatically validate and inject incoming query strings via type annotation."
+!!! info "You must set `enable_validation=True` to have access to the incoming query strings parameters via type annotation."
 
 We use the `Annotated` type to tell the Event Handler that a particular parameter is not only an optional string, but also a query string with constraints.
 
@@ -490,9 +491,9 @@ For example, we could validate that `<todo_id>` dynamic path should be no greate
 
 #### Validating headers
 
-We use the `Annotated` type to tell the Event Handler that a particular parameter is a header that needs to be validated.
+!!! info "You must set `enable_validation=True` to have access to the incoming headers parameters via type annotation."
 
-!!! info "We adhere to [HTTP RFC standards](https://www.rfc-editor.org/rfc/rfc7540#section-8.1.2){target="_blank" rel="nofollow"}, which means we treat HTTP headers as case-insensitive."
+We use the `Annotated` type to tell the Event Handler that a particular parameter is a header that needs to be validated. Also, we adhere to [HTTP RFC standards](https://www.rfc-editor.org/rfc/rfc7540#section-8.1.2){target="_blank" rel="nofollow"}, which means we treat HTTP headers as case-insensitive.
 
 In the following example, we use a new `Header` OpenAPI type to add [one out of many possible constraints](#customizing-openapi-parameters), which should read as:
 
diff --git a/docs/utilities/parser.md b/docs/utilities/parser.md
@@ -112,6 +112,7 @@ The example above uses `SqsModel`. Other built-in models can be found below.
 | **APIGatewayWebSocketConnectEventModel**    | Lambda Event Source payload for Amazon API Gateway WebSocket API $connect message             |
 | **APIGatewayWebSocketDisconnectEventModel** | Lambda Event Source payload for Amazon API Gateway WebSocket API $disconnect message          |
 | **AppSyncResolverEventModel**               | Lambda Event Source payload for AWS AppSync Resolver                                          |
+| **AppSyncEventsModel**                      | Lambda Event Source payload for AWS AppSync Events                                            |
 | **BedrockAgentEventModel**                  | Lambda Event Source payload for Bedrock Agents - OpenAPI-based                                |
 | **BedrockAgentFunctionEventModel**          | Lambda Event Source payload for Bedrock Agents - Function-based                               |
 | **CloudFormationCustomResourceCreateModel** | Lambda Event Source payload for AWS CloudFormation `CREATE` operation                         |
diff --git a/docs/utilities/typing.md b/docs/utilities/typing.md
@@ -42,5 +42,18 @@ Using `LambdaContext` typing makes it possible to access information and hints o
     --8<-- "examples/typing/src/working_with_context_function.py"
 	```
 
-![Utilities Typing All](../media/utilities_typing_2.png)
-![Utilities Typing Specific](../media/utilities_typing_3.png)
+### Available properties and methods
+
+| Name                           | Type     | Description                                                               |
+| ------------------------------ | -------- | ------------------------------------------------------------------------- |
+| `function_name`                | property | The name of the Lambda function                                           |
+| `function_version`             | property | The version of the function                                               |
+| `invoked_function_arn`         | property | The Amazon Resource Name (ARN) that's used to invoke the function         |
+| `memory_limit_in_mb`           | property | The amount of memory that's allocated for the function                    |
+| `aws_request_id`               | property | The identifier of the invocation request                                  |
+| `log_group_name`               | property | The log group for the function                                            |
+| `log_stream_name`              | property | The log stream for the function instance                                  |
+| `identity`                     | property | Information about the Amazon Cognito identity that authorized the request |
+| `client_context`               | property | Client context that's provided to Lambda by the client application        |
+| `tenant_id`                    | property | The tenant_id used to invoke the function                                 |
+| `get_remaining_time_in_millis` | method   | Returns the number of milliseconds left before the execution times out    |
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,6 +2,6 @@
   "name": "aws-lambda-powertools-python-e2e",
   "version": "1.0.0",
   "devDependencies": {
-    "aws-cdk": "^2.1020.2"
+    "aws-cdk": "^2.1021.0"
   }
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/provenance/3.17.1a0/multiple.intoto.jsonl b/provenance/3.17.1a0/multiple.intoto.jsonl
diff --git a/provenance/3.17.1a1/multiple.intoto.jsonl b/provenance/3.17.1a1/multiple.intoto.jsonl
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aws_lambda_powertools"
-version = "3.17.0"
+version = "3.17.1a1"
 description = "Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity."
 authors = ["Amazon Web Services"]
 include = ["aws_lambda_powertools/py.typed", "THIRD-PARTY-LICENSES"]
@@ -86,7 +86,7 @@ boto3 = "^1.26.164"
 isort = ">=5.13.2,<7.0.0"
 pytest-cov = ">=5,<7"
 pytest-mock = "^3.14.0"
-pytest-asyncio = ">=0.24,<0.27"
+pytest-asyncio = ">=0.24,<1.2"
 bandit = "^1.7.10"
 radon = "^6.0.1"
 xenon = "^0.9.3"
diff --git a/tests/events/appSyncEventsEvent.json b/tests/events/appSyncEventsEvent.json
@@ -1,5 +1,5 @@
 {
-    "identity":"None",
+    "identity": null,
     "result":"None",
     "request":{
        "headers": {
diff --git a/tests/functional/typing/required_dependencies/test_utilities_typing.py b/tests/functional/typing/required_dependencies/test_utilities_typing.py
@@ -19,6 +19,7 @@ def test_typing():
     context._aws_request_id = "_aws_request_id"
     context._log_group_name = "_log_group_name"
     context._log_stream_name = "_log_stream_name"
+    context._tenant_id = "_tenant_id"
     identity = LambdaCognitoIdentity()
     identity._cognito_identity_id = "_cognito_identity_id"
     identity._cognito_identity_pool_id = "_cognito_identity_pool_id"
@@ -42,6 +43,7 @@ def test_typing():
     assert context.aws_request_id == context._aws_request_id
     assert context.log_group_name == context._log_group_name
     assert context.log_stream_name == context._log_stream_name
+    assert context.tenant_id == context._tenant_id
     assert context.identity == context._identity
     assert context.identity.cognito_identity_id == identity._cognito_identity_id
     assert context.identity.cognito_identity_pool_id == identity._cognito_identity_pool_id
diff --git a/tests/unit/parser/_pydantic/test_appsync_events.py b/tests/unit/parser/_pydantic/test_appsync_events.py
@@ -0,0 +1,24 @@
+import pytest
+
+from aws_lambda_powertools.utilities.parser import ValidationError, parse
+from aws_lambda_powertools.utilities.parser.models import AppSyncEventsModel
+from tests.functional.utils import load_event
+
+
+def test_appsync_event_model_parses_successfully():
+    """
+    Validate that a valid AppSync resolver events is correctly parsed by the model.
+    """
+    event = load_event("appSyncEventsEvent.json")
+    parsed_event = parse(event=event, model=AppSyncEventsModel)
+
+    assert isinstance(parsed_event, AppSyncEventsModel)
+
+
+def test_appsync_event_model_invalid_payload_raises():
+    """
+    Validate that parsing an invalid AppSync resolver events payload raises a ValidationError.
+    """
+    invalid_event = {"invalid": "event"}
+    with pytest.raises(ValidationError):
+        parse(event=invalid_event, model=AppSyncEventsModel)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""Exposes version constant to avoid circular dependencies."""`
`2`	`2`
`3`		`-VERSION = "3.17.0"`
	`3`	`+VERSION = "3.17.1a1"`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"name": "aws-lambda-powertools-python-e2e",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"devDependencies": {`
`5`		`- "aws-cdk": "^2.1020.2"`
	`5`	`+ "aws-cdk": "^2.1021.0"`
`6`	`6`	`}`
`7`	`7`	`}`