paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

openapi: Fix display_brief_error not to rely on naively_merge_allOf.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-01-11 17:14:00 -08:00
committed by Tim Abbott
parent 86c39e5792
commit 4cd5e0e578
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
zerver/openapi/openapi.py
View File

@@ -361,6 +361,24 @@ def fix_events(content: Dict[str, Any]) -> None:
event.pop("user", None) event.pop("user", None)
def prune_type_schema_by_type(schema: Dict[str, Any], type: str) -> bool:
return ("enum" in schema and type not in schema["enum"]) or (
"allOf" in schema
and any(prune_type_schema_by_type(subschema, type) for subschema in schema["allOf"])
)
def prune_schema_by_type(schema: Dict[str, Any], type: str) -> bool:
return (
"properties" in schema
and "type" in schema["properties"]
and prune_type_schema_by_type(schema["properties"]["type"], type)
) or (
"allOf" in schema
and any(prune_schema_by_type(subschema, type) for subschema in schema["allOf"])
)
def validate_against_openapi_schema( def validate_against_openapi_schema(
content: Dict[str, Any], content: Dict[str, Any],
path: str, path: str,
@@ -423,18 +441,18 @@ def validate_against_openapi_schema(
# (E.g. the several dozen format variants for individual # (E.g. the several dozen format variants for individual
# events returned by GET /events) and instead just display the # events returned by GET /events) and instead just display the
# specific variant we expect to match the response. # specific variant we expect to match the response.
brief_error_display_schema = {"nullable": False, "oneOf": list()} brief_error_validator_value = [
brief_error_display_schema_oneOf = [] validator_value
brief_error_validator_value = [] for validator_value in error.validator_value
if not prune_schema_by_type(validator_value, error.instance["type"])
for validator_value in error.validator_value: ]
if validator_value["example"]["type"] == error.instance["type"]: brief_error_display_schema = error.schema.copy()
brief_error_validator_value.append(validator_value) if "oneOf" in brief_error_display_schema:
brief_error_display_schema["oneOf"] = [
for i_schema in error.schema["oneOf"]: i_schema
if i_schema["example"]["type"] == error.instance["type"]: for i_schema in error.schema["oneOf"]
brief_error_display_schema_oneOf.append(i_schema) if not prune_schema_by_type(i_schema, error.instance["type"])
brief_error_display_schema["oneOf"] = brief_error_display_schema_oneOf ]
# Field list from https://python-jsonschema.readthedocs.io/en/stable/errors/ # Field list from https://python-jsonschema.readthedocs.io/en/stable/errors/
raise JsonSchemaValidationError( raise JsonSchemaValidationError(