Merge branch 'develop' into feat/add-cloud-watch-alarm-event-data-class

Author: rubenfonseca

.github/workflows/publish_v2_layer.yml

@@ -258,7 +258,7 @@ jobs:
           artifact_name: ${{ inputs.source_code_artifact_name }}
 
       - name: Download CDK layer artifacts
-        uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3
+        uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
         with:
           path: cdk-layer-stack
           pattern: cdk-layer-stack-*  # merge all Layer artifacts created per region earlier (reusable_deploy_v2_layer_stack.yml; step "Save Layer ARN artifact")

.github/workflows/reusable_deploy_v2_layer_stack.yml

@@ -180,7 +180,7 @@ jobs:
       - name: install deps
         run: poetry install
       - name: Download artifact
-        uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3
+        uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
         with:
           name: ${{ inputs.artefact-name }}
           path: layer

.github/workflows/reusable_deploy_v2_sar.yml

@@ -115,7 +115,7 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Download artifact
-        uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3
+        uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
         with:
           name: ${{ inputs.artefact-name }}
       - name: Unzip artefact

CHANGELOG.md

@@ -4,11 +4,24 @@
 <a name="unreleased"></a>
 # Unreleased
 
+## Bug Fixes
+
+* **event_handler:** OpenAPI schema version respects Pydantic version ([#3860](https://github.com/aws-powertools/powertools-lambda-python/issues/3860))
+
 ## Maintenance
 
+* **deps:** bump redis from 5.0.1 to 5.0.2 ([#3867](https://github.com/aws-powertools/powertools-lambda-python/issues/3867))
 * **deps:** bump codecov/codecov-action from 4.0.2 to 4.1.0 ([#3856](https://github.com/aws-powertools/powertools-lambda-python/issues/3856))
+* **deps:** bump actions/download-artifact from 4.1.2 to 4.1.3 ([#3862](https://github.com/aws-powertools/powertools-lambda-python/issues/3862))
+* **deps:** bump squidfunk/mkdocs-material from `49d1bfd` to `7be068b` in /docs ([#3872](https://github.com/aws-powertools/powertools-lambda-python/issues/3872))
+* **deps:** bump docker/setup-buildx-action from 3.0.0 to 3.1.0 ([#3864](https://github.com/aws-powertools/powertools-lambda-python/issues/3864))
 * **deps:** bump squidfunk/mkdocs-material from `43b898a` to `49d1bfd` in /docs ([#3857](https://github.com/aws-powertools/powertools-lambda-python/issues/3857))
+* **deps:** bump pypa/gh-action-pypi-publish from 1.8.11 to 1.8.12 ([#3863](https://github.com/aws-powertools/powertools-lambda-python/issues/3863))
+* **deps:** bump actions/download-artifact from 4.1.3 to 4.1.4 ([#3875](https://github.com/aws-powertools/powertools-lambda-python/issues/3875))
 * **deps-dev:** bump black from 24.1.1 to 24.2.0 ([#3760](https://github.com/aws-powertools/powertools-lambda-python/issues/3760))
+* **deps-dev:** bump cfn-lint from 0.85.2 to 0.85.3 ([#3861](https://github.com/aws-powertools/powertools-lambda-python/issues/3861))
+* **deps-dev:** bump ruff from 0.2.2 to 0.3.0 ([#3871](https://github.com/aws-powertools/powertools-lambda-python/issues/3871))
+* **deps-dev:** bump mkdocs-material from 9.5.11 to 9.5.12 ([#3870](https://github.com/aws-powertools/powertools-lambda-python/issues/3870))
 
 
 <a name="v2.34.2"></a>

aws_lambda_powertools/event_handler/api_gateway.py

@@ -1455,10 +1455,25 @@ def get_openapi_schema(
             get_definitions,
         )
         from aws_lambda_powertools.event_handler.openapi.models import OpenAPI, PathItem, Server, Tag
+        from aws_lambda_powertools.event_handler.openapi.pydantic_loader import PYDANTIC_V2
         from aws_lambda_powertools.event_handler.openapi.types import (
             COMPONENT_REF_TEMPLATE,
         )
 
+        # Pydantic V2 has no support for OpenAPI schema 3.0
+        if PYDANTIC_V2 and not openapi_version.startswith("3.1"):
+            warnings.warn(
+                "You are using Pydantic v2, which is incompatible with OpenAPI schema 3.0. Forcing OpenAPI 3.1",
+                stacklevel=2,
+            )
+            openapi_version = "3.1.0"
+        elif not PYDANTIC_V2 and not openapi_version.startswith("3.0"):
+            warnings.warn(
+                "You are using Pydantic v1, which is incompatible with OpenAPI schema 3.1. Forcing OpenAPI 3.0",
+                stacklevel=2,
+            )
+            openapi_version = "3.0.3"
+
         # Start with the bare minimum required for a valid OpenAPI schema
         info: Dict[str, Any] = {"title": title, "version": version}
 

aws_lambda_powertools/event_handler/openapi/constants.py

@@ -1,2 +1,2 @@
 DEFAULT_API_VERSION = "1.0.0"
-DEFAULT_OPENAPI_VERSION = "3.0.0"
+DEFAULT_OPENAPI_VERSION = "3.0.3"

aws_lambda_powertools/event_handler/openapi/models.py

@@ -45,20 +45,20 @@ class Config:
 # https://swagger.io/specification/#info-object
 class Info(BaseModel):
     title: str
-    summary: Optional[str] = None
     description: Optional[str] = None
     termsOfService: Optional[str] = None
     contact: Optional[Contact] = None
     license: Optional[License] = None  # noqa: A003
     version: str
 
     if PYDANTIC_V2:
-        model_config = {"extra": "allow"}
+        summary: Optional[str] = None
+        model_config = {"extra": "ignore"}
 
     else:
 
         class Config:
-            extra = "allow"
+            extra = "ignore"
 
 
 # https://swagger.io/specification/#server-variable-object

aws_lambda_powertools/event_handler/openapi/swagger_ui/swagger-ui-bundle.min.js

@@ -451,12 +451,12 @@ def decorate(event, context, *args, **kwargs):
     def info(
         self,
         msg: object,
-        *args,
-        exc_info=None,
+        *args: object,
+        exc_info: logging._ExcInfoType = None,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Optional[Mapping[str, object]] = None,
-        **kwargs,
+        **kwargs: object,
     ) -> None:
         extra = extra or {}
         extra = {**extra, **kwargs}
@@ -473,12 +473,12 @@ def info(
     def error(
         self,
         msg: object,
-        *args,
-        exc_info=None,
+        *args: object,
+        exc_info: logging._ExcInfoType = None,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Optional[Mapping[str, object]] = None,
-        **kwargs,
+        **kwargs: object,
     ) -> None:
         extra = extra or {}
         extra = {**extra, **kwargs}
@@ -495,12 +495,12 @@ def error(
     def exception(
         self,
         msg: object,
-        *args,
+        *args: object,
         exc_info: logging._ExcInfoType = True,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Optional[Mapping[str, object]] = None,
-        **kwargs,
+        **kwargs: object,
     ) -> None:
         extra = extra or {}
         extra = {**extra, **kwargs}
@@ -517,12 +517,12 @@ def exception(
     def critical(
         self,
         msg: object,
-        *args,
-        exc_info=None,
+        *args: object,
+        exc_info: logging._ExcInfoType = None,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Optional[Mapping[str, object]] = None,
-        **kwargs,
+        **kwargs: object,
     ) -> None:
         extra = extra or {}
         extra = {**extra, **kwargs}
@@ -539,12 +539,12 @@ def critical(
     def warning(
         self,
         msg: object,
-        *args,
-        exc_info=None,
+        *args: object,
+        exc_info: logging._ExcInfoType = None,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Optional[Mapping[str, object]] = None,
-        **kwargs,
+        **kwargs: object,
     ) -> None:
         extra = extra or {}
         extra = {**extra, **kwargs}
@@ -561,12 +561,12 @@ def warning(
     def debug(
         self,
         msg: object,
-        *args,
-        exc_info=None,
+        *args: object,
+        exc_info: logging._ExcInfoType = None,
         stack_info: bool = False,
         stacklevel: int = 2,
         extra: Optional[Mapping[str, object]] = None,
-        **kwargs,
+        **kwargs: object,
     ) -> None:
         extra = extra or {}
         extra = {**extra, **kwargs}

aws_lambda_powertools/event_handler/openapi/swagger_ui/swagger-ui.min.css

@@ -959,7 +959,10 @@ This will enable full tracebacks errors in the response, print request and respo
 
 ### OpenAPI
 
-When you enable [Data Validation](#data-validation), we use a combination of Pydantic Models and [OpenAPI](https://www.openapis.org/){target="_blank"} type annotations to add constraints to your API's parameters.
+When you enable [Data Validation](#data-validation), we use a combination of Pydantic Models and [OpenAPI](https://www.openapis.org/){target="_blank" rel="nofollow"} type annotations to add constraints to your API's parameters.
+
+???+ warning "OpenAPI schema version depends on the installed version of Pydantic"
+    Pydantic v1 generates [valid OpenAPI 3.0.3 schemas](https://docs.pydantic.dev/1.10/usage/schema/){target="_blank" rel="nofollow"}, and Pydantic v2 generates [valid OpenAPI 3.1.0 schemas](https://docs.pydantic.dev/latest/why/#json-schema){target="_blank" rel="nofollow"}.
 
 In OpenAPI documentation tools like [SwaggerUI](#enabling-swaggerui), these annotations become readable descriptions, offering a self-explanatory API interface. This reduces boilerplate code while improving functionality and enabling auto-documentation.
 
@@ -1042,18 +1045,18 @@ Below is an example configuration for serving Swagger UI from a custom path or C
 
 Defining and customizing OpenAPI metadata gives detailed, top-level information about your API. Here's the method to set and tailor this metadata:
 
-| Field Name         | Type           | Description                                                                                                                                                                         |
-| ------------------ | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `title`            | `str`          | The title for your API. It should be a concise, specific name that can be used to identify the API in documentation or listings.                                                    |
-| `version`          | `str`          | The version of the API you are documenting. This could reflect the release iteration of the API and helps clients understand the evolution of the API.                              |
-| `openapi_version`  | `str`          | Specifies the version of the OpenAPI Specification on which your API is based. For most contemporary APIs, the default value would be `3.0.0` or higher.                            |
-| `summary`          | `str`          | A short and informative summary that can provide an overview of what the API does. This can be the same as or different from the title but should add context or information.       |
-| `description`      | `str`          | A verbose description that can include Markdown formatting, providing a full explanation of the API's purpose, functionalities, and general usage instructions.                     |
-| `tags`             | `List[str]`    | A collection of tags that categorize endpoints for better organization and navigation within the documentation. This can group endpoints by their functionality or other criteria.  |
-| `servers`          | `List[Server]` | An array of Server objects, which specify the URL to the server and a description for its environment (production, staging, development, etc.), providing connectivity information. |
-| `terms_of_service` | `str`          | A URL that points to the terms of service for your API. This could provide legal information and user responsibilities related to the usage of the API.                             |
-| `contact`          | `Contact`      | A Contact object containing contact details of the organization or individuals maintaining the API. This may include fields such as name, URL, and email.                           |
-| `license_info`     | `License`      | A License object providing the license details for the API, typically including the name of the license and the URL to the full license text.                                       |
+| Field Name         | Type           | Description                                                                                                                                                                                                            |
+| ------------------ | -------------- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `title`            | `str`          | The title for your API. It should be a concise, specific name that can be used to identify the API in documentation or listings.                                                                                       |
+| `version`          | `str`          | The version of the API you are documenting. This could reflect the release iteration of the API and helps clients understand the evolution of the API.                                                                 |
+| `openapi_version`  | `str`          | Specifies the version of the OpenAPI Specification on which your API is based. When using Pydantic v1 it defaults to 3.0.3, and when using Pydantic v2, it defaults to 3.1.0.                                          |
+| `summary`          | `str`          | A short and informative summary that can provide an overview of what the API does. This can be the same as or different from the title but should add context or information. **Not supported when using Pydantic v1** |
+| `description`      | `str`          | A verbose description that can include Markdown formatting, providing a full explanation of the API's purpose, functionalities, and general usage instructions.                                                        |
+| `tags`             | `List[str]`    | A collection of tags that categorize endpoints for better organization and navigation within the documentation. This can group endpoints by their functionality or other criteria.                                     |
+| `servers`          | `List[Server]` | An array of Server objects, which specify the URL to the server and a description for its environment (production, staging, development, etc.), providing connectivity information.                                    |
+| `terms_of_service` | `str`          | A URL that points to the terms of service for your API. This could provide legal information and user responsibilities related to the usage of the API.                                                                |
+| `contact`          | `Contact`      | A Contact object containing contact details of the organization or individuals maintaining the API. This may include fields such as name, URL, and email.                                                              |
+| `license_info`     | `License`      | A License object providing the license details for the API, typically including the name of the license and the URL to the full license text.                                                                          |
 
 Include extra parameters when exporting your OpenAPI specification to apply these customizations:
 

aws_lambda_powertools/logging/logger.py

@@ -1,5 +1,6 @@
 import json
 
+import fastjsonschema
 import pytest
 
 from tests.functional.utils import load_event
@@ -71,3 +72,45 @@ def gw_event_vpc_lattice():
 @pytest.fixture
 def gw_event_vpc_lattice_v1():
     return load_event("vpcLatticeEvent.json")
+
+
+@pytest.fixture(scope="session")
+def pydanticv1_only():
+    from pydantic import __version__
+
+    version = __version__.split(".")
+    if version[0] != "1":
+        pytest.skip("pydanticv1 test only")
+
+
+@pytest.fixture(scope="session")
+def pydanticv2_only():
+    from pydantic import __version__
+
+    version = __version__.split(".")
+    if version[0] != "2":
+        pytest.skip("pydanticv2 test only")
+
+
+@pytest.fixture(scope="session")
+def openapi30_schema():
+    from urllib.request import urlopen
+
+    f = urlopen("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json")
+    data = json.loads(f.read().decode("utf-8"))
+    return fastjsonschema.compile(
+        data,
+        use_formats=False,
+    )
+
+
+@pytest.fixture(scope="session")
+def openapi31_schema():
+    from urllib.request import urlopen
+
+    f = urlopen("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json")
+    data = json.loads(f.read().decode("utf-8"))
+    return fastjsonschema.compile(
+        data,
+        use_formats=False,
+    )

docs/core/event_handler/api_gateway.md

@@ -9,15 +9,6 @@
 from aws_lambda_powertools.event_handler.openapi.encoders import jsonable_encoder
 
 
-@pytest.fixture
-def pydanticv1_only():
-    from pydantic import __version__
-
-    version = __version__.split(".")
-    if version[0] != "1":
-        pytest.skip("pydanticv1 test only")
-
-
 def test_openapi_encode_include():
     class User(BaseModel):
         name: str