Some progress, still tests are failing

Author: Ignacio Bolonio

Diff for: pycfmodel/model/base.py

@@ -1,12 +1,10 @@
-from pydantic import BaseModel, Extra, root_validator
+from pydantic import BaseModel, ConfigDict, model_validator
 
 from pycfmodel.utils import is_resolvable_dict
 
 
 class CustomModel(BaseModel):
-    class Config(BaseModel.Config):
-        extra = Extra.forbid
-        underscore_attrs_are_private = True
+    model_config = ConfigDict(extra="forbid")
 
     def dict(self, *args, exclude_unset=True, **kwargs):
         return super().dict(*args, **kwargs, exclude_unset=exclude_unset)
@@ -15,10 +13,10 @@ def dict(self, *args, exclude_unset=True, **kwargs):
 class FunctionDict(BaseModel):
     # Inheriting directly from base model as we want to allow extra fields
     # and there are no default values that we need to suppress
-    class Config(BaseModel.Config):
-        extra = Extra.allow
+    model_config = ConfigDict(extra="allow")
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def check_if_valid_function(cls, values):
         if not is_resolvable_dict(values):
             raise ValueError("FunctionDict should only have 1 key and be a function")

Diff for: pycfmodel/model/cf_model.py

@@ -32,7 +32,7 @@ class CFModel(CustomModel):
     More info at [AWS Docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-anatomy.html)
     """
 
-    AWSTemplateFormatVersion: Optional[date]
+    AWSTemplateFormatVersion: Optional[date] = None
     Conditions: Optional[Dict] = {}
     Description: Optional[str] = None
     Mappings: Optional[Dict[str, Dict[str, Dict[str, Any]]]] = {}
@@ -41,7 +41,7 @@ class CFModel(CustomModel):
     Parameters: Optional[Dict[str, Parameter]] = {}
     Resources: Dict[str, Resolvable[Union[ResourceModels, GenericResource]]] = {}
     Rules: Optional[Dict] = {}
-    Transform: Optional[Union[str, List[str]]]
+    Transform: Optional[Union[str, List[str]]] = None
 
     PSEUDO_PARAMETERS: ClassVar[Dict[str, Union[str, List[str]]]] = {
         # default pseudo parameters

Diff for: pycfmodel/model/generic.py

@@ -2,7 +2,7 @@
 from contextlib import suppress
 from typing import Union
 
-from pydantic import BaseModel, Extra, ValidationError, root_validator, validator
+from pydantic import BaseModel, ConfigDict, Field, ValidationError, field_validator, model_validator
 
 from pycfmodel.model.base import FunctionDict
 from pycfmodel.model.resources.properties.types import Properties
@@ -25,14 +25,15 @@ class _Auxiliar(BaseModel):
         Properties,
         ResolvableBoolOrList,
         ResolvableIntOrList,
-        ResolvableDatetimeOrList,
         ResolvableDateOrList,
+        ResolvableDatetimeOrList,
         ResolvableIPOrList,
         ResolvableArnOrList,
         ResolvableStrOrList,
-    ]
+    ] = Field(union_mode="left_to_right")
 
-    @validator("aux", pre=True)
+    @field_validator("aux", mode="before")
+    @classmethod
     def validate_string_property_formatted_as_json(cls, value):
         """
         We have detected some properties that are defined as String in CloudFormation but including a
@@ -71,10 +72,10 @@ def cast(cls, value):
 class Generic(BaseModel):
     """Any property under this class will be cast to an existing model of `pycfmodel` if possible."""
 
-    class Config(BaseModel.Config):
-        extra = Extra.allow
+    model_config = ConfigDict(extra="allow")
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def casting(cls, values):
         return {k: _Auxiliar.cast(v) for k, v in values.items()}
 

Diff for: pycfmodel/model/resources/generic_resource.py

@@ -1,7 +1,7 @@
 import logging
 from typing import ClassVar, Optional
 
-from pydantic import Extra, validator
+from pydantic import ConfigDict, field_validator
 
 from pycfmodel.model.generic import Generic
 from pycfmodel.model.resources.resource import Resource
