gitlabform 4.2.4__tar.gz → 4.2.6__tar.gz

{gitlabform-4.2.4 → gitlabform-4.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlabform
-Version: 4.2.4
+Version: 4.2.6
 Summary: 🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML
 Author: Greg Dubicki and Contributors
 Project-URL: Homepage, https://gitlabform.github.io/gitlabform/
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Version Control :: Git
 Requires-Python: >=3.12.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: certifi==2025.1.31
+Requires-Dist: certifi==2025.6.15
 Requires-Dist: cli-ui==0.19.0
 Requires-Dist: ez-yaml==1.2.0
 Requires-Dist: Jinja2==3.1.6
@@ -28,23 +28,23 @@ Requires-Dist: luddite==1.0.4
 Requires-Dist: MarkupSafe==3.0.2
 Requires-Dist: mergedeep==1.3.4
 Requires-Dist: packaging==25.0
-Requires-Dist: python-gitlab==5.6.0
-Requires-Dist: python-gitlab[graphql]==5.6.0
-Requires-Dist: requests==2.32.3
+Requires-Dist: python-gitlab==6.1.0
+Requires-Dist: python-gitlab[graphql]==6.1.0
+Requires-Dist: requests==2.32.4
 Requires-Dist: ruamel.yaml==0.17.21
-Requires-Dist: types-requests==2.32.0.20250328
-Requires-Dist: types-setuptools==78.1.0.20250329
+Requires-Dist: types-requests==2.32.4.20250611
+Requires-Dist: types-setuptools==80.9.0.20250529
 Requires-Dist: yamlpath==3.8.2
 Provides-Extra: test
-Requires-Dist: coverage==7.8.0; extra == "test"
-Requires-Dist: cryptography==44.0.2; extra == "test"
-Requires-Dist: deepdiff==8.4.2; extra == "test"
-Requires-Dist: mypy==1.15.0; extra == "test"
-Requires-Dist: mypy-extensions==1.0.0; extra == "test"
+Requires-Dist: coverage==7.9.2; extra == "test"
+Requires-Dist: cryptography==45.0.5; extra == "test"
+Requires-Dist: deepdiff==8.5.0; extra == "test"
+Requires-Dist: mypy==1.16.1; extra == "test"
+Requires-Dist: mypy-extensions==1.1.0; extra == "test"
 Requires-Dist: pre-commit==2.21.0; extra == "test"
-Requires-Dist: pytest==8.3.5; extra == "test"
-Requires-Dist: pytest-cov==6.1.1; extra == "test"
-Requires-Dist: pytest-rerunfailures==15.0; extra == "test"
+Requires-Dist: pytest==8.4.1; extra == "test"
+Requires-Dist: pytest-cov==6.2.1; extra == "test"
+Requires-Dist: pytest-rerunfailures==15.1; extra == "test"
 Requires-Dist: xkcdpass==1.20.0; extra == "test"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/gitlab/python_gitlab.py

@@ -96,6 +96,7 @@ class PythonGitlab(Gitlab):
         # Gitlab API will only ever return 0 or 1 entry when GETting using `username` attribute
         # https://docs.gitlab.com/ee/api/users.html#for-non-administrator-users
         # so will always be list[RESTObject] and never RESTObjectList from python-gitlab's api
+        # username list is case-insensitive on the gitlab api
         users: list[RESTObject] = self.users.list(username=username)  # type: ignore
 
         if len(users) == 0:

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/processors/group/group_hooks_processor.py

@@ -3,6 +3,7 @@ from typing import Dict, Any, List
 
 from gitlab.base import RESTObject, RESTObjectList
 from gitlab.v4.objects import Group
+from gitlab.v4.objects import GroupHook
 
 from gitlabform.gitlab import GitLab
 from gitlabform.processors.abstract_processor import AbstractProcessor
@@ -15,7 +16,7 @@ class GroupHooksProcessor(AbstractProcessor):
     def _process_configuration(self, group_path_and_name: str, configuration: dict):
         debug("Processing group hooks...")
         group: Group = self.gl.get_group_by_path_cached(group_path_and_name)
-        group_hooks: RESTObjectList | List[RESTObject] = group.hooks.list(get_all=True)
+        group_hooks: list[GroupHook] = group.hooks.list(get_all=True)
 
         hooks_in_config: tuple[str, ...] = tuple(x for x in sorted(configuration["group_hooks"]) if x != "enforce")
 

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/processors/group/group_members_processor.py

@@ -1,14 +1,13 @@
-from logging import debug, warning
+from logging import debug, error
 from typing import Dict, Tuple
 
-import gitlab
 from cli_ui import fatal, error, debug as verbose
 
 from gitlabform.constants import EXIT_INVALID_INPUT
 from gitlabform.gitlab import GitLab, AccessLevel
 from gitlabform.processors.abstract_processor import AbstractProcessor
 from gitlab.v4.objects import Group, GroupMember, User
-from gitlab import GitlabDeleteError, GitlabGetError
+from gitlab import GitlabDeleteError, GitlabError, GitlabGetError
 
 
 class GroupMembersProcessor(AbstractProcessor):
@@ -102,7 +101,11 @@ class GroupMembersProcessor(AbstractProcessor):
                     # to ensure that the group has the expected access level
                     self._unshare(group_being_processed, share_with_group_id)
 
-                    group_being_processed.share(share_with_group_id, group_access_to_set, expires_at_to_set)
+                    try:
+                        group_being_processed.share(share_with_group_id, group_access_to_set, expires_at_to_set)
+                    except GitlabError as e:
+                        error(f"Error processing {share_with_group_path}, {e.error_message}")
+                        raise e
 
             else:
                 debug(
@@ -111,7 +114,11 @@ class GroupMembersProcessor(AbstractProcessor):
                 )
 
                 share_with_group_id = self.gl.get_group_id(share_with_group_path)
-                group_being_processed.share(share_with_group_id, group_access_to_set, expires_at_to_set)
+                try:
+                    group_being_processed.share(share_with_group_id, group_access_to_set, expires_at_to_set)
+                except GitlabError as e:
+                    error(f"Error processing {share_with_group_path}, {e.error_message}")
+                    raise e
 
         if enforce_group_members:
             # remove groups not configured explicitly

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/processors/project/hooks_processor.py

@@ -3,6 +3,7 @@ from typing import Dict, Any, List
 
 from gitlab.base import RESTObject, RESTObjectList
 from gitlab.v4.objects import Project
+from gitlab.v4.objects import ProjectHook
 
 from gitlabform.gitlab import GitLab
 from gitlabform.processors.abstract_processor import AbstractProcessor
@@ -15,7 +16,7 @@ class HooksProcessor(AbstractProcessor):
     def _process_configuration(self, project_and_group: str, configuration: dict):
         debug("Processing hooks...")
         project: Project = self.gl.get_project_by_path_cached(project_and_group)
-        project_hooks: RESTObjectList | List[RESTObject] = project.hooks.list(get_all=True)
+        project_hooks: list[ProjectHook] = project.hooks.list(get_all=True)
 
         hooks_in_config: tuple[str, ...] = tuple(x for x in sorted(configuration["hooks"]) if x != "enforce")
 

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/processors/project/integrations_processor.py

@@ -1,5 +1,6 @@
 from cli_ui import debug as verbose
 
+from gitlab.exceptions import GitlabDeleteError
 from gitlab.v4.objects import Project, ProjectIntegration
 from gitlabform.gitlab import GitLab
 from gitlabform.processors.abstract_processor import AbstractProcessor
@@ -18,7 +19,15 @@ class IntegrationsProcessor(AbstractProcessor):
 
             if configured_integrations[integration].get("delete"):
                 verbose(f"Deleting integration: {integration}")
-                gl_integration.delete()
+                try:
+                    gl_integration.delete()
+                except GitlabDeleteError as e:
+                    # If we get a 404 the integration does not exist, so we can ignore the error
+                    if e.response_code == 404:
+                        verbose(f"Integration {integration} does not exist, skipping deletion.")
+                    else:
+                        verbose(f"Failed to delete integration {integration}: {e}")
+                        raise
             else:
                 verbose(f"Setting integration: {integration}")
                 project.integrations.update(integration, configured_integrations[integration])

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/processors/project/members_processor.py

@@ -49,15 +49,10 @@ class MembersProcessor(AbstractProcessor):
                     and expires_at == current_groups[common_group_name]["expires_at"]
                     and access_level == current_groups[common_group_name]["group_access_level"]
                 ):
