Inject connection choices into site auth list widget

Pass the LDAP and SAML connection picks into
_editable_connections_form_spec instead of reaching for the module-level
choice providers; saml_choices=None expresses "distributed SAML
unsupported". This drops the duplicate distributed_saml_supported() call
and lets the tests build the widget from plain data instead of
monkeypatching.

CMK-37102

Change-Id: I1eb185784fda9e943140a9a8d8a4380275d54237

Author: cellador

cmk/gui/watolib/sites.py

@@ -12,7 +12,7 @@
 import queue
 import re
 import time
-from collections.abc import Collection, Mapping
+from collections.abc import Collection, Mapping, Sequence
 from multiprocessing import JoinableQueue, Process
 from typing import Any, cast, NamedTuple, Protocol
 
@@ -399,7 +399,10 @@ def authentication_connections_form_spec(cls) -> FormSpec[Any]:
             CascadingSingleChoiceElement(
                 name="list",
                 title=Title("Use the following"),
-                parameter_form=cls._editable_connections_form_spec(),
+                parameter_form=cls._editable_connections_form_spec(
+                    ldap_choices=connection_choices(),
+                    saml_choices=saml_connection_choices() if saml_supported else None,
+                ),
             ),
             CascadingSingleChoiceElement(
                 name="all",
@@ -479,14 +482,19 @@ def _saml_acs_endpoint_widget() -> StaticText:
         )
 
     @classmethod
-    def _editable_connections_form_spec(cls) -> List[tuple[str, object]]:
+    def _editable_connections_form_spec(
+        cls,
+        *,
+        ldap_choices: Sequence[tuple[str, str]],
+        saml_choices: Sequence[tuple[str, str]] | None,
+    ) -> List[tuple[str, object]]:
         """Editable list of LDAP/SAML connection picks (the ``"list"`` form)."""
         ldap_elements = [
             SingleChoiceElementExtended(  # astrein: disable=localization-checker
                 name=id_,
                 title=Title(label),  # astrein: disable=localization-checker
             )
-            for id_, label in connection_choices()
+            for id_, label in ldap_choices
         ]
         connection_elements: list[CascadingSingleChoiceElement[Any]] = [
             CascadingSingleChoiceElement(
@@ -498,13 +506,13 @@ def _editable_connections_form_spec(cls) -> List[tuple[str, object]]:
                 ),
             ),
         ]
-        if distributed_saml_supported():
+        if saml_choices is not None:
             saml_elements = [
                 SingleChoiceElementExtended(  # astrein: disable=localization-checker
                     name=id_,
                     title=Title(label),  # astrein: disable=localization-checker
                 )
-                for id_, label in saml_connection_choices()
+                for id_, label in saml_choices
             ]
             connection_elements.append(
                 CascadingSingleChoiceElement(

tests/unit/cmk/gui/watolib/test_sites.py

@@ -305,28 +305,22 @@ def test_user_attribute_sync_form_spec_choices(
     ]
 
 
-def _editable_connection_elements(
-    monkeypatch: pytest.MonkeyPatch, *, saml_supported: bool
-) -> list[Any]:
+def _editable_connection_elements(*, saml_supported: bool) -> list[Any]:
     """Return the per-entry connection choices of the nested ``"list"`` widget
-    with stubbed connection choices."""
-    monkeypatch.setattr("cmk.gui.watolib.sites.connection_choices", lambda: [("ldap_a", "LDAP A")])
-    monkeypatch.setattr(
-        "cmk.gui.watolib.sites.saml_connection_choices", lambda: [("saml_a", "SAML A")]
-    )
-    monkeypatch.setattr("cmk.gui.watolib.sites.distributed_saml_supported", lambda: saml_supported)
-    template = SiteManagement._editable_connections_form_spec().element_template
+    built from stubbed connection choices."""
+    template = SiteManagement._editable_connections_form_spec(
+        ldap_choices=[("ldap_a", "LDAP A")],
+        saml_choices=[("saml_a", "SAML A")] if saml_supported else None,
+    ).element_template
     assert hasattr(template, "elements")
     return list(template.elements)
 
 
-def test_editable_connections_form_spec_offers_ldap_and_saml_when_supported(
-    request_context: None, monkeypatch: pytest.MonkeyPatch
-) -> None:
+def test_editable_connections_form_spec_offers_ldap_and_saml_when_supported() -> None:
     """The nested "list" connection widget renders an LDAP pick and, when distributed
     SAML is supported, a SAML pick whose sub-form carries the connection_id,
     metadata_endpoint and acs_endpoint fields."""
-    elements = _editable_connection_elements(monkeypatch, saml_supported=True)
+    elements = _editable_connection_elements(saml_supported=True)
     assert [element.name for element in elements] == ["ldap", "saml"]
     assert [choice.name for choice in elements[0].parameter_form.elements] == ["ldap_a"]
     saml_subform = elements[1].parameter_form
@@ -336,9 +330,7 @@ def test_editable_connections_form_spec_offers_ldap_and_saml_when_supported(
     ] == ["saml_a"]
 
 
-def test_connection_pick_accepts_dash_in_connection_id(
-    request_context: None, monkeypatch: pytest.MonkeyPatch
-) -> None:
+def test_connection_pick_accepts_dash_in_connection_id() -> None:
     """A connection id containing a dash can be offered as a per-site pick.
 
     The product's own id rule (the ``ID`` valuespec behind the connection's "ID"
@@ -347,15 +339,10 @@ def test_connection_pick_accepts_dash_in_connection_id(
     otherwise required to be Python identifiers, which a dash is not — so
     building the pick must not choke on an id the creation form let through.
     """
-    monkeypatch.setattr(
-        "cmk.gui.watolib.sites.connection_choices", lambda: [("ldap-with-dash", "LDAP dashed")]
-    )
-    monkeypatch.setattr(
-        "cmk.gui.watolib.sites.saml_connection_choices", lambda: [("saml-with-dash", "SAML dashed")]
-    )
-    monkeypatch.setattr("cmk.gui.watolib.sites.distributed_saml_supported", lambda: True)
-
-    template = SiteManagement._editable_connections_form_spec().element_template
+    template = SiteManagement._editable_connections_form_spec(
+        ldap_choices=[("ldap-with-dash", "LDAP dashed")],
+        saml_choices=[("saml-with-dash", "SAML dashed")],
+    ).element_template
     assert hasattr(template, "elements")
     elements = list(template.elements)
 
@@ -377,9 +364,7 @@ def test_auth_connections_round_trip_dashed_connection_id() -> None:
     assert _auth_connections_to_disk(("list", entries)) == entries
 
 
-def test_editable_connections_form_spec_omits_saml_when_not_supported(
-    request_context: None, monkeypatch: pytest.MonkeyPatch
-) -> None:
+def test_editable_connections_form_spec_omits_saml_when_not_supported() -> None:
     """Without distributed SAML support the nested "list" widget offers only the LDAP pick."""
-    elements = _editable_connection_elements(monkeypatch, saml_supported=False)
+    elements = _editable_connection_elements(saml_supported=False)
     assert [element.name for element in elements] == ["ldap"]