@@ -19,10 +19,9 @@ class GenericResource(Resource):
     Type: str
     Properties: Optional[Generic] = None
 
-    class Config(Resource.Config):
-        extra = Extra.allow
+    model_config = ConfigDict(extra="allow")
 
-    @validator("Type", pre=True)
+    @field_validator("Type")
     def check_type(cls, value, values, **kwargs):
         if value in _EXISTING_RESOURCE_TYPES:
             if cls.ALLOW_EXISTING_TYPES:

Diff for: pycfmodel/model/resources/iam_group.py

@@ -36,7 +36,7 @@ class IAMGroup(Resource):
 
     TYPE_VALUE: ClassVar = "AWS::IAM::Group"
     Type: str = TYPE_VALUE
-    Properties: Optional[Resolvable[IAMGroupProperties]]
+    Properties: Optional[Resolvable[IAMGroupProperties]] = None
 
     @property
     def policy_documents(self) -> List[OptionallyNamedPolicyDocument]:

Diff for: pycfmodel/model/resources/iam_user.py

@@ -43,7 +43,7 @@ class IAMUser(Resource):
 
     TYPE_VALUE: ClassVar = "AWS::IAM::User"
     Type: str = TYPE_VALUE
-    Properties: Optional[Resolvable[IAMUserProperties]]
+    Properties: Optional[Resolvable[IAMUserProperties]] = None
 
     def has_hardcoded_credentials(self) -> bool:
         """Returns True if login profile password contains a hardcoded string, otherwise False."""

Diff for: pycfmodel/model/resources/properties/policy_document.py

@@ -1,6 +1,6 @@
 from typing import List, Optional, Pattern, Union
 
-from pydantic import Extra
+from pydantic import ConfigDict
 
 from pycfmodel.cloudformation_actions import CLOUDFORMATION_ACTIONS
 from pycfmodel.model.resources.properties.property import Property
@@ -20,8 +20,7 @@ class PolicyDocument(Property):
     - Version: An optional date indicating the version of the policy document being used.
     """
 
-    class Config(Property.Config):
-        extra = Extra.allow
+    model_config = ConfigDict(extra="allow")
 
     Statement: Resolvable[Union[Statement, List[Resolvable[Statement]]]]
     Id: Optional[ResolvableStr] = None

Diff for: pycfmodel/model/resources/properties/security_group_ingress_prop.py

@@ -59,10 +59,10 @@ def ipv6_slash_zero(self) -> bool:
 
 
 class DBSecurityGroupIngressProp(Property):
-    CIDRIP: Optional[ResolvableIPv4Network]
-    EC2SecurityGroupId: Optional[ResolvableStr]
-    EC2SecurityGroupName: Optional[ResolvableStr]
-    EC2SecurityGroupOwnerId: Optional[ResolvableStr]
+    CIDRIP: Optional[ResolvableIPv4Network] = None
+    EC2SecurityGroupId: Optional[ResolvableStr] = None
+    EC2SecurityGroupName: Optional[ResolvableStr] = None
+    EC2SecurityGroupOwnerId: Optional[ResolvableStr] = None
 
     def is_public(self) -> bool:
         """Returns True if `CidrIp` is public otherwise False."""

Diff for: pycfmodel/model/resources/properties/statement.py

@@ -1,7 +1,7 @@
 import logging
 from typing import List, Optional, Pattern, Union
 
-from pydantic import validator
+from pydantic import field_validator
 
 from pycfmodel.action_expander import _expand_action
 from pycfmodel.model.base import FunctionDict
@@ -52,7 +52,8 @@ class Statement(Property):
     NotResource: Optional[ResolvableStrOrList] = None
     Condition: Optional[StatementCondition] = None
 
-    @validator("Effect")
+    @field_validator("Effect")
+    @classmethod
     def allowed_values_for_effect_and_capitalized(cls, v: ResolvableStr):
         if isinstance(v, str):
             v = v.capitalize()