-                    verbose(
-                        "Ignoring group '%s' as it is already a member",
-                        common_group_name,
-                    )
-                    verbose(
-                        "Current settings for '%s' are: %s" % (common_group_name, current_groups[common_group_name])
-                    )
+                    verbose(f"Ignoring group '{common_group_name}' as it is already a member")
+                    verbose(f"Current settings for '{common_group_name}' are: {current_groups[common_group_name]}")
                 else:
-                    verbose("Setting group '%s' as a member", common_group_name)
+                    verbose(f"Setting group '{common_group_name}' as a member")
                     access = access_level
                     expiry = expires_at
 
@@ -86,7 +81,6 @@ class MembersProcessor(AbstractProcessor):
         enforce_members: bool,
         keep_bots: bool,
     ):
-
         project: Project = self.gl.get_project_by_path_cached(project_and_group)
 
         current_members = self._get_members_from_project(project)
@@ -97,10 +91,11 @@ class MembersProcessor(AbstractProcessor):
             for user in users:
                 info(f"Processing user '{user}'...")
 
-                user_id = self.gl.get_user_id_cached(user)
-                if user_id is None:
+                gitlab_user = self.gl.get_user_by_username_cached(user)
+                if gitlab_user is None:
                     warning(f"Could not find user '{user}' in Gitlab, skipping...")
                     continue
