Merge branch 'main' into feat/gherkinmigration

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

Author: aepfli

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
           submodules: recursive
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -60,7 +60,7 @@ jobs:
 
       - if: matrix.python-version == '3.11'
         name: Upload coverage to Codecov
-        uses: codecov/codecov-action@5a605bd92782ce0810fa3b8acc235c921b497052 # v5.2.0
+        uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
         with:
           name: Code Coverage for ${{ matrix.package }} on Python ${{ matrix.python-version }}
           directory: ${{ matrix.package }}
@@ -73,7 +73,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
+      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
         with:
           python-version: "3.11"
           cache: "pip"
@@ -91,10 +91,10 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3
+        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3
         with:
           languages: python
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3
+        uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
+      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
         with:
           python-version: '3.13'
 

.pre-commit-config.yaml

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

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

@@ -19,7 +19,7 @@ keywords = []
 dependencies = [
   "openfeature-sdk>=0.6.0",
   "grpcio>=1.68.1",
-  "protobuf>=4.25.2",
+  "protobuf>=4.29.2",
   "mmh3>=4.1.0",
   "panzi-json-logic>=1.0.1",
   "semver>=3,<4",
@@ -40,7 +40,7 @@ dependencies = [
   "pytest-bdd",
   "testcontainers",
   "asserts",
-  "grpcio-health-checking==1.69.0",
+  "grpcio-health-checking==1.70.0",
 ]
 pre-install-commands = [
   "hatch build",

providers/openfeature-provider-flagd/pyproject.toml

@@ -1,7 +1,9 @@
 [pytest]
 markers =
     rpc: tests for rpc mode.
-    in-process: tests for rpc mode.
+    in-process: tests for in-process mode.
+    file: tests for file mode.
+    unavailable: tests for unavailable providers.
     customCert: Supports custom certs.
     unixsocket: Supports unixsockets.
     targetURI: Supports targetURI.
@@ -15,4 +17,6 @@ markers =
     sync: Supports sync.
     caching: Supports caching.
     offline: Supports offline.
+    os.linux: linux mark.
+    stream: Supports streams.
 bdd_features_base_dir = tests/features

providers/openfeature-provider-flagd/pytest.ini

@@ -26,8 +26,8 @@
 
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.flag_evaluation import FlagResolutionDetails
+from openfeature.provider import AbstractProvider
 from openfeature.provider.metadata import Metadata
-from openfeature.provider.provider import AbstractProvider
 
 from .config import CacheType, Config, ResolverType
 from .resolvers import AbstractResolver, GrpcResolver, InProcessResolver

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

@@ -105,7 +105,11 @@ def initialize(self, evaluation_context: EvaluationContext) -> None:
 
     def shutdown(self) -> None:
         self.active = False
+        self.channel.unsubscribe(self._state_change_callback)
         self.channel.close()
+        if self.timer and self.timer.is_alive():
+            logger.debug("gRPC error timer cancelled due to shutdown")
+            self.timer.cancel()
         if self.cache:
             self.cache.clear()
 
@@ -185,14 +189,16 @@ def listen(self) -> None:
         while self.active:
             try:
                 logger.debug("Setting up gRPC sync flags connection")
-                for message in self.stub.EventStream(request, **call_args):
+                for message in self.stub.EventStream(
+                    request, wait_for_ready=True, **call_args
+                ):
                     if message.type == "provider_ready":
-                        self.connected = True
                         self.emit_provider_ready(
                             ProviderEventDetails(
                                 message="gRPC sync connection established"
                             )
                         )
+                        self.connected = True
                     elif message.type == "configuration_change":
                         data = MessageToDict(message)["data"]
                         self.handle_changed_flags(data)

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

@@ -0,0 +1,11 @@
+import typing
+
+from openfeature.evaluation_context import EvaluationContext
+
+
+class FlagStateConnector(typing.Protocol):
+    def initialize(
+        self, evaluation_context: EvaluationContext
+    ) -> None: ...  # pragma: no cover
+
+    def shutdown(self) -> None: ...  # pragma: no cover

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

@@ -44,13 +44,13 @@ def handler(event):
 def assert_handlers(handles, event_type: str, max_wait: int = 2):
     poll_interval = 1
     while max_wait > 0:
-        found = [h["type"] == event_type for h in handles]
+        found = any(h["type"] == event_type for h in handles)
         if not found:
             max_wait -= poll_interval
             time.sleep(poll_interval)
             continue
         break
-    return [h for h in handles if h["type"] == event_type]
+    return handles
 
 
 @when(
@@ -60,7 +60,8 @@ def assert_handlers(handles, event_type: str, max_wait: int = 2):
     target_fixture="event_details",
 )
 def pass_for_event_fired(event_type: str, event_handles):
-    events = assert_handlers(event_handles, event_type, 20)
+    events = assert_handlers(event_handles, event_type, 30000)
+    events = [e for e in events if e["type"] == event_type]
     assert_greater(len(events), 0)
     for event in event_handles:
         event_handles.remove(event)