- Fixed for new Config version.

issue #283

Author: albamig

packages/plugins/minos-broker-rabbitmq/minos/plugins/rabbitmq/publisher.py

@@ -8,12 +8,6 @@
     Message,
     connect,
 )
-from aio_pika.abc import (
-    AbstractConnection,
-)
-from cached_property import (
-    cached_property,
-)
 
 from minos.common import (
     MinosConfig,
@@ -59,10 +53,12 @@ def __init__(self, *args, broker_host: str, broker_port: int, **kwargs):
 
     @classmethod
     def _from_config(cls, config: MinosConfig, **kwargs) -> RabbitMQBrokerPublisher:
-        kwargs["broker_host"] = config.broker.host
-        kwargs["broker_port"] = config.broker.port
-        # noinspection PyProtectedMember
-        return cls(**config.broker.queue._asdict(), **kwargs)
+        broker_config = config.get_interface_by_name("broker")
+        common_config = broker_config["common"]
+
+        kwargs["broker_host"] = common_config["host"]
+        kwargs["broker_port"] = common_config["port"]
+        return cls(**kwargs)
 
     async def _setup(self) -> None:
         await super()._setup()

packages/plugins/minos-broker-rabbitmq/minos/plugins/rabbitmq/subscriber.py

@@ -15,7 +15,7 @@
 )
 
 from minos.common import (
-    MinosConfig,
+    MinosConfig, Config,
 )
 from minos.networks import (
     BrokerMessage,
@@ -72,16 +72,19 @@ async def _receive(self) -> BrokerMessage:
 class RabbitMQBrokerSubscriberBuilder(BrokerSubscriberBuilder):
     """RabbitMQ Broker Subscriber Builder class."""
 
-    def with_config(self, config: MinosConfig) -> BrokerSubscriberBuilder:
+    def with_config(self, config: Config) -> BrokerSubscriberBuilder:
         """Set config.
 
         :param config: The config to be set.
         :return: This method return the builder instance.
         """
+        broker_config = config.get_interface_by_name("broker")
+        common_config = broker_config["common"]
+
         self.kwargs |= {
-            "group_id": config.service.name,
-            "broker_host": config.broker.host,
-            "broker_port": config.broker.port,
+            "group_id": config.get_name(),
+            "broker_host": common_config["host"],
+            "broker_port": common_config["port"],
         }
         return self
 

packages/plugins/minos-broker-rabbitmq/tests/test_config.yml

@@ -1,6 +1,8 @@
 service:
     name: Order
     aggregate: tests.utils.Order
+    services:
+      - minos.networks.BrokerHandlerPort
 services:
     - tests.services.commands.CommandService
     - tests.services.queries.QueryService

packages/plugins/minos-broker-rabbitmq/tests/test_rabbitmq/test_publisher.py

@@ -7,7 +7,7 @@
 import aio_pika
 
 from minos.common import (
-    MinosConfig,
+    MinosConfig, Config,
 )
 from minos.networks import (
     BrokerMessage,
@@ -32,12 +32,14 @@ def test_is_subclass(self):
         self.assertTrue(issubclass(RabbitMQBrokerPublisher, BrokerPublisher))
 
     def test_from_config(self):
-        config = MinosConfig(CONFIG_FILE_PATH)
+        config = Config(CONFIG_FILE_PATH)
+        broker_config = config.get_interface_by_name("broker")["common"]
+
         publisher = RabbitMQBrokerPublisher.from_config(config)
 
         self.assertIsInstance(publisher, RabbitMQBrokerPublisher)
-        self.assertEqual(config.broker.host, publisher.broker_host)
-        self.assertEqual(config.broker.port, publisher.broker_port)
+        self.assertEqual(broker_config["host"], publisher.broker_host)
+        self.assertEqual(broker_config["port"], publisher.broker_port)
 
     @patch("minos.plugins.rabbitmq.publisher.connect")
     async def test_send(self, connect_mock):

packages/plugins/minos-broker-rabbitmq/tests/test_rabbitmq/test_subscriber.py

@@ -9,7 +9,7 @@
 )
 
 from minos.common import (
-    MinosConfig,
+    MinosConfig, Config,
 )
 from minos.networks import (
     BrokerMessageV1,
@@ -37,11 +37,12 @@ def test_is_subclass(self):
         self.assertTrue(issubclass(RabbitMQBrokerSubscriber, BrokerSubscriber))
 
     async def test_from_config(self):
-        config = MinosConfig(CONFIG_FILE_PATH)
+        config = Config(CONFIG_FILE_PATH)
+        broker_config = config.get_interface_by_name("broker")["common"]
         async with RabbitMQBrokerSubscriber.from_config(config, topics={"foo", "bar"}) as subscriber:
-            self.assertEqual(config.broker.host, subscriber.broker_host)
-            self.assertEqual(config.broker.port, subscriber.broker_port)
-            self.assertEqual(config.service.name, subscriber.group_id)
+            self.assertEqual(broker_config["host"], subscriber.broker_host)
+            self.assertEqual(broker_config["port"], subscriber.broker_port)
+            self.assertEqual(config.get_name(), subscriber.group_id)
             self.assertEqual(False, subscriber.remove_topics_on_destroy)
             self.assertEqual({"foo", "bar"}, subscriber.topics)
 
@@ -61,31 +62,33 @@ async def test_receive(self, connect_mock, mock_avro):
 
 class TestRabbitMQBrokerSubscriberBuilder(unittest.TestCase):
     def setUp(self) -> None:
-        self.config = MinosConfig(CONFIG_FILE_PATH)
+        self.config = Config(CONFIG_FILE_PATH)
 
     def test_with_config(self):
         builder = RabbitMQBrokerSubscriberBuilder().with_config(self.config)
+        common_config = self.config.get_interface_by_name("broker")["common"]
 
         expected = {
-            "group_id": self.config.service.name,
-            "broker_host": self.config.broker.host,
-            "broker_port": self.config.broker.port,
+            "group_id": self.config.get_name(),
+            "broker_host": common_config["host"],
+            "broker_port": common_config["port"],
         }
         self.assertEqual(expected, builder.kwargs)
 
     def test_build(self):
+        common_config = self.config.get_interface_by_name("broker")["common"]
         builder = RabbitMQBrokerSubscriberBuilder().with_config(self.config).with_topics({"one", "two"})
         subscriber = builder.build()
 
         self.assertIsInstance(subscriber, RabbitMQBrokerSubscriber)
         self.assertEqual({"one", "two"}, subscriber.topics)
-        self.assertEqual(self.config.broker.port, subscriber.broker_port)
-        self.assertEqual(self.config.broker.host, subscriber.broker_host)
+        self.assertEqual(common_config["host"], subscriber.broker_host)
+        self.assertEqual(common_config["port"], subscriber.broker_port)
 
 
 class TestPostgreSqlQueuedRabbitMQBrokerSubscriberBuilder(unittest.TestCase):
     def setUp(self) -> None:
-        self.config = MinosConfig(CONFIG_FILE_PATH)
+        self.config = Config(CONFIG_FILE_PATH)
 
     def test_build(self):
         builder = PostgreSqlQueuedRabbitMQBrokerSubscriberBuilder().with_config(self.config).with_topics({"one", "two"})
@@ -98,7 +101,7 @@ def test_build(self):
 
 class TestInMemoryQueuedRabbitMQBrokerSubscriberBuilder(unittest.TestCase):
     def setUp(self) -> None:
-        self.config = MinosConfig(CONFIG_FILE_PATH)
+        self.config = Config(CONFIG_FILE_PATH)
 
     def test_build(self):
         builder = InMemoryQueuedRabbitMQBrokerSubscriberBuilder().with_config(self.config).with_topics({"one", "two"})