Merge pull request #375 from minos-framework/issue-373-modify-discovery-client

#373 - Kong subscription

Author: vladyslav-fenchak

packages/core/minos-microservice-networks/minos/networks/decorators/definitions/abc.py

@@ -30,6 +30,9 @@ class EnrouteDecorator(ABC):
     # noinspection PyFinal
     KIND: Final[EnrouteDecoratorKind]
 
+    def __init__(self, **kwargs):
+        self.kwargs = kwargs
+
     def __call__(self, func: Union[Handler, HandlerWrapper]) -> HandlerWrapper:
         if isinstance(func, HandlerWrapper):
             meta = func.meta

packages/core/minos-microservice-networks/minos/networks/decorators/definitions/broker.py

@@ -17,7 +17,8 @@
 class BrokerEnrouteDecorator(EnrouteDecorator, ABC):
     """Broker Enroute class"""
 
-    def __init__(self, topic: str):
+    def __init__(self, topic: str, **kwargs):
+        super().__init__(**kwargs)
         self.topic = topic
 
     def __iter__(self) -> Iterable:

packages/core/minos-microservice-networks/minos/networks/decorators/definitions/http/abc.py

@@ -12,7 +12,8 @@
 class HttpEnrouteDecorator(EnrouteDecorator):
     """Http Enroute Decorator class."""
 
-    def __init__(self, path: Optional[str] = None, method: Optional[str] = None, url: Optional[str] = None):
+    def __init__(self, path: Optional[str] = None, method: Optional[str] = None, url: Optional[str] = None, **kwargs):
+        super().__init__(**kwargs)
         if path is None and url is not None:
             warnings.warn("The 'url' argument has been deprecated. 'path' must be used.", DeprecationWarning)
             path = url

packages/core/minos-microservice-networks/minos/networks/decorators/definitions/periodic.py

@@ -32,7 +32,8 @@
 class PeriodicEnrouteDecorator(EnrouteDecorator, ABC):
     """Periodic Enroute class"""
 
-    def __init__(self, crontab: Union[str, CronTab, CronTabImpl]):
+    def __init__(self, crontab: Union[str, CronTab, CronTabImpl], **kwargs):
+        super().__init__(**kwargs)
         from ...scheduling import (
             CronTab,
         )

packages/core/minos-microservice-networks/minos/networks/discovery/clients/abc.py

@@ -1,17 +1,22 @@
+from __future__ import (
+    annotations,
+)
+
 import logging
 from abc import (
     ABC,
     abstractmethod,
 )
 
 from minos.common import (
-    Object,
+    Config,
+    SetupMixin,
 )
 
 logger = logging.getLogger(__name__)
 
 
-class DiscoveryClient(ABC, Object):
+class DiscoveryClient(ABC, SetupMixin):
     """Discovery Client class."""
 
     def __init__(self, host: str, port: int, **kwargs):
@@ -28,6 +33,14 @@ def route(self) -> str:
         # noinspection HttpUrlsUsage
         return f"http://{self.host}:{self.port}"
 