+                user_id = gitlab_user.id
 
                 expires_at = users[user]["expires_at"].strftime("%Y-%m-%d") if "expires_at" in users[user] else None
                 access_level = users[user]["access_level"] if "access_level" in users[user] else None
@@ -128,33 +123,23 @@ class MembersProcessor(AbstractProcessor):
                         and access_level == current_member.access_level
                         and member_role_id == member_role_id_before
                     ):
-                        verbose(
-                            "Nothing to change for user '%s' - same config now as to set.",
-                            common_username,
-                        )
-                        verbose(
-                            "Current settings for '%s' are: %s" % (common_username, current_members[common_username])
-                        )
+                        verbose(f"Nothing to change for user '{common_username}' - same config now as to set.")
+                        verbose(f"Current settings for '{common_username}' are: {current_members[common_username]}")
                     else:
                         verbose(
-                            "Editing user '%s' membership to change their access level or expires at",
-                            common_username,
+                            f"Editing user '{common_username}' membership to change their access level or expires at",
                         )
-                        update_data = {
-                            "user_id": common_username,
-                            "access_level": access_level,
-                            "member_role_id": member_role_id_before,
-                        }
 
+                        project_member = project.members.get(id=user_id)
+                        project_member.access_level = access_level
+                        project_member.member_role_id = member_role_id_before
                         if expires_at:
