feat: Make flagd defaultVariant optional

Signed-off-by: marcozabel <marco.zabel@dynatrace.com>

Author: marcozabel

.gitmodules

@@ -1,11 +1,9 @@
 [submodule "schemas"]
 	path = providers/openfeature-provider-flagd/openfeature/schemas
 	url = https://github.com/open-feature/schemas
-	branch = protobuf-v0.6.1
 [submodule "providers/openfeature-provider-flagd/spec"]
 	path = providers/openfeature-provider-flagd/openfeature/spec
 	url = https://github.com/open-feature/spec
 [submodule "providers/openfeature-provider-flagd/openfeature/test-harness"]
 	path = providers/openfeature-provider-flagd/openfeature/test-harness
-	url = https://github.com/open-feature/flagd-testbed.git
-	branch = v2.11.1
+    url = https://github.com/open-feature/flagd-testbed.git

providers/openfeature-provider-flagd/flags/.gitkeep

@@ -18,7 +18,7 @@ classifiers = [
 keywords = []
 dependencies = [
   "openfeature-sdk>=0.8.2",
-  "grpcio>=1.76.0",
+  "grpcio>=1.78.0",
   "protobuf>=6.30.0,<7.0.0",
   "mmh3>=5.0.0,<6.0.0",
   "panzi-json-logic>=1.0.1",

providers/openfeature-provider-flagd/openfeature/schemas

@@ -28,7 +28,7 @@ class CacheType(Enum):
 DEFAULT_PORT_RPC = 8013
 DEFAULT_RESOLVER_TYPE = ResolverType.RPC
 DEFAULT_RETRY_BACKOFF = 1000
-DEFAULT_RETRY_BACKOFF_MAX = 120000
+DEFAULT_RETRY_BACKOFF_MAX = 12000
 DEFAULT_RETRY_GRACE_PERIOD_SECONDS = 5
 DEFAULT_STREAM_DEADLINE = 600000
 DEFAULT_TLS = False
@@ -42,6 +42,8 @@ class CacheType(Enum):
 ENV_VAR_OFFLINE_FLAG_SOURCE_PATH = "FLAGD_OFFLINE_FLAG_SOURCE_PATH"
 ENV_VAR_OFFLINE_POLL_MS = "FLAGD_OFFLINE_POLL_MS"
 ENV_VAR_PORT = "FLAGD_PORT"
+ENV_VAR_SYNC_PORT = "FLAGD_SYNC_PORT"
+ENV_VAR_FATAL_STATUS_CODES = "FLAGD_FATAL_STATUS_CODES"
 ENV_VAR_RESOLVER_TYPE = "FLAGD_RESOLVER"
 ENV_VAR_RETRY_BACKOFF_MS = "FLAGD_RETRY_BACKOFF_MS"
 ENV_VAR_RETRY_BACKOFF_MAX_MS = "FLAGD_RETRY_BACKOFF_MAX_MS"
@@ -83,6 +85,7 @@ def __init__(  # noqa: PLR0913
         self,
         host: typing.Optional[str] = None,
         port: typing.Optional[int] = None,
+        sync_port: typing.Optional[int] = None,
         tls: typing.Optional[bool] = None,
         selector: typing.Optional[str] = None,
         provider_id: typing.Optional[str] = None,
@@ -101,6 +104,7 @@ def __init__(  # noqa: PLR0913
         default_authority: typing.Optional[str] = None,
         channel_credentials: typing.Optional[grpc.ChannelCredentials] = None,
         sync_metadata_disabled: typing.Optional[bool] = None,
+        fatal_status_codes: typing.Optional[list[str]] = None,
     ):
         self.host = env_or_default(ENV_VAR_HOST, DEFAULT_HOST) if host is None else host
 
@@ -110,6 +114,19 @@ def __init__(  # noqa: PLR0913
             else tls
         )
 
+        self.fatal_status_codes: list[str] = (
+            typing.cast(
+                list[str],
+                env_or_default(
+                    ENV_VAR_FATAL_STATUS_CODES,
+                    [],
+                    cast=lambda s: [item.strip() for item in s.split(",")],
+                ),
+            )
+            if fatal_status_codes is None
+            else fatal_status_codes
+        )
+
         self.retry_backoff_ms: int = (
             int(
                 env_or_default(
@@ -161,6 +178,14 @@ def __init__(  # noqa: PLR0913
             else port
         )
 
+        self.port = (
+            int(env_or_default(ENV_VAR_SYNC_PORT, self.port, cast=int))
+            if sync_port is None and port is None
+            else sync_port
+            if sync_port is not None
+            else self.port
+        )
+
         self.offline_flag_source_path = (
             env_or_default(
                 ENV_VAR_OFFLINE_FLAG_SOURCE_PATH, DEFAULT_OFFLINE_SOURCE_PATH

providers/openfeature-provider-flagd/openfeature/test-harness

@@ -22,7 +22,7 @@
     TypeMismatchError,
 )
 from openfeature.flag_evaluation import FlagResolutionDetails, FlagValueType, Reason
-from openfeature.schemas.protobuf.flagd.evaluation.v1 import (
+from openfeature.schemas.protobuf.flagd.evaluation.v2 import (
     evaluation_pb2,
     evaluation_pb2_grpc,
 )
@@ -88,7 +88,7 @@ def _generate_channel(self, config: Config) -> grpc.Channel:
                             {
                                 "name": [
                                     {"service": "flagd.sync.v1.FlagSyncService"},
-                                    {"service": "flagd.evaluation.v1.Service"},
+                                    {"service": "flagd.evaluation.v2.Service"},
                                 ],
                                 "retryPolicy": {
                                     "maxAttempts": 3,
@@ -237,7 +237,8 @@ def listen(self) -> None:
                         )
                         self.connected = True
                     elif message.type == "configuration_change":
-                        data = MessageToDict(message)["data"]
+                        msg_dict = MessageToDict(message)
+                        data = msg_dict.get("data", {})
                         self.handle_changed_flags(data)
 
                     if not self.active:
@@ -252,7 +253,7 @@ def listen(self) -> None:
                 )
 
     def handle_changed_flags(self, data: typing.Any) -> None:
-        changed_flags = list(data["flags"].keys())
+        changed_flags = list(data.get("flags", {}).keys())
 
         if self.cache:
             for flag in changed_flags:
@@ -419,11 +420,16 @@ def _resolve(  # noqa: PLR0915 C901
                 raise ParseError(message) from e
             raise GeneralError(message) from e
 
+        # When no default variant is configured, the server returns an empty/zero proto
+        # value with reason=DEFAULT. In that case, return the caller's code default value.
+        if response.reason == Reason.DEFAULT and not response.variant:
+            value = default_value
+
         # Got a valid flag and valid type. Return it.
         result = FlagResolutionDetails(
             value=value,
             reason=response.reason,
-            variant=response.variant,
+            variant=response.variant or None,
         )
 
         if response.reason == Reason.STATIC and self.cache is not None:

providers/openfeature-provider-flagd/pyproject.toml

@@ -5,7 +5,7 @@
 )
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.event import ProviderEventDetails
-from openfeature.exception import ErrorCode, FlagNotFoundError, GeneralError, ParseError
+from openfeature.exception import FlagNotFoundError, GeneralError, ParseError
 from openfeature.flag_evaluation import FlagResolutionDetails, FlagValueType, Reason
 
 from ..config import Config
@@ -132,12 +132,12 @@ def _resolve(
             )
 
         if not flag.targeting:
-            return _default_resolve(flag, metadata, Reason.STATIC)
+            return _default_resolve(flag, metadata, Reason.STATIC, default_value)
 
         try:
             variant = targeting(flag.key, flag.targeting, evaluation_context)
             if variant is None:
-                return _default_resolve(flag, metadata, Reason.DEFAULT)
+                return _default_resolve(flag, metadata, Reason.DEFAULT, default_value)
 
             # convert to string to support shorthand (boolean in python is with capital T hence the special case)
             if isinstance(variant, bool):
@@ -169,14 +169,14 @@ def _default_resolve(
     flag: Flag,
     metadata: typing.Mapping[str, typing.Union[float, int, str, bool]],
     reason: Reason,
+    default_value: typing.Any = None,
 ) -> FlagResolutionDetails:
     variant, value = flag.default
     if variant is None:
         return FlagResolutionDetails(
-            value,
+            default_value,
             variant=variant,
-            reason=Reason.ERROR,
-            error_code=ErrorCode.FLAG_NOT_FOUND,
+            reason=Reason.DEFAULT,
             flag_metadata=metadata,
         )
     if variant not in flag.variants:

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/config.py

@@ -69,7 +69,7 @@ def _generate_channel(self, config: Config) -> grpc.Channel:
                             {
                                 "name": [
                                     {"service": "flagd.sync.v1.FlagSyncService"},
-                                    {"service": "flagd.evaluation.v1.Service"},
+                                    {"service": "flagd.evaluation.v2.Service"},
                                 ],
                                 "retryPolicy": {
                                     "maxAttempts": 3,

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

@@ -13,6 +13,7 @@
     "~caching",
     "~grace",
     "~contextEnrichment",
+    "~deprecated",
 }