rm rabbit client

Author: pcrespov

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -124,7 +124,6 @@ def _create_licensed_items_get_page(
 @dataclass
 class WbApiRpcClient(SingletonInAppStateMixin):
     app_state_name = "wb_api_rpc_client"
-    _client: RabbitMQRPCClient
     _rpc_client: WebServerRpcClient
 
     @_exception_mapper(rpc_exception_map={})
@@ -668,7 +667,6 @@ def setup(app: FastAPI, rabbitmq_rpc_client: RabbitMQRPCClient):
         raise ConfigurationError(tip="Webserver settings are not configured")
 
     wb_api_rpc_client = WbApiRpcClient(
-        _client=rabbitmq_rpc_client,
         _rpc_client=WebServerRpcClient(
             rabbitmq_rpc_client, webserver_settings.WEBSERVER_RPC_NAMESPACE
         ),

services/api-server/tests/unit/api_functions/conftest.py

@@ -97,7 +97,6 @@ async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> MockerF
     from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=DummyRpcClient(),
         _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
     return mocker

services/api-server/tests/unit/api_functions/test_api_routers_functions.py

@@ -434,11 +434,9 @@ def _get_rabbitmq_rpc_client(app: FastAPI) -> RabbitMQRPCClient:
     )
 
     async def _get_wb_api_rpc_client(app: FastAPI) -> WbApiRpcClient:
-        from servicelib.rabbitmq import RabbitMQRPCClient
         from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
         return WbApiRpcClient(
-            _client=mocker.MagicMock(spec=RabbitMQRPCClient),
             _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
         )
 

services/api-server/tests/unit/conftest.py

@@ -260,25 +260,25 @@ def mocked_app_dependencies(app: FastAPI, mocker: MockerFixture) -> Iterator[Non
     """
     assert app.state.settings.API_SERVER_RABBITMQ is None
     from servicelib.rabbitmq import RabbitMQRPCClient
-    from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
     from simcore_service_api_server.api.dependencies.rabbitmq import (
         get_rabbitmq_rpc_client,
     )
     from simcore_service_api_server.api.dependencies.webserver_rpc import (
         get_wb_api_rpc_client,
     )
-    from simcore_service_api_server.core.settings import WebServerSettings
 
     def _get_rabbitmq_rpc_client_override():
         return mocker.MagicMock()
 
     async def _get_wb_api_rpc_client_override():
+        from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
+        from simcore_service_api_server.core.settings import WebServerSettings
+
         webserver_settings: WebServerSettings = app.state.settings.API_SERVER_WEBSERVER
         assert webserver_settings.WEBSERVER_RPC_NAMESPACE
 
         rabbitmq_rpc_client = mocker.MagicMock(spec=RabbitMQRPCClient)
         return WbApiRpcClient(
-            _client=rabbitmq_rpc_client,
             _rpc_client=WebServerRpcClient(
                 rabbitmq_rpc_client, webserver_settings.WEBSERVER_RPC_NAMESPACE
             ),

services/api-server/tests/unit/pact_broker/test_pact_checkout_release.py

@@ -62,11 +62,9 @@
 
 @pytest.fixture
 async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
-    from servicelib.rabbitmq import RabbitMQRPCClient
     from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=mocker.MagicMock(spec=RabbitMQRPCClient),
         _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
 

services/api-server/tests/unit/pact_broker/test_pact_licensed_items.py

@@ -138,11 +138,9 @@ class DummyRpcClient:
 
 @pytest.fixture
 async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> None:
-    from servicelib.rabbitmq import RabbitMQRPCClient
     from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=mocker.MagicMock(spec=RabbitMQRPCClient),
         _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
 

services/api-server/tests/unit/test_licensed_items.py

@@ -80,7 +80,6 @@ async def mock_wb_api_server_rcp(app: FastAPI, mocker: MockerFixture) -> MockerF
     from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
-        _client=mocker.MagicMock(spec=RabbitMQRPCClient),
         _rpc_client=mocker.MagicMock(spec=WebServerRpcClient),
     )
     return mocker