-                            update_data["expires_at"] = expires_at
-
-                        project.members.update(new_data=update_data)
+                            project_member.expires_at = expires_at
+                        project_member.save()
 
                 else:
                     verbose(
-                        "Adding user '%s' who previously was not a member.",
-                        common_username,
+                        f"Adding user '{common_username}' who previously was not a member.",
                     )
                     create_data = {
                         "user_id": user_id,

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/processors/project/schedules_processor.py

@@ -24,7 +24,7 @@ class SchedulesProcessor(AbstractProcessor):
             configured_schedules.pop("enforce")
 
         project: Project = self.gl.get_project_by_path_cached(project_and_group)
-        existing_schedules: List[RESTObject] | RESTObjectList = project.pipelineschedules.list(get_all=True)
+        existing_schedules: list[ProjectPipelineSchedule] = project.pipelineschedules.list(get_all=True)
 
         schedule_ids_by_description: Dict = self._group_schedule_ids_by_description(existing_schedules)
 

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform/processors/util/labels_processor.py

@@ -1,6 +1,7 @@
-from cli_ui import debug as verbose, info
-from typing import Dict, List, Callable
+from cli_ui import debug as verbose, info, warning
+from typing import Dict, List, Callable, Union
 
+from gitlab.base import RESTObjectList, RESTObject
 from gitlab.v4.objects import Group, Project, ProjectLabel, GroupLabel
 
 
@@ -15,7 +16,8 @@ class LabelsProcessor:
         needs_update: Callable,  # self._needs_update passed from AbstractProcessor called process_labels
     ):
         # Only get Labels created directly on the project/group
-        existing_labels = group_or_project.labels.list(get_all=True, include_ancestor_groups=False)
+        existing_group_labels = group_or_project.labels.list(get_all=True, include_ancestor_groups=False)
+        existing_group_and_parent_labels = group_or_project.labels.list(get_all=True)
         existing_label_keys: List = []
 
         if isinstance(group_or_project, Group):
@@ -25,7 +27,7 @@ class LabelsProcessor:
 
         gitlab_labels_to_delete: List = []
 
-        for label_to_update in existing_labels:
+        for label_to_update in existing_group_labels:
             label_name_in_gl = label_to_update.name
             updated_label = False
             verbose(f"Checking if {label_name_in_gl} is in Configuration to update or delete")
@@ -33,9 +35,7 @@ class LabelsProcessor:
             for key, configured_label in configured_labels.items():
                 configured_label_name = configured_label.get("name")
                 # Key in YAML may not match the "name" value in Gitlab or YAML, so we must match on both
-                if (
-                    configured_label_name is not None and label_name_in_gl == configured_label_name
-                ) or label_name_in_gl == key:
+                if self.configured_label_matches_gitlab_label(configured_label_name, key, label_name_in_gl):
                     # label exists in GL, so update
                     existing_label_keys.append(key)
                     updated_label = True
@@ -65,10 +65,19 @@ class LabelsProcessor:
                 self.get_label(group_or_project, label_to_delete).delete()
 
         # add new labels
+
         for label_key in configured_labels.keys():
             if label_key not in existing_label_keys:
                 info(f"Creating new label with key: {label_key}, on {parent_object_type}")
-                self.create_new_label(configured_labels, group_or_project, label_key, parent_object_type)
+                self.create_new_label(
+                    configured_labels, group_or_project, label_key, parent_object_type, existing_group_and_parent_labels
+                )
+
+    @staticmethod
+    def configured_label_matches_gitlab_label(configured_label_name: str, key: str, label_name_in_gl: str):
+        return (
+            configured_label_name is not None and label_name_in_gl == configured_label_name
+        ) or label_name_in_gl == key
 
     @staticmethod
     def get_label(group_or_project, listed_label) -> GroupLabel | ProjectLabel:
@@ -88,13 +97,25 @@ class LabelsProcessor:
 
         full_label.save()
 
-    @staticmethod
     def create_new_label(
+        self,
         configured_labels,
         group_or_project: Group | Project,
-        label_name: str,
+        label_key: str,
         parent_object_type: str,
+        existing_group_and_parent_labels: Union[List[GroupLabel], List[ProjectLabel]],
     ):
