minor improvements, adjust to workaround for fladg issue

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

Author: chrfwow

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

@@ -25,9 +25,9 @@ def _merge_metadata(
         typing.Mapping[str, typing.Union[float, int, str, bool]]
     ],
 ) -> typing.Mapping[str, typing.Union[float, int, str, bool]]:
-    metadata = {}
-
-    if flag_set_metadata is not None:
+    if flag_set_metadata is None:
+        metadata = {}
+    else:
         metadata = dict(flag_set_metadata)
 
     if flag_metadata is not None:

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

@@ -31,6 +31,7 @@ class TestProviderType(Enum):
     UNSTABLE = "unstable"
     SSL = "ssl"
     SOCKET = "socket"
+    METADATA = "metadata"
 
 
 @given("a provider is registered", target_fixture="client")
@@ -68,6 +69,8 @@ def get_default_options_for_provider(
         launchpad = "ssl"
     elif t == TestProviderType.SOCKET:
         return options, True
+    elif t == TestProviderType.METADATA:
+        launchpad = "metadata"
 
     if resolver_type == ResolverType.FILE:
         if "selector" in option_values: