feat: migrate to Pydantic v2 #3862
+13,168
−5,532
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -120,3 +120,4 @@ venv.bak/ | |
| integration/config/file_to_s3_map_modified.json | ||
|
|
||
| .tmp | ||
| .kiro | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| boto3>=1.34.0,<2.0.0 | ||
| jsonschema>=4.23,<5 # 4.23+ required for Python 3.14.2+ compatibility | ||
| typing_extensions>=4.4 # 3.8 doesn't have Required, TypeGuard and ParamSpec | ||
|
|
||
| # resource validation & schema generation | ||
| pydantic>=2.0,<3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,4 @@ | ||
| # Pydantic v2 direct import - no compatibility shim needed | ||
| import pydantic | ||
|
Contributor
There was a problem hiding this comment. Do we even use this file anymore? It looks like we replaced it everywhere (or almost?). |
||
|
|
||
| __all__ = ["pydantic"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,30 @@ | ||
| from typing import Any, Dict | ||
|
|
||
| from pydantic import field_validator | ||
|
|
||
| from samtranslator.internal.schema_source.common import LenientBaseModel | ||
|
|
||
|
|
||
| # Anything goes if has string Type but is not AWS::Serverless::* | ||
| class Resource(LenientBaseModel): | ||
| Type: str | ||
|
|
||
| # Use model_json_schema_extra to add the pattern to JSON Schema | ||
| # Pydantic's Rust regex doesn't support lookahead, but JSON Schema validators do | ||
| model_config = { | ||
| "json_schema_extra": lambda schema, _: _add_type_pattern(schema), | ||
| } | ||
|
|
||
| @field_validator("Type") | ||
| @classmethod | ||
| def type_must_not_be_serverless(cls, v: str) -> str: | ||
| """Validate that Type does not start with AWS::Serverless::""" | ||
| if v.startswith("AWS::Serverless::"): | ||
| raise ValueError("Type must not start with 'AWS::Serverless::'") | ||
| return v | ||
|
|
||
|
|
||
| def _add_type_pattern(schema: Dict[str, Any]) -> None: | ||
| """Add pattern constraint to Type field in JSON Schema.""" | ||
| if "properties" in schema and "Type" in schema["properties"]: | ||
| schema["properties"]["Type"]["pattern"] = r"^(?!AWS::Serverless::).+$" |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of these in this file were removed in a previous PR: https://github.com/aws/serverless-application-model/blob/761f208bcdb25ec25d0700bf0e1e68f2a2b589b1/.cfnlintrc.yaml and this is bringing them back (we shouldn't)