Handle x nullable for enums

flex/constants.py

@@ -115,6 +115,7 @@
 
 
 class Empty(object):
+
     def __cmp__(self, other):
         raise TypeError('Empty cannot be compared to other values')
 
@@ -157,3 +158,6 @@ def __cmp__(self, other):
 PATCH = 'patch'
 
 REQUEST_METHODS = (GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH)
+
+# Environment variables
+FLEX_DISABLE_X_NULLABLE = 'FLEX_DISABLE_X_NULLABLE'

flex/validation/common.py

@@ -6,7 +6,7 @@
 import collections
 import itertools
 import json
-
+import os
 import six
 
 
@@ -41,6 +41,7 @@
     OBJECT,
     DELIMETERS,
     REQUEST_METHODS,
+    FLEX_DISABLE_X_NULLABLE,
 )
 from flex.decorators import (
     skip_if_not_of_type,
@@ -297,7 +298,7 @@ def validate_enum(value, options, **kwargs):
 
 
 def generate_enum_validator(enum, **kwargs):
-    if kwargs.get('x-nullable') is True:
+    if not os.environ.get(FLEX_DISABLE_X_NULLABLE) and kwargs.get('x-nullable') is True:
         enum.append(None)
     return functools.partial(validate_enum, options=enum)
 

tests/utils.py

@@ -2,7 +2,8 @@
 import collections
 import re
 import six
-
+import contextlib
+import os
 from flex.validation.common import validate_object
 from flex.loading.schema.paths.path_item.operation.responses.single.schema import (
     schema_validator,
@@ -164,3 +165,14 @@ def generate_validator_from_schema(raw_schema, **kwargs):
     schema = schema_validator(raw_schema, **kwargs)
     validator = functools.partial(validate_object, schema=schema, **kwargs)
     return validator
+
+
+@contextlib.contextmanager
+def set_env(**environ):
+    old_environ = dict(os.environ)
+    os.environ.update(environ)
+    try:
+        yield
+    finally:
+        os.environ.clear()
+        os.environ.update(old_environ)

tests/validation/parameter/test_enum_validation.py

@@ -12,10 +12,11 @@
     STRING,
     NUMBER,
     BOOLEAN,
+    FLEX_DISABLE_X_NULLABLE
 )
 from flex.error_messages import MESSAGES
 
-from tests.utils import assert_message_in_errors
+from tests.utils import assert_message_in_errors, set_env
 
 
 #
@@ -122,3 +123,82 @@ def test_nullable_enum_validation_with_allowed_values(enum, value):
     }
 
     validate_parameters(parameter_values, parameters, {})
+
+
+@pytest.mark.parametrize(
+    'enum,value',
+    (
+        ([True, False], None),
+        ([0, 1, 2, 3], None),
+        (['1', '2', 'a', 'b'], None),
+    ),
+)
+def test_nullable_enum_with_null_values_strict(enum, value):
+
+    parameters = parameters_validator([
+        {
+            'name': 'id',
+            'in': PATH,
+            'description': 'id',
+            'type': [STRING, NUMBER, BOOLEAN],
+            'required': True,
+            'enum': enum,
+            'x-nullable': True
+        },
+    ])
+    parameter_values = {
+        'id': value,
+    }
+
+    with set_env(**{FLEX_DISABLE_X_NULLABLE: '1'}):
+        with pytest.raises(ValidationError) as err:
+            validate_parameters(parameter_values, parameters, {})
+
+        assert_message_in_errors(
+            MESSAGES['enum']['invalid'],
+            err.value.detail,
+            'id.enum',
+        )
+
+
+@pytest.mark.parametrize(
+    'enum,value',
+    (
+        ([True, False], 0),
+        ([True, False], 1),
+        ([True, False], ''),
+        ([0, 1, 2, 3], True),
+        ([0, 1, 2, 3], False),
+        ([0, 1, 2, 3], '1'),
+        ([0, 1, 2, 3], 4),
+        ([0, 1, 2, 3], 1.0),
+        (['1', '2', 'a', 'b'], 'A'),
+        (['1', '2', 'a', 'b'], 1),
+        (['1', '2', 'a', 'b'], 2),
+    ),
+)
+def test_nullable_enum_with_invalid_values(enum, value):
+
+    parameters = parameters_validator([
+        {
+            'name': 'id',
+            'in': PATH,
+            'description': 'id',
+            'type': [STRING, NUMBER, BOOLEAN],
+            'required': True,
+            'enum': enum,
+            'x-nullable': True
+        },
+    ])
+    parameter_values = {
+        'id': value,
+    }
+
+    with pytest.raises(ValidationError) as err:
+        validate_parameters(parameter_values, parameters, {})
+
+    assert_message_in_errors(
+        MESSAGES['enum']['invalid'],
+        err.value.detail,
+        'id.enum',
+    )