fix: add generation of unix url for DAB redis client (#996)

Author: jshimkus-rh

src/aap_eda/core/tasking/__init__.py

@@ -52,18 +52,28 @@
 ]
 
 
+def _create_url_from_parameters(**kwargs):
+    # Make the URL that DAB will expect for instantiation.
+    schema = "unix"
+    try:
+        path = kwargs["unix_socket_path"]
+    except KeyError:
+        schema = "redis"
+        if kwargs.get("ssl", False):
+            schema = "rediss"
+        path = f"{kwargs.get('host')}:{kwargs.get('port')}"
+
+    url = f"{schema}://{path}"
+    return url
+
+
 def get_redis_client(**kwargs):
     """Instantiate a Redis client via DAB.
 
     DAB will return an appropriate client for HA based on the passed
     parameters.
     """
-    # Make the URL that DAB expects as part of the creation.
-    schema = "redis"
-    if kwargs.get("ssl", False):
-        schema = "rediss"
-    url = f"{schema}://{kwargs.get('host')}:{kwargs.get('port')}"
-    return _get_redis_client(url, **kwargs)
+    return _get_redis_client(_create_url_from_parameters(**kwargs), **kwargs)
 
 
 def enable_redis_prefix():

tests/integration/core/test_tasking.py

@@ -13,6 +13,8 @@
 #  limitations under the License.
 
 
+from unittest.mock import patch
+
 import pytest
 import redis
 
@@ -21,6 +23,7 @@
     DABRedisCluster,
     DefaultWorker,
     Queue,
+    _create_url_from_parameters,
     get_redis_client,
     logger,
     unique_enqueue,
@@ -66,6 +69,36 @@ def test_unique_enqueue_new_job(default_queue, eda_caplog):
     assert "Enqueing unique job" in eda_caplog.text
 
 
+@patch("aap_eda.settings.default.REDIS_UNIX_SOCKET_PATH", "path/to/socket")
+def test_unix_dab_url():
+    url = _create_url_from_parameters(
+        **default.rq_redis_client_instantiation_parameters()
+    )
+    assert url == "unix://path/to/socket"
+
+
+@patch("aap_eda.settings.default.REDIS_UNIX_SOCKET_PATH", None)
+@patch("aap_eda.settings.default.REDIS_CLIENT_CERT_PATH", None)
+@patch("aap_eda.settings.default.REDIS_HOST", "a-host")
+@patch("aap_eda.settings.default.REDIS_PORT", 6379)
+def test_redis_dab_url():
+    url = _create_url_from_parameters(
+        **default.rq_redis_client_instantiation_parameters()
+    )
+    assert url == "redis://a-host:6379"
+
+
+@patch("aap_eda.settings.default.REDIS_UNIX_SOCKET_PATH", None)
+@patch("aap_eda.settings.default.REDIS_CLIENT_CERT_PATH", "path/to/cert")
+@patch("aap_eda.settings.default.REDIS_HOST", "a-different-host")
+@patch("aap_eda.settings.default.REDIS_PORT", 6380)
+def test_rediss_dab_url():
+    url = _create_url_from_parameters(
+        **default.rq_redis_client_instantiation_parameters()
+    )
+    assert url == "rediss://a-different-host:6380"
+
+
 def test_worker_dab_client(default_queue: Queue):
     """Test that workers end up with a DABRedis client connection."""