-        label = configured_labels.get(label_name)
-        info(f"Adding {label_name} to {parent_object_type}")
-        group_or_project.labels.create({"name": label_name, **label})
+        label = configured_labels.get(label_key)
+        configured_label_name = label.get("name")
+        found_existing_label = False
+        for existing_label in existing_group_and_parent_labels:
+            if self.configured_label_matches_gitlab_label(configured_label_name, label_key, existing_label.name):
+                warning(
+                    f"Label {existing_label.name} already exists either in {group_or_project.name} or on Parent Group, so will not create"
+                )
+                found_existing_label = True
+                break
+
+        if not found_existing_label:
+            info(f"Adding label with key: {label_key} to {parent_object_type}")
+            group_or_project.labels.create({"name": label_key, **label})

{gitlabform-4.2.4 → gitlabform-4.2.6}/gitlabform.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlabform
-Version: 4.2.4
+Version: 4.2.6
 Summary: 🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML
 Author: Greg Dubicki and Contributors
 Project-URL: Homepage, https://gitlabform.github.io/gitlabform/
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Version Control :: Git
 Requires-Python: >=3.12.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: certifi==2025.1.31
+Requires-Dist: certifi==2025.6.15
 Requires-Dist: cli-ui==0.19.0
 Requires-Dist: ez-yaml==1.2.0
 Requires-Dist: Jinja2==3.1.6
@@ -28,23 +28,23 @@ Requires-Dist: luddite==1.0.4
 Requires-Dist: MarkupSafe==3.0.2
 Requires-Dist: mergedeep==1.3.4
 Requires-Dist: packaging==25.0
-Requires-Dist: python-gitlab==5.6.0
-Requires-Dist: python-gitlab[graphql]==5.6.0
-Requires-Dist: requests==2.32.3
+Requires-Dist: python-gitlab==6.1.0
+Requires-Dist: python-gitlab[graphql]==6.1.0
+Requires-Dist: requests==2.32.4
 Requires-Dist: ruamel.yaml==0.17.21
-Requires-Dist: types-requests==2.32.0.20250328
-Requires-Dist: types-setuptools==78.1.0.20250329
+Requires-Dist: types-requests==2.32.4.20250611
+Requires-Dist: types-setuptools==80.9.0.20250529
 Requires-Dist: yamlpath==3.8.2
 Provides-Extra: test
-Requires-Dist: coverage==7.8.0; extra == "test"
-Requires-Dist: cryptography==44.0.2; extra == "test"
-Requires-Dist: deepdiff==8.4.2; extra == "test"
-Requires-Dist: mypy==1.15.0; extra == "test"
-Requires-Dist: mypy-extensions==1.0.0; extra == "test"
+Requires-Dist: coverage==7.9.2; extra == "test"
+Requires-Dist: cryptography==45.0.5; extra == "test"
+Requires-Dist: deepdiff==8.5.0; extra == "test"
+Requires-Dist: mypy==1.16.1; extra == "test"
+Requires-Dist: mypy-extensions==1.1.0; extra == "test"
 Requires-Dist: pre-commit==2.21.0; extra == "test"
-Requires-Dist: pytest==8.3.5; extra == "test"
-Requires-Dist: pytest-cov==6.1.1; extra == "test"
-Requires-Dist: pytest-rerunfailures==15.0; extra == "test"
+Requires-Dist: pytest==8.4.1; extra == "test"
+Requires-Dist: pytest-cov==6.2.1; extra == "test"
+Requires-Dist: pytest-rerunfailures==15.1; extra == "test"
 Requires-Dist: xkcdpass==1.20.0; extra == "test"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"

gitlabform-4.2.6/gitlabform.egg-info/requires.txt

