Merge remote-tracking branch 'upstream/main' into feat/gherkinmigration

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "providers/openfeature-provider-flagd/test-harness"]
 	path = providers/openfeature-provider-flagd/openfeature/test-harness
 	url = [email protected]:open-feature/flagd-testbed.git
-	branch = v0.5.20
+	branch = v0.5.21
 [submodule "providers/openfeature-provider-flagd/spec"]
 	path = providers/openfeature-provider-flagd/openfeature/spec
 	url = https://github.com/open-feature/spec

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 default_stages: [commit]
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: [--fix]

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

@@ -40,7 +40,7 @@ dependencies = [
   "pytest-bdd",
   "testcontainers",
   "asserts",
-  "grpcio-health-checking==1.68.1",
+  "grpcio-health-checking==1.69.0",
 ]
 pre-install-commands = [
   "hatch build",

providers/openfeature-provider-flagd/pyproject.toml

@@ -7,6 +7,7 @@
 class ResolverType(Enum):
     RPC = "rpc"
     IN_PROCESS = "in-process"
+    FILE = "file"
 
 
 class CacheType(Enum):
@@ -158,6 +159,17 @@ def __init__(  # noqa: PLR0913
             else offline_flag_source_path
         )
 
+        if (
+            self.offline_flag_source_path is not None
+            and self.resolver is ResolverType.IN_PROCESS
+        ):
+            self.resolver = ResolverType.FILE
+
+        if self.resolver is ResolverType.FILE and self.offline_flag_source_path is None:
+            raise AttributeError(
+                "Resolver Type 'FILE' requires a offlineFlagSourcePath"
+            )
+
         self.offline_poll_interval_ms: int = (
             int(
                 env_or_default(

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

@@ -106,7 +106,10 @@ def setup_resolver(self) -> AbstractResolver:
                 self.emit_provider_stale,
                 self.emit_provider_configuration_changed,
             )
-        elif self.config.resolver == ResolverType.IN_PROCESS:
+        elif (
+            self.config.resolver == ResolverType.IN_PROCESS
+            or self.config.resolver == ResolverType.FILE
+        ):
             return InProcessResolver(self.config, self)
         else:
             raise ValueError(

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

@@ -7,6 +7,3 @@
 from tests.e2e.step.provider_steps import *  # noqa: F403
 
 JsonPrimitive = typing.Union[str, bool, float, int]
-
-TEST_HARNESS_PATH = "../../openfeature/test-harness"
-SPEC_PATH = "../../openfeature/spec"

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

@@ -0,0 +1,52 @@
+import tempfile
+import threading
+
+import pytest
+
+from openfeature.contrib.provider.flagd.config import ResolverType
+from tests.e2e.step.provider_steps import changefile, write_test_file
+from tests.e2e.testfilter import TestFilter
+
+# from tests.e2e.step.config_steps import *
+# from tests.e2e.step.event_steps import *
+# from tests.e2e.step.provider_steps import *
+
+resolver = ResolverType.FILE
+feature_list = {
+    "~targetURI",
+    "~customCert",
+    "~unixsocket",
+    "~events",
+    "~sync",
+    "~caching",
+    "~grace",
+}
+
+
+def pytest_collection_modifyitems(config, items):
+    test_filter = TestFilter(
+        config, feature_list=feature_list, resolver=resolver.value, base_path=__file__
+    )
+    test_filter.filter_items(items)
+
+
+@pytest.fixture()
+def resolver_type() -> ResolverType:
+    return resolver
+
+
+@pytest.fixture(params=["json", "yaml"], scope="module", autouse=True)
+def file_name(request, all_flags):
+    extension = request.param
+    with tempfile.NamedTemporaryFile(
+        "w", delete=False, suffix="." + extension
+    ) as outfile:
+        write_test_file(outfile, all_flags)
+
+        update_thread = threading.Thread(
+            target=changefile, args=("changing-flag", all_flags, outfile)
+        )
+        update_thread.daemon = True  # Makes the thread exit when the main program exits
+        update_thread.start()
+        yield outfile
+        return outfile

providers/openfeature-provider-flagd/tests/e2e/in_process/__init__.py renamed to providers/openfeature-provider-flagd/tests/e2e/file/__init__.py

@@ -1,5 +1,9 @@
 # as soon as we support all the features, we can actually remove this limitation to not run on Python 3.8
 # Python 3.8 does not fully support tagging, hence that it will run all cases
-# if sys.version_info >= (3, 9):
-#     scenarios(f"{TEST_HARNESS_PATH}/gherkin")
+import sys
 
+from e2e.paths import TEST_HARNESS_PATH
+from pytest_bdd import scenarios
+
+if sys.version_info >= (3, 9):
+    scenarios(f"{TEST_HARNESS_PATH}/gherkin")