Clean up

Author: gberaudo

openapi_schema_validator/_validators.py

@@ -9,34 +9,34 @@ def handle_discriminator(validator, _, instance, schema):
     prop_name = discriminator['propertyName']
     prop_value = instance.get(prop_name)
     if not prop_value:
-        # instance is missing discriminator value, this is a schema error
+        # instance is missing $propertyName
         yield ValidationError(
-            "%r does not contain discriminating property" % (instance,),
+            "%r does not contain discriminating property %r" % (instance, prop_name),
             context=[],
         )
         return
 
     # FIXME: handle implicit refs and missing mapping field
-    subschema = discriminator['mapping'].get(prop_value)
-    if not subschema:
+    explicitRef = discriminator['mapping'].get(prop_value)
+    if not explicitRef:
         yield ValidationError(
             "%r is not a valid discriminator value, expected one of %r" % (
                 instance, discriminator['mapping'].keys()),
             context=[],
         )
         return
 
-    if not isinstance(subschema, str):
+    if not isinstance(explicitRef, str):
         # this is a schema error
         yield ValidationError(
             "%r mapped value for %r should be a string, was %r" % (
-                instance, prop_value, subschema),
+                instance, prop_value, explicitRef),
             context=[],
         )
         return
 
     yield from validator.descend(instance, {
-        "$ref": subschema
+        "$ref": explicitRef
     })
 
 

tests/integration/test_validators.py

@@ -241,41 +241,47 @@ def test_oneof_required(self):
 
 
     def test_oneof_discriminator(self):
-        schema = {
-            "$ref": "#/$defs/Route",
-            "$defs": {
-                "MountainHiking": {
-                    "type": "object",
-                    "properties": {
-                        "discipline": {
-                            "type": "string",
-                            "enum": ["mountain_hiking"]
-                        },
-                        "length": {
-                            "type": "integer",
-                        }
+        # We define a few components schemas
+        components = {
+            "MountainHiking": {
+                "type": "object",
+                "properties": {
+                    "discipline": {
+                        "type": "string",
+                        "enum": ["mountain_hiking"]
                     },
-                    "required": ["discipline", "length"]
+                    "length": {
+                        "type": "integer",
+                    }
                 },
-                "AlpineClimbing": {
-                    "type": "object",
-                    "properties": {
-                        "discipline": {
-                            "type": "string",
-                            "enum": ["alpine_climbing"]
-                        },
-                        "height": {
-                            "type": "integer",
-                        },
+                "required": ["discipline", "length"]
+            },
+            "AlpineClimbing": {
+                "type": "object",
+                "properties": {
+                    "discipline": {
+                        "type": "string",
+                        "enum": ["alpine_climbing"]
+                    },
+                    "height": {
+                        "type": "integer",
                     },
-                    "required": ["discipline", "height"]
                 },
-                "Route": {
-                    "oneOf": [
-                        {"$ref": "#/$defs/MountainHiking"},
-                        {"$ref": "#/$defs/AlpineClimbing"},
-                    ]
-                }
+                "required": ["discipline", "height"]
+            },
+            "Route": {
+                "oneOf": [
+                    {"$ref": "#/components/schemas/MountainHiking"},
+                    {"$ref": "#/components/schemas/AlpineClimbing"},
+                ]
+            }
+        }
+
+        # Add the compoments in a minimalis schema
+        schema = {
+            "$ref": "#/components/schemas/Route",
+            "components": {
+                "schemas": components
             }
         }
 
@@ -290,11 +296,11 @@ def test_oneof_discriminator(self):
         discriminator = {
             "propertyName": "discipline",
             "mapping": {
-                "mountain_hiking": "#/$defs/MountainHiking",
-                "alpine_climbing": "#/$defs/AlpineClimbing",
+                "mountain_hiking": "#/components/schemas/MountainHiking",
+                "alpine_climbing": "#/components/schemas/AlpineClimbing",
             }
         }
-        schema['$defs']['Route']['discriminator'] = discriminator
+        schema['components']['schemas']['Route']['discriminator'] = discriminator
         validator = OAS30Validator(schema, format_checker=oas30_format_checker)
         with pytest.raises(ValidationError, match="does not contain discriminating property"):
             validator.validate({