+    @classmethod
+    def _from_config(cls, config: Config, **kwargs) -> DiscoveryClient:
+        discovery_config = config.get_discovery()
+
+        client_host = discovery_config.get("host")
+        client_port = discovery_config.get("port")
+        return cls(host=client_host, port=client_port, **kwargs)
+
     @abstractmethod
     async def subscribe(
         self, host: str, port: int, name: str, endpoints: list[dict[str, str]], *args, **kwargs

packages/core/minos-microservice-networks/minos/networks/discovery/connectors.py

@@ -79,10 +79,7 @@ def _client_from_config(cls, config: Config) -> DiscoveryClient:
         discovery_config = config.get_discovery()
 
         client_cls = cls._client_cls_from_config(discovery_config)
-        client_host = discovery_config.get("host")
-        client_port = discovery_config.get("port")
-
-        return client_cls(host=client_host, port=client_port)
+        return client_cls.from_config(config)
 
     @staticmethod
     def _client_cls_from_config(discovery_config: dict[str, Any]) -> type[DiscoveryClient]:
@@ -104,7 +101,8 @@ def _endpoints_from_config(config: Config) -> list[dict[str, Any]]:
         for name in config.get_services():
             decorators = EnrouteCollector(name, config).get_rest_command_query()
             endpoints += [
-                {"url": decorator.url, "method": decorator.method} for decorator in set(chain(*decorators.values()))
+                {"url": decorator.url, "method": decorator.method} | decorator.kwargs
+                for decorator in set(chain(*decorators.values()))
             ]
 
         endpoints.sort(key=itemgetter("url", "method"))

packages/core/minos-microservice-networks/tests/services/commands.py

@@ -7,7 +7,7 @@
 
 
 class CommandService:
-    @enroute.rest.command(path="/order", method="GET")
+    @enroute.rest.command(path="/order", method="GET", foo="bar")
     def get_order_rest(self, request: Request) -> Response:
         return Response("get_order")
 

packages/core/minos-microservice-networks/tests/services/queries.py

@@ -6,7 +6,7 @@
 
 
 class QueryService:
-    @enroute.rest.query(path="/ticket", method="POST")
+    @enroute.rest.query(path="/ticket", method="POST", foo="bar")
     def add_ticket(self, request: Request) -> Response:
         return Response("ticket_added")
 

packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py

@@ -16,10 +16,26 @@ def test_rest_command(self):
         decorator = enroute.rest.command(path="tickets/", method="GET")
         self.assertEqual(RestCommandEnrouteDecorator("tickets/", "GET"), decorator)
 
+    def test_rest_command_kwargs(self):
+        decorator = enroute.rest.command(
+            path="tickets/",
+            method="GET",
+            foo="bar",
+        )
+        self.assertEqual({"foo": "bar"}, decorator.kwargs)
+
     def test_rest_query(self):
         decorator = enroute.rest.query(path="tickets/", method="GET")
         self.assertEqual(RestQueryEnrouteDecorator("tickets/", "GET"), decorator)
 
+    def test_rest_query_kwargs(self):
+        decorator = enroute.rest.query(
+            path="tickets/",
+            method="GET",
+            foo="bar",
+        )
+        self.assertEqual({"foo": "bar"}, decorator.kwargs)
+
     def test_rest_event_raises(self):
         with self.assertRaises(AttributeError):
             enroute.rest.event("CreateTicket")

packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_collectors.py

@@ -15,10 +15,13 @@
 from tests.utils import (
     FakeService,
     FakeServiceWithGetEnroute,
+    FakeServiceWithKwargs,
 )
 
 
 class TestEnrouteCollector(unittest.IsolatedAsyncioTestCase):
+    ticket_route = "tickets/"
+
     def test_decorated_str(self):
         analyzer = EnrouteCollector(classname(FakeService))
         self.assertEqual(FakeService, analyzer.decorated)
@@ -28,7 +31,10 @@ def test_get_all(self):
 
         observed = analyzer.get_all()
         expected = {
-            "get_tickets": {BrokerQueryEnrouteDecorator("GetTickets"), RestQueryEnrouteDecorator("tickets/", "GET")},
+            "get_tickets": {
+                BrokerQueryEnrouteDecorator("GetTickets"),
+                RestQueryEnrouteDecorator(self.ticket_route, "GET"),
+            },
             "create_ticket": {
                 BrokerCommandEnrouteDecorator("CreateTicket"),
                 BrokerCommandEnrouteDecorator("AddTicket"),
@@ -50,13 +56,23 @@ def test_get_rest_command_query(self):
 
         observed = analyzer.get_rest_command_query()
         expected = {
-            "get_tickets": {RestQueryEnrouteDecorator("tickets/", "GET")},
+            "get_tickets": {RestQueryEnrouteDecorator(self.ticket_route, "GET")},
             "create_ticket": {RestCommandEnrouteDecorator("orders/", "GET")},
             "delete_ticket": {RestCommandEnrouteDecorator("orders/", "DELETE")},
         }
 
         self.assertEqual(expected, observed)
 
+    def test_get_rest_command_query_kwargs(self):
+        analyzer = EnrouteCollector(FakeServiceWithKwargs)
+
+        observed = analyzer.get_rest_command_query()
+        expected = {
+            "get_tickets": {RestQueryEnrouteDecorator(self.ticket_route, "GET", foo="bar")},
+        }
+
+        self.assertEqual(expected, observed)
+
     def test_get_broker_command_query_event(self):
         analyzer = EnrouteCollector(FakeService)