Improve object mapping

Signed-off-by: christian.lutnik <[email protected]>

Author: chrfwow

providers/openfeature-provider-env-var/src/openfeature/contrib/provider/envvar/provider.py

@@ -59,4 +59,13 @@ def resolve_object_details(
         default_value: typing.Union[dict, list],
         evaluation_context: typing.Optional[EvaluationContext] = None,
     ) -> FlagResolutionDetails[typing.Union[dict, list]]:
-        return _load_and_parse_env_var(flag_key, lambda v: json.loads(v))
+        def parse(value: str) -> typing.Union[dict, list]:
+            result = json.loads(value)
+            if isinstance(result, dict) or isinstance(result, list):
+                return result
+            else:
+                raise TypeError(
+                    f'Value for feature flag with key "${flag_key}" does not resolve to a JSON object or list'
+                )
+
+        return _load_and_parse_env_var(flag_key, parse)

providers/openfeature-provider-env-var/tests/test_provider.py

@@ -13,7 +13,7 @@ def test_unknown_flag_key_throws_flag_not_found_error():
         provider.resolve_boolean_details("unknown_flag_key", True, None)
 
 
-def test_string_flag_key_evaluates_the_flag():
+def test_string_flag_evaluates_the_flag():
     key = "test-flag-key"
     value = "test-value"
     os.environ[key] = value
@@ -24,7 +24,7 @@ def test_string_flag_key_evaluates_the_flag():
     assert result.value == value
 
 
-def test_int_flag_key_evaluates_the_flag():
+def test_int_flag_evaluates_the_flag():
     key = "test-flag-key"
     value = 324
     os.environ[key] = str(value)
@@ -35,7 +35,7 @@ def test_int_flag_key_evaluates_the_flag():
     assert result.value == value
 
 
-def test_float_flag_key_evaluates_the_flag():
+def test_float_flag_evaluates_the_flag():
     key = "test-flag-key"
     value = 324.34
     os.environ[key] = str(value)
@@ -46,7 +46,7 @@ def test_float_flag_key_evaluates_the_flag():
     assert result.value == value
 
 
-def test_boolean_flag_key_evaluates_the_flag():
+def test_boolean_flag_evaluates_the_flag():
     key = "test-flag-key"
     value = True
     os.environ[key] = str(value)
@@ -57,7 +57,7 @@ def test_boolean_flag_key_evaluates_the_flag():
     assert result.value == value
 
 
-def test_object_flag_key_evaluates_the_flag():
+def test_object_flag_evaluates_the_flag():
     key = "test-flag-key"
     value = {"a": 23}
     os.environ[key] = str(json.dumps(value))
@@ -68,6 +68,17 @@ def test_object_flag_key_evaluates_the_flag():
     assert result.value == value
 
 
+def test_object_flag_with_invalid_json_object_raises_an_error():
+    key = "test-flag-key"
+    value = 23
+    os.environ[key] = str(json.dumps(value))
+
+    provider = EnvVarProvider()
+
+    with pytest.raises(TypeError):
+        provider.resolve_object_details(key, True, None)
+
+
 def test_provider_returns_correct_metadata():
     provider = EnvVarProvider()
     metadata = provider.get_metadata()