feat(groups): add LDAP link manager and deprecate old API endpoints

2 files changed, 32 insertions, 10 deletions

diff --git a/tests/functional/api/test_groups.py b/tests/functional/api/test_groups.py
index 0210a32..51fbe32 100644
--- a/tests/functional/api/test_groups.py
+++ b/tests/functional/api/test_groups.py
@@ -139,15 +139,37 @@ def test_group_labels(group):
 
 
 @pytest.mark.gitlab_premium
-@pytest.mark.xfail(reason="/ldap/groups endpoint is gone")
-def test_group_ldap_links(gl, group):
+@pytest.mark.xfail(reason="/ldap/groups endpoint not documented")
+def test_ldap_groups(gl):
+    assert isinstance(gl.ldapgroups.list(), list)
+
+
+@pytest.mark.gitlab_premium
+def test_group_ldap_links(group):
     ldap_cn = "common-name"
     ldap_provider = "ldap-provider"
-    assert gl.ldapgroups.list()
 
-    group.add_ldap_group_link(ldap_cn, 30, ldap_provider)
-    group.ldap_sync()
-    group.delete_ldap_group_link(ldap_cn)
+    ldap_cn_link = group.ldap_group_links.create(
+        {"provider": ldap_provider, "group_access": 30, "cn": ldap_cn}
+    )
+    ldap_filter_link = group.ldap_group_links.create(
+        {"provider": ldap_provider, "group_access": 30, "filter": "(cn=Common Name)"}
+    )
+
+    ldap_links = group.ldap_group_links.list()
+
+    assert ldap_cn_link.cn == ldap_links[0].cn
+    assert ldap_filter_link.filter == ldap_links[1].filter
+
+    with pytest.raises(gitlab.GitlabCreateError):
+        # todo - can we configure dummy LDAP in the container?
+        group.ldap_sync()
+
+    ldap_filter_link.delete()
+    group.ldap_group_links.delete(provider=ldap_provider, cn=ldap_cn)
+
+    with pytest.raises(gitlab.GitlabListError, match="No linked LDAP groups found"):
+        group.ldap_group_links.list()
 
 
 def test_group_notification_settings(group):
diff --git a/tests/unit/objects/test_groups.py b/tests/unit/objects/test_groups.py
index 5cba6dc..29e3c1a 100644
--- a/tests/unit/objects/test_groups.py
+++ b/tests/unit/objects/test_groups.py
@@ -8,7 +8,7 @@ import pytest
 import responses
 
 import gitlab
-from gitlab.v4.objects import GroupDescendantGroup, GroupSubgroup
+from gitlab.v4.objects import GroupDescendantGroup, GroupLDAPGroupLink, GroupSubgroup
 from gitlab.v4.objects.projects import GroupProject, SharedProject
 
 content = {"name": "name", "id": 1, "path": "path"}
@@ -283,9 +283,9 @@ def test_list_group_descendant_groups(group, resp_list_subgroups_descendant_grou
 
 
 def test_list_ldap_group_links(group, resp_list_ldap_group_links):
-    ldap_group_links = group.list_ldap_group_links()
-    assert isinstance(ldap_group_links, list)
-    assert ldap_group_links[0]["provider"] == ldap_group_links_content[0]["provider"]
+    ldap_group_links = group.ldap_group_links.list()
+    assert isinstance(ldap_group_links[0], GroupLDAPGroupLink)
+    assert ldap_group_links[0].provider == ldap_group_links_content[0]["provider"]
 
 
 @pytest.mark.skip("GitLab API endpoint not implemented")