AAP-52587: support extended boolean values (#1390)

Support extended set of boolean values (true/false/yes/no/1/0) for
MQ_TLS setting.

Currently if a non-standard boolean value is used (yes/no/1/0), this can
cause issues during an upgrade.

[AAP-52587](https://issues.redhat.com/browse/AAP-52587)

Generated with assistance from Cursor (claude-4-sonnet).

Author: zkayyali812

src/aap_eda/settings/defaults.py

@@ -65,7 +65,7 @@
 *   - Takes precedence over host and port
 * MQ_HOST - Redis queue hostname (default: "127.0.0.1")
 * MQ_PORT - Redis queue port (default: 6379)
-* MQ_TLS - Force TLS on when True (default: None)
+* MQ_TLS - Force TLS on when True or "yes" (default: None)
 * MQ_DB - Redis queue database (default: 0)
 * MQ_USER - Redis user (default: None)
 * MQ_USER_PASSWORD - Redis user passed (default: None)
@@ -157,7 +157,7 @@
 MQ_CLIENT_CACERT_PATH: Optional[str] = None
 MQ_CLIENT_CERT_PATH: Optional[str] = None
 MQ_CLIENT_KEY_PATH: Optional[str] = None
-MQ_TLS: Optional[bool] = None
+MQ_TLS: Optional[Union[bool, str]] = None
 MQ_DB: int = core.DEFAULT_REDIS_DB
 
 # The HA cluster hosts is a string of <host>:<port>[,<host>:port>]+

src/aap_eda/settings/post_load.py

@@ -460,7 +460,15 @@ def post_loading(loaded_settings: Dynaconf):
     )
     settings.REDIS_CLIENT_CERT_PATH = settings.get("MQ_CLIENT_CERT_PATH", None)
     settings.REDIS_CLIENT_KEY_PATH = settings.get("MQ_CLIENT_KEY_PATH", None)
-    settings.REDIS_TLS = settings.get("MQ_TLS", None)
+
+    # Handle MQ_TLS setting - convert string values to boolean
+    mq_tls = settings.get("MQ_TLS", None)
+    if mq_tls is not None and isinstance(mq_tls, str):
+        converted_tls = utils.str_to_bool(mq_tls)
+        settings.MQ_TLS = converted_tls
+        settings.REDIS_TLS = converted_tls
+    else:
+        settings.REDIS_TLS = mq_tls
     settings.REDIS_DB = settings.get("MQ_DB", settings.DEFAULT_REDIS_DB)
     settings.REDIS_HA_CLUSTER_HOSTS = settings.get(
         "MQ_REDIS_HA_CLUSTER_HOSTS", ""

tests/unit/test_settings.py

@@ -250,6 +250,17 @@ def test_duplicated_worker_queue(mock_settings):
         ("RESOURCE_JWT_USER_ID", " eda ", "eda"),
         ("RESOURCE_JWT_USER_ID", ["eda"], ImproperlyConfigured),
         ("MQ_TLS", True, True),
+        ("MQ_TLS", False, False),
+        ("MQ_TLS", None, None),
+        ("MQ_TLS", "true", True),
+        ("MQ_TLS", "True", True),
+        ("MQ_TLS", "false", False),
+        ("MQ_TLS", "False", False),
+        ("MQ_TLS", "yes", True),
+        ("MQ_TLS", "no", False),
+        ("MQ_TLS", "1", True),
+        ("MQ_TLS", "0", False),
+        ("MQ_TLS", "", False),
     ],
 )
 def test_types(mock_settings, name, value, expected):
@@ -264,10 +275,10 @@ def test_types(mock_settings, name, value, expected):
 
 def test_optional_type_exception_msg(mock_settings):
     """Test exception message when an optional type error occurs."""
-    mock_settings["MQ_TLS"] = "true"
+    mock_settings["MQ_TLS"] = 123  # Use invalid type instead of string
     with pytest.raises(
         ImproperlyConfigured,
-        match="MQ_TLS setting must be a bool or None",
+        match="MQ_TLS setting must be a bool or str or None",
     ):
         post_loading(mock_settings)
 
@@ -285,3 +296,46 @@ def test_union_type_exception_msg(mock_settings):
 def test_allow_local_resource_management(mock_settings):
     # default is False
     assert mock_settings.ALLOW_LOCAL_RESOURCE_MANAGEMENT is False
+
+
+@pytest.mark.parametrize(
+    ("mq_tls_value", "expected_redis_tls", "expected_ssl_param"),
+    [
+        # Boolean values
+        (True, True, True),
+        (False, False, False),
+        (
+            None,
+            None,
+            False,
+        ),  # None should result in SSL=False (fallback logic)
+        # String values that should be converted to True
+        ("true", True, True),
+        ("True", True, True),
+        ("yes", True, True),
+        ("Yes", True, True),
+        ("1", True, True),
+        # String values that should be converted to False
+        ("false", False, False),
+        ("False", False, False),
+        ("no", False, False),
+        ("No", False, False),
+        ("0", False, False),
+        ("", False, False),
+        ("anything", False, False),
+    ],
+)
+def test_mq_tls_conversion_and_redis_ssl(
+    mock_settings, mq_tls_value, expected_redis_tls, expected_ssl_param
+):
+    """Test MQ_TLS setting conversion to REDIS_TLS and SSL parameter."""
+    mock_settings.MQ_TLS = mq_tls_value
+
+    post_loading(mock_settings)
+
+    # Check that MQ_TLS was properly converted to REDIS_TLS
+    assert mock_settings.REDIS_TLS == expected_redis_tls
+
+    # Check that the Redis queue configuration uses the correct SSL parameter
+    queues = get_rq_queues(mock_settings)
+    assert queues["default"]["SSL"] == expected_ssl_param