improv: catch invalid formats exception

Author: heitorlessa

aws_lambda_powertools/utilities/validation/base.py

@@ -32,11 +32,11 @@ def validate_data_against_schema(data: Dict, schema: Dict, formats: Optional[Dic
     """
     try:
         fastjsonschema.validate(definition=schema, data=data, formats=formats)
+    except (TypeError, AttributeError, fastjsonschema.JsonSchemaDefinitionException) as e:
+        raise InvalidSchemaFormatError(f"Schema received: {schema}, Formats: {formats}. Error: {e}")
     except fastjsonschema.JsonSchemaException as e:
         message = f"Failed schema validation. Error: {e.message}, Path: {e.path}, Data: {e.value}"  # noqa: B306, E501
         raise SchemaValidationError(message)
-    except (TypeError, AttributeError) as e:
-        raise InvalidSchemaFormatError(f"Schema received: {schema}. Error: {e}")
 
 
 def unwrap_event_from_envelope(data: Dict, envelope: str, jmespath_options: Dict) -> Any:

tests/functional/validator/test_validator.py

@@ -47,6 +47,18 @@ def test_validate_accept_schema_custom_format(
     )
 
 
+@pytest.mark.parametrize("invalid_format", [None, bool(), {}, [], object])
+def test_validate_invalid_custom_format(
+    eventbridge_schema_registry_cloudtrail_v2_s3, eventbridge_cloudtrail_s3_head_object_event, invalid_format
+):
+    with pytest.raises(exceptions.InvalidSchemaFormatError):
+        validate(
+            event=eventbridge_cloudtrail_s3_head_object_event,
+            schema=eventbridge_schema_registry_cloudtrail_v2_s3,
+            formats=invalid_format,
+        )
+
+
 def test_validate_invalid_envelope_expression(schema, wrapped_event):
     with pytest.raises(exceptions.InvalidEnvelopeExpressionError):
         validate(event=wrapped_event, schema=schema, envelope=True)