Partial revert of ec0e219

functools.singledispatchmethod is Python 3.8+ only

Author: rjgildea

src/zocalo/util/rabbitmq.py

@@ -1,6 +1,5 @@
 import datetime
 import enum
-import functools
 import logging
 import pathlib
 import urllib
@@ -630,14 +629,6 @@ def delete(self, endpoint: str, params: Dict[str, Any] = None) -> requests.Respo
             f"{self._url}/{endpoint}", auth=self._auth, params=params
         )
 
-    @functools.singledispatchmethod
-    def create_component(self, component):
-        raise NotImplementedError(f"Component {component} not recognised")
-
-    @functools.singledispatchmethod
-    def delete_component(self, component):
-        raise NotImplementedError(f"Component {component} not recognised")
-
     def connections(
         self, name: Optional[str] = None
     ) -> Union[List[ConnectionInfo], ConnectionInfo]:
@@ -677,7 +668,6 @@ def exchanges(
         logger.debug(response)
         return [ExchangeInfo(**qi) for qi in response.json()]
 
-    @create_component.register
     def exchange_declare(self, exchange: ExchangeSpec):
         endpoint = f"exchanges/{exchange.vhost}/{exchange.name}/"
         response = self.put(
@@ -691,10 +681,6 @@ def exchange_delete(self, vhost: str, name: str, if_unused: bool = False):
         response = self.delete(endpoint, params={"if_unused": if_unused})
         logger.debug(response)
 
-    @delete_component.register
-    def _delete_exchange(self, exchange: ExchangeSpec, **kwargs):
-        self.exchange_delete(vhost=exchange.vhost, name=exchange.name, **kwargs)
-
     def policies(
         self, vhost: Optional[str] = None, name: Optional[str] = None
     ) -> Union[List[PolicyInfo], PolicyInfo]:
@@ -711,7 +697,6 @@ def policies(
         logger.debug(response)
         return [PolicyInfo(**p) for p in response.json()]
 
-    @create_component.register
     def set_policy(self, policy: PolicySpec):
         endpoint = f"policies/{policy.vhost}/{policy.name}/"
         response = self.put(
@@ -727,10 +712,6 @@ def clear_policy(self, vhost: str, name: str):
         response = self.delete(endpoint)
         logger.debug(response)
 
-    @delete_component.register
-    def _delete_policy(self, policy: PolicySpec):
-        self.clear_policy(vhost=policy.vhost, name=policy.name)
-
     def queues(
         self, vhost: Optional[str] = None, name: Optional[str] = None
     ) -> Union[List[QueueInfo], QueueInfo]:
@@ -747,7 +728,6 @@ def queues(
         logger.debug(response)
         return [QueueInfo(**qi) for qi in response.json()]
 
-    @create_component.register
     def queue_declare(self, queue: QueueSpec):
         endpoint = f"queues/{queue.vhost}/{queue.name}"
         response = self.put(
@@ -764,14 +744,6 @@ def queue_delete(
         )
         logger.debug(response)
 
-    @delete_component.register
-    def _delete_queue(
-        self, queue: QueueSpec, if_unused: bool = False, if_empty: bool = False
-    ):
-        self.queue_delete(
-            vhost=queue.vhost, name=queue.name, if_unused=if_unused, if_empty=if_empty
-        )
-
     def users(self, name: str = None) -> Union[List[UserInfo], UserInfo]:
         endpoint = "users"
         if name:
@@ -781,7 +753,6 @@ def users(self, name: str = None) -> Union[List[UserInfo], UserInfo]:
         response = self.get(endpoint)
         return [UserInfo(**u) for u in response.json()]
 
-    @create_component.register
     def add_user(self, user: UserSpec):
         endpoint = f"users/{user.name}/"
         response = self.put(
@@ -793,7 +764,3 @@ def delete_user(self, name: str):
         endpoint = f"users/{name}/"
         response = self.delete(endpoint)
         logger.debug(response)
-
-    @delete_component.register
-    def _delete_user(self, user: UserSpec):
-        self.delete_user(name=user.name)

tests/util/test_rabbitmq.py

@@ -109,27 +109,23 @@ def queue_spec():
 def test_api_queue_declare(requests_mock, rmqapi, queue_spec):
     requests_mock.put("/api/queues/zocalo/foo")
     rmqapi.queue_declare(queue=queue_spec)
-    rmqapi.create_component(queue_spec)
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "PUT"
-        assert history.url.endswith("/api/queues/zocalo/foo")
-        assert history.json() == {
-            "auto_delete": True,
-            "arguments": queue_spec.arguments,
-        }
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "PUT"
+    assert history.url.endswith("/api/queues/zocalo/foo")
+    assert history.json() == {
+        "auto_delete": True,
+        "arguments": queue_spec.arguments,
+    }
 
 
 def test_api_queue_delete(requests_mock, rmqapi, queue_spec):
     requests_mock.delete("/api/queues/zocalo/foo")
     rmqapi.queue_delete(vhost="zocalo", name="foo", if_unused=True, if_empty=True)
-    rmqapi.delete_component(queue_spec, if_unused=True, if_empty=True)
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "DELETE"
-        assert history.url.endswith(
-            "/api/queues/zocalo/foo?if_unused=True&if_empty=True"
-        )
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "DELETE"
+    assert history.url.endswith("/api/queues/zocalo/foo?if_unused=True&if_empty=True")
 
 
 def test_api_nodes(requests_mock, rmqapi):
@@ -215,26 +211,24 @@ def exchange_spec(name):
 def test_api_exchange_declare(name, requests_mock, rmqapi):
     requests_mock.put(f"/api/exchanges/zocalo/{name}/")
     rmqapi.exchange_declare(exchange=exchange_spec(name))
-    rmqapi.create_component(exchange_spec(name))
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "PUT"
-        assert history.url.endswith(f"/api/exchanges/zocalo/{name}/")
-        assert history.json() == {
-            "type": "fanout",
-            "auto_delete": True,
-            "durable": True,
-        }
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "PUT"
+    assert history.url.endswith(f"/api/exchanges/zocalo/{name}/")
+    assert history.json() == {
+        "type": "fanout",
+        "auto_delete": True,
+        "durable": True,
+    }
 
 
 def test_api_exchange_delete(requests_mock, rmqapi):
     requests_mock.delete("/api/exchanges/zocalo/foo")
     rmqapi.exchange_delete(vhost="zocalo", name="foo", if_unused=True)
-    rmqapi.delete_component(exchange_spec("foo"), if_unused=True)
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "DELETE"
-        assert history.url.endswith("/api/exchanges/zocalo/foo?if_unused=True")
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "DELETE"
+    assert history.url.endswith("/api/exchanges/zocalo/foo?if_unused=True")
 
 
 def test_api_connections(requests_mock, rmqapi):
@@ -298,26 +292,24 @@ def user_spec():
 def test_api_add_user(requests_mock, rmqapi, user_spec):
     requests_mock.put(f"/api/users/{user_spec.name}/")
     rmqapi.add_user(user=user_spec)
-    rmqapi.create_component(user_spec)
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "PUT"
-        assert history.url.endswith(f"/api/users/{user_spec.name}/")
-        assert history.json() == {
-            "password_hash": "guest",
-            "hashing_algorithm": "rabbit_password_hashing_sha256",
-            "tags": "administrator",
-        }
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "PUT"
+    assert history.url.endswith(f"/api/users/{user_spec.name}/")
+    assert history.json() == {
+        "password_hash": "guest",
+        "hashing_algorithm": "rabbit_password_hashing_sha256",
+        "tags": "administrator",
+    }
 
 
 def test_api_delete_user(requests_mock, rmqapi, user_spec):
     requests_mock.delete("/api/users/guest/")
     rmqapi.delete_user(name="guest")
-    rmqapi.delete_component(user_spec)
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "DELETE"
-        assert history.url.endswith("/api/users/guest/")
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "DELETE"
+    assert history.url.endswith("/api/users/guest/")
 
 
 def test_api_policies(requests_mock, rmqapi):
@@ -359,23 +351,21 @@ def policy_spec():
 def test_api_set_policy(requests_mock, rmqapi, policy_spec):
     requests_mock.put(f"/api/policies/foo/{policy_spec.name}/")
     rmqapi.set_policy(policy=policy_spec)
-    rmqapi.create_component(policy_spec)
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "PUT"
-        assert history.url.endswith(f"/api/policies/foo/{policy_spec.name}/")
-        assert history.json() == {
-            "pattern": "^amq.",
-            "apply-to": "queues",
-            "definition": {"delivery-limit": 5},
-        }
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "PUT"
+    assert history.url.endswith(f"/api/policies/foo/{policy_spec.name}/")
+    assert history.json() == {
+        "pattern": "^amq.",
+        "apply-to": "queues",
+        "definition": {"delivery-limit": 5},
+    }
 
 
 def test_api_clear_policy(requests_mock, rmqapi, policy_spec):
     requests_mock.delete("/api/policies/foo/bar/")
     rmqapi.clear_policy(vhost="foo", name="bar")
-    rmqapi.delete_component(policy_spec)
-    assert requests_mock.call_count == 2
-    for history in requests_mock.request_history:
-        assert history.method == "DELETE"
-        assert history.url.endswith("/api/policies/foo/bar/")
+    assert requests_mock.call_count == 1
+    history = requests_mock.request_history[0]
+    assert history.method == "DELETE"
+    assert history.url.endswith("/api/policies/foo/bar/")