pr feedback

Signed-off-by: Konvalinka <[email protected]>

Author: leakonvalinka

.github/workflows/build.yml

@@ -37,8 +37,8 @@ jobs:
               - 'hooks/openfeature-hooks-opentelemetry/**'
             providers/openfeature-provider-env-var:
               - 'providers/openfeature-provider-env-var/**'
-            providers/providers/openfeature-provider-flagd:
-              - 'providers/providers/openfeature-provider-flagd/**'
+            providers/openfeature-provider-flagd:
+              - 'providers/openfeature-provider-flagd/**'
             providers/openfeature-provider-flipt:
               - 'providers/openfeature-provider-flipt/**'
             providers/openfeature-provider-ofrep:

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

@@ -215,10 +215,9 @@ def _fetch_metadata(self) -> typing.Optional[sync_pb2.GetMetadataResponse]:
             return None
 
         context_values_request = sync_pb2.GetMetadataRequest()
-        context_values_response: sync_pb2.GetMetadataResponse
         try:
-            context_values_response = self.stub.GetMetadata(
-                context_values_request, wait_for_ready=True
+            context_values_response: sync_pb2.GetMetadataResponse = (
+                self.stub.GetMetadata(context_values_request, wait_for_ready=True)
             )
             return context_values_response
         except grpc.RpcError as e:

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

@@ -60,13 +60,6 @@ def setUp(self):
         self.mock_stub.GetMetadata = Mock(return_value=self.mock_metadata)
         self.grpc_watcher.stub = self.mock_stub
         self.grpc_watcher.active = True
-        self.shutdown_thread = lambda: threading.Thread(
-            target=self.shutdown_after_x_seconds
-        )
-
-    def shutdown_after_x_seconds(self, seconds=1):
-        time.sleep(seconds)
-        self.grpc_watcher.shutdown()
 
     def test_listen_with_sync_metadata_and_sync_context(self):
         sync_context = Struct()
@@ -81,9 +74,12 @@ def test_listen_with_sync_metadata_and_sync_context(self):
         )
         self.mock_stub.SyncFlags = Mock(return_value=mock_stream_with_sync_context)
 
-        self.shutdown_thread().start()
+        listener = threading.Thread(target=self.grpc_watcher.listen)
+        listener.start()
 
-        self.grpc_watcher.listen()
+        time.sleep(0.5)
+        self.grpc_watcher.shutdown()
+        listener.join(timeout=1)
 
         self.emit_provider_ready.assert_called_once_with(
             ProviderEventDetails(message="gRPC sync connection established"),
@@ -98,9 +94,12 @@ def test_listen_with_sync_metadata_only(self):
         )
         self.mock_stub.SyncFlags = Mock(return_value=mock_stream_no_sync_context)
 
-        self.shutdown_thread().start()
+        listener = threading.Thread(target=self.grpc_watcher.listen)
+        listener.start()
 
-        self.grpc_watcher.listen()
+        time.sleep(0.5)
+        self.grpc_watcher.shutdown()
+        listener.join(timeout=1)
 
         self.emit_provider_ready.assert_called_once_with(
             ProviderEventDetails(message="gRPC sync connection established"),
@@ -115,9 +114,13 @@ def test_listen_with_sync_metadata_disabled_in_config(self):
             ]
         )
         self.mock_stub.SyncFlags = Mock(return_value=mock_stream_no_sync_context)
-        self.shutdown_thread().start()
 
-        self.grpc_watcher.listen()
+        listener = threading.Thread(target=self.grpc_watcher.listen)
+        listener.start()
+
+        time.sleep(0.5)
+        self.grpc_watcher.shutdown()
+        listener.join(timeout=1)
 
         self.mock_stub.GetMetadata.assert_not_called()