Update test environment conditionals for Python/Ansible support

Signed-off-by: Webster Mudge <wmudge@cloudera.com>

Author: wmudge

pyproject.toml

@@ -42,18 +42,44 @@ lint = [
 ]
 
 [tool.hatch.envs.hatch-test]
+matrix-name-format = "{variable}_{value}"
 extra-dependencies = [
   "pytest",
   "pytest-mock",
   "molecule",
   "molecule-plugins",
   "molecule-plugins[ec2]",
-  "ansible-core<2.17", # For RHEL 8 support
+  # "ansible-core<2.17", # For RHEL 8 support
   "cdpy @ git+https://github.com/cloudera-labs/cdpy@main#egg=cdpy",
 ]
 
+# Ansible 2.18 - Python >= 3.11
+[[tool.hatch.envs.hatch-test.matrix]]
+python = ["3.13", "3.12", "3.11"]
+ansible = ["2.18"]
+
+# Ansible 2.17 - Python >= 3.10
+[[tool.hatch.envs.hatch-test.matrix]]
+python = ["3.13", "3.12", "3.11", "3.10"]
+ansible = ["2.17"]
+
+# Ansible 2.16 - Python >= 3.10
 [[tool.hatch.envs.hatch-test.matrix]]
-python = ["3.13", "3.12", "3.11", "3.10", "3.9"]
+python = ["3.13", "3.12", "3.11", "3.10"]
+ansible = ["2.16"]
+
+# Ansible 2.15 - Python <= 3.12
+[[tool.hatch.envs.hatch-test.matrix]]
+python = ["3.12", "3.11", "3.10", "3.9"]
+ansible = ["2.15"]
+
+[tool.hatch.envs.hatch-test.overrides]
+matrix.ansible.dependencies = [
+  { value = "ansible-core==2.18", if = ["2.18"] },
+  { value = "ansible-core==2.17", if = ["2.17"] },
+  { value = "ansible-core==2.16", if = ["2.16"] },
+  { value = "ansible-core==2.15", if = ["2.15"] },
+]
 
 [tool.hatch.envs.docs]
 python = "3.12"

tests/unit/plugins/module_utils/cdp_client/test_create_encoded_authn_params_string.py

@@ -229,11 +229,14 @@ def test_create_encoded_authn_params_string_base64_error():
     auth_method = "ed25519v1"
 
     # Use unittest.mock directly with a more targeted approach
-    with unittest.mock.patch(
-        "ansible_collections.cloudera.cloud.plugins.module_utils.cdp_client.json.dumps",
-    ) as mock_dumps, unittest.mock.patch(
-        "ansible_collections.cloudera.cloud.plugins.module_utils.cdp_client.urlsafe_b64encode",
-    ) as mock_b64encode:
+    with (
+        unittest.mock.patch(
+            "ansible_collections.cloudera.cloud.plugins.module_utils.cdp_client.json.dumps",
+        ) as mock_dumps,
+        unittest.mock.patch(
+            "ansible_collections.cloudera.cloud.plugins.module_utils.cdp_client.urlsafe_b64encode",
+        ) as mock_b64encode,
+    ):
         mock_dumps.return_value = (
             '{"access_key_id": "test-key", "auth_method": "ed25519v1"}'
         )