From 34bc26b55dcdd1089b69a52dd46b02991c3c14c7 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 21 Mar 2025 11:58:06 +0000 Subject: [PATCH] api: Correct types for validation decorators These got missed in a rework of the initial patch, likely because they weren't being used yet. Also correct a small issues that looked like invalid Python but clearly isn't. Change-Id: Ie6cf882d2eca55f2ce01c893d18cb1ca1bbe4a01 Signed-off-by: Stephen Finucane --- ironic/api/validation/__init__.py | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ironic/api/validation/__init__.py b/ironic/api/validation/__init__.py index ed21affd71..cf176576d6 100644 --- a/ironic/api/validation/__init__.py +++ b/ironic/api/validation/__init__.py @@ -207,7 +207,7 @@ def request_parameter_schema( if not hasattr(wrapper, 'request_parameter_schemas'): wrapper.request_parameter_schemas = Schemas() - wrapper.request_parameter_schemas .add_schema( + wrapper.request_parameter_schemas.add_schema( schema, min_version, max_version ) @@ -248,7 +248,7 @@ def request_query_schema( if not hasattr(wrapper, 'request_query_schemas'): wrapper.request_query_schemas = Schemas() - wrapper.request_query_schemas .add_schema( + wrapper.request_query_schemas.add_schema( schema, min_version, max_version ) @@ -259,8 +259,8 @@ def request_query_schema( def request_body_schema( schema: ty.Dict[str, ty.Any], - min_version: ty.Optional[str] = None, - max_version: ty.Optional[str] = None, + min_version: ty.Optional[int] = None, + max_version: ty.Optional[int] = None, ): """Decorator for registering a request body schema on API methods. @@ -268,10 +268,10 @@ def request_body_schema( method is executed. :param schema: The JSON Schema schema used to validate the target. - :param min_version: A string indicating the minimum API version ``schema`` - applies against. - :param max_version: A string indicating the maximum API version ``schema`` - applies against. + :param min_version: An integer indicating the minimum API version + ``schema`` applies against. + :param max_version: An integer indicating the maximum API version + ``schema`` applies against. """ def add_validator(func): @@ -301,7 +301,7 @@ def request_body_schema( if not hasattr(wrapper, 'request_body_schemas'): wrapper.request_body_schemas = Schemas() - wrapper.request_body_schemas .add_schema( + wrapper.request_body_schemas.add_schema( schema, min_version, max_version ) @@ -312,8 +312,8 @@ def request_body_schema( def response_body_schema( schema: ty.Dict[str, ty.Any], - min_version: ty.Optional[str] = None, - max_version: ty.Optional[str] = None, + min_version: ty.Optional[int] = None, + max_version: ty.Optional[int] = None, ): """Decorator for registering a response body schema on API methods. @@ -321,10 +321,10 @@ def response_body_schema( method is executed. :param schema: The JSON Schema schema used to validate the target. - :param min_version: A string indicating the minimum API version ``schema`` - applies against. - :param max_version: A string indicating the maximum API version ``schema`` - applies against. + :param min_version: An integer indicating the minimum API version + ``schema`` applies against. + :param max_version: An integer indicating the maximum API version + ``schema`` applies against. """ def add_validator(func): @@ -356,7 +356,7 @@ def response_body_schema( if not hasattr(wrapper, 'response_body_schemas'): wrapper.response_body_schemas = Schemas() - wrapper.response_body_schemas .add_schema( + wrapper.response_body_schemas.add_schema( schema, min_version, max_version )