Skip to content

Commit 61caee3

Browse files
committed
Restored the project to use pydantic 1.10.15 for v1 support
1 parent 7ca0430 commit 61caee3

File tree

6 files changed

+65
-159
lines changed

6 files changed

+65
-159
lines changed

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/ansible/apply_pull_request_namespace.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ApplyPullRequestNamespace(pydantic.BaseModel):
2727
:param manifest: The content of your manifest.yml.
2828
"""
2929

30-
pull_request: pydantic.constr(pattern=r"^pr-[0-9]+$|^utils-pr-[0-9]+$") # i.e. 'pr-1234' or 'utils-pr-1234'
30+
pull_request: pydantic.constr(regex=r"^pr-[0-9]+$|^utils-pr-[0-9]+$") # i.e. 'pr-1234' or 'utils-pr-1234'
3131
manifest: Manifest
3232

3333
@pydantic.validator("manifest")

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/apigee/product.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class ApigeeProductAttributeAccess(BaseModel):
8181

8282
class ApigeeProductAttributeRateLimit(BaseModel):
8383
name: Literal["ratelimit"]
84-
value: constr(pattern=r"^[0-9]+(ps|pm)$")
84+
value: constr(regex=r"^[0-9]+(ps|pm)$")
8585

8686

8787
def _literal_name(class_):
@@ -141,8 +141,8 @@ class ApigeeProduct(BaseModel):
141141
item_type=LITERAL_APIGEE_ENVIRONMENTS, min_items=1, max_items=1
142142
)
143143
proxies: List[str] = []
144-
quota: constr(pattern=r"[1-9][0-9]*") = None
145-
quotaInterval: constr(pattern=r"[1-9][0-9]*") = None
144+
quota: constr(regex=r"[1-9][0-9]*") = None
145+
quotaInterval: constr(regex=r"[1-9][0-9]*") = None
146146
quotaTimeUnit: Literal["minute", "hour"] = None
147147
scopes: List[str] = []
148148

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/apigee/rate_limiting_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class QuotaConfig(ExcludeNoneModel):
3838

3939
class SpikeArrestConfig(ExcludeNoneModel):
4040
enabled: bool = None
41-
ratelimit: constr(pattern=r"^[1-9][0-9]*(ps|pm)$") = None
41+
ratelimit: constr(regex=r"^[1-9][0-9]*(ps|pm)$") = None
4242

4343

4444
class RateLimitingConfig(ExcludeNoneModel):

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/manifest/meta.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
class ManifestMetaApi(pydantic.BaseModel):
14-
name: pydantic.constr(pattern=r"^[a-z][a-z0-9]*(-[a-z0-9]+)*$")
14+
name: pydantic.constr(regex=r"^[a-z][a-z0-9]*(-[a-z0-9]+)*$")
1515
id: typing.Optional[pydantic.UUID4] = pydantic.Field(
1616
None, description="This field is deprecated, use guid instead."
1717
)
@@ -84,7 +84,7 @@ def validate_spec_guids(cls, spec_guids, values):
8484

8585

8686
class ManifestMeta(pydantic.BaseModel):
87-
schema_version: pydantic.constr(pattern=r"[1-9][0-9]*(\.[0-9]+){0,2}")
87+
schema_version: pydantic.constr(regex=r"[1-9][0-9]*(\.[0-9]+){0,2}")
8888
api: ManifestMetaApi
8989

9090
@pydantic.validator("schema_version")

0 commit comments

Comments
 (0)