fixup: no default value feature added, as testharness is broken otherwise

Signed-off-by: Simon Schrottner <[email protected]>
Co-authored-by: Lea Konvalinka <[email protected]>

Author: aepfli

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/in_process.py

@@ -5,7 +5,7 @@
 )
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.event import ProviderEventDetails
-from openfeature.exception import FlagNotFoundError, GeneralError, ParseError
+from openfeature.exception import FlagNotFoundError, GeneralError, ParseError, ErrorCode
 from openfeature.flag_evaluation import FlagResolutionDetails, Reason
 
 from ..config import Config
@@ -129,6 +129,14 @@ def _resolve(
 
         if not flag.targeting:
             variant, value = flag.default
+            if variant is None:
+                return FlagResolutionDetails(
+                    value,
+                    variant=variant,
+                    reason=Reason.ERROR,
+                    error_code=ErrorCode.FLAG_NOT_FOUND,
+                    flag_metadata=metadata,
+                )
             if variant not in flag.variants:
                 raise GeneralError(
                     f"Resolved variant {variant} not in variants config."
@@ -141,14 +149,27 @@ def _resolve(
             variant = targeting(flag.key, flag.targeting, evaluation_context)
             if variant is None:
                 variant, value = flag.default
+                if variant is None:
+                    return FlagResolutionDetails(
+                        value,
+                        variant=variant,
+                        reason=Reason.ERROR,
+                        error_code=ErrorCode.FLAG_NOT_FOUND,
+                        flag_metadata=metadata,
+                    )
                 return FlagResolutionDetails(
                     value,
                     variant=variant,
                     flag_metadata=metadata,
                     reason=Reason.DEFAULT,
                 )
 
-            variant = str(variant).lower()  # convert to string to support shorthand
+            # convert to string to support shorthand (boolean in python is with capital T hence the special case)
+            if isinstance(variant, bool):
+                variant = str(variant).lower()
+            elif not isinstance(variant, str):
+                variant = str(variant)
+
             if variant not in flag.variants:
                 raise GeneralError(
                     f"Resolved variant {variant} not in variants config."

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/flags.py

@@ -72,7 +72,7 @@ class Flag:
     key: str
     state: str
     variants: typing.Mapping[str, typing.Any]
-    default_variant: typing.Union[bool, str]
+    default_variant: typing.Optional[typing.Union[bool, str]] = None
     targeting: typing.Optional[dict] = None
     metadata: typing.Optional[
         typing.Mapping[str, typing.Union[float, int, str, bool]]
@@ -85,7 +85,7 @@ def __post_init__(self) -> None:
         if not self.variants or not isinstance(self.variants, dict):
             raise ParseError("Incorrect 'variants' value provided in flag config")
 
-        if not self.default_variant or not isinstance(self.default_variant, str):
+        if self.default_variant and not isinstance(self.default_variant, str):
             raise ParseError("Incorrect 'defaultVariant' value provided in flag config")
 
         if self.metadata:
@@ -98,6 +98,8 @@ def __post_init__(self) -> None:
     def from_dict(cls, key: str, data: dict) -> "Flag":
         if "defaultVariant" in data:
             data["default_variant"] = data["defaultVariant"]
+            if data["default_variant"] is "":
+                data["default_variant"] = None
             del data["defaultVariant"]
 
         data.pop("source", None)
@@ -111,13 +113,16 @@ def from_dict(cls, key: str, data: dict) -> "Flag":
             raise ParseError from err
 
     @property
-    def default(self) -> tuple[str, typing.Any]:
+    def default(self) -> tuple[typing.Optional[str], typing.Any]:
         return self.get_variant(self.default_variant)
 
     def get_variant(
-        self, variant_key: typing.Union[str, bool]
-    ) -> tuple[str, typing.Any]:
+        self, variant_key: typing.Union[str, bool, None]
+    ) -> tuple[typing.Optional[str], typing.Any]:
         if isinstance(variant_key, bool):
             variant_key = str(variant_key).lower()
 
+        if not variant_key:
+            return None, None
+
         return variant_key, self.variants.get(variant_key)

providers/openfeature-provider-flagd/tests/e2e/file/conftest.py

@@ -12,8 +12,7 @@
     "~sync",
     "~caching",
     "~grace",
-    "~contextEnrichment",
-    "~no-default",
+    "~contextEnrichment"
 }
 
 

providers/openfeature-provider-flagd/tests/e2e/inprocess/conftest.py

@@ -4,7 +4,7 @@
 from tests.e2e.testfilter import TestFilter
 
 resolver = ResolverType.IN_PROCESS
-feature_list = ["~targetURI", "~unixsocket", "~no-default"]
+feature_list = ["~targetURI", "~unixsocket"]
 
 
 def pytest_collection_modifyitems(config, items):

providers/openfeature-provider-flagd/tests/e2e/rpc/conftest.py

@@ -4,7 +4,7 @@
 from tests.e2e.testfilter import TestFilter
 
 resolver = ResolverType.RPC
-feature_list = ["~targetURI", "~unixsocket", "~sync", "~metadata", "~no-default"]
+feature_list = ["~targetURI", "~unixsocket", "~sync", "~metadata"]
 
 
 def pytest_collection_modifyitems(config, items):

providers/openfeature-provider-flagd/tests/e2e/step/context_steps.py

@@ -35,6 +35,18 @@ def update_context(
     """a context containing a key and value."""
     evaluation_context.attributes[key] = type_cast[type_info](value)
 
+@given(
+    parsers.cfparse(
+        'a context containing a key "{key}", with type "{type_info}" and with value ""'
+    ),
+)
+def update_context_without_value(
+        evaluation_context: EvaluationContext, key: str, type_info: str
+):
+    """a context containing a key and value."""
+    update_context(evaluation_context, key, type_info, "")
+
+
 
 @when(
     parsers.cfparse(

providers/openfeature-provider-flagd/tests/flags/basic-flag-without-default.json

@@ -0,0 +1,12 @@
+{
+  "flags": {
+    "basic-flag": {
+      "state": "ENABLED",
+      "variants": {
+        "true": true,
+        "false": false
+      },
+      "targeting": {}
+    }
+  }
+}

providers/openfeature-provider-flagd/tests/test_file_store.py

@@ -21,6 +21,7 @@ def create_client(provider: FlagdProvider):
     "file_name",
     [
         "basic-flag.json",
+        "basic-flag-without-default.json",
         "basic-flag.yaml",
     ],
 )