@@ -0,0 +1,31 @@
+certifi==2025.6.15
+cli-ui==0.19.0
+ez-yaml==1.2.0
+Jinja2==3.1.6
+luddite==1.0.4
+MarkupSafe==3.0.2
+mergedeep==1.3.4
+packaging==25.0
+python-gitlab==6.1.0
+python-gitlab[graphql]==6.1.0
+requests==2.32.4
+ruamel.yaml==0.17.21
+types-requests==2.32.4.20250611
+types-setuptools==80.9.0.20250529
+yamlpath==3.8.2
+
+[docs]
+mkdocs
+mkdocs-material
+
+[test]
+coverage==7.9.2
+cryptography==45.0.5
+deepdiff==8.5.0
+mypy==1.16.1
+mypy-extensions==1.1.0
+pre-commit==2.21.0
+pytest==8.4.1
+pytest-cov==6.2.1
+pytest-rerunfailures==15.1
+xkcdpass==1.20.0

{gitlabform-4.2.4 → gitlabform-4.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitlabform"
-version = "4.2.4"
+version = "4.2.6"
 authors = [{ name = "Greg Dubicki and Contributors" }]
 description = "🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML"
 keywords = ["cli", "yaml", "gitlab", "configuration-as-code"]
@@ -23,7 +23,7 @@ classifiers = [
 ]
 requires-python = ">=3.12.0"
 dependencies = [
-    "certifi==2025.1.31",
+    "certifi==2025.6.15",
     "cli-ui==0.19.0",
     "ez-yaml==1.2.0",
     "Jinja2==3.1.6",
@@ -31,12 +31,12 @@ dependencies = [
     "MarkupSafe==3.0.2",
     "mergedeep==1.3.4",
     "packaging==25.0",
-    "python-gitlab==5.6.0",
-    "python-gitlab[graphql]==5.6.0",
-    "requests==2.32.3",
+    "python-gitlab==6.1.0",
+    "python-gitlab[graphql]==6.1.0",
+    "requests==2.32.4",
     "ruamel.yaml==0.17.21",
-    "types-requests==2.32.0.20250328",
-    "types-setuptools==78.1.0.20250329",
+    "types-requests==2.32.4.20250611",
+    "types-setuptools==80.9.0.20250529",
     "yamlpath==3.8.2",
 ]
 
@@ -52,15 +52,15 @@ content-type = "text/markdown"
 
 [project.optional-dependencies]
 test = [
-    "coverage==7.8.0",
-    "cryptography==44.0.2",
-    "deepdiff==8.4.2",
-    "mypy==1.15.0",
-    "mypy-extensions==1.0.0",
+    "coverage==7.9.2",
+    "cryptography==45.0.5",
+    "deepdiff==8.5.0",
+    "mypy==1.16.1",
+    "mypy-extensions==1.1.0",
     "pre-commit==2.21.0",
-    "pytest==8.3.5",
-    "pytest-cov==6.1.1",
-    "pytest-rerunfailures==15.0",
+    "pytest==8.4.1",
+    "pytest-cov==6.2.1",
+    "pytest-rerunfailures==15.1",
     "xkcdpass==1.20.0",
 ]
 docs = ["mkdocs", "mkdocs-material"]

gitlabform-4.2.4/gitlabform.egg-info/requires.txt

@@ -1,31 +0,0 @@
-certifi==2025.1.31
-cli-ui==0.19.0
-ez-yaml==1.2.0
-Jinja2==3.1.6
-luddite==1.0.4
-MarkupSafe==3.0.2
-mergedeep==1.3.4
-packaging==25.0
-python-gitlab==5.6.0
-python-gitlab[graphql]==5.6.0
-requests==2.32.3
-ruamel.yaml==0.17.21
-types-requests==2.32.0.20250328
-types-setuptools==78.1.0.20250329
-yamlpath==3.8.2
-
-[docs]
-mkdocs
-mkdocs-material
-
-[test]
-coverage==7.8.0
-cryptography==44.0.2
-deepdiff==8.4.2
-mypy==1.15.0
-mypy-extensions==1.0.0
-pre-commit==2.21.0
-pytest==8.3.5
-pytest-cov==6.1.1
-pytest-rerunfailures==15.0
-xkcdpass==1.20.0