gitlabform 4.1.2__tar.gz → 4.2.0__tar.gz

{gitlabform-4.1.2 → gitlabform-4.2.0}/PKG-INFO

@@ -1,9 +1,12 @@
 Metadata-Version: 2.2
 Name: gitlabform
-Version: 4.1.2
+Version: 4.2.0
 Summary: 🏗 Specialized configuration as a code tool for GitLab projects, groups and more using hierarchical configuration written in YAML
-Home-page: https://gitlabform.github.io/gitlabform
 Author: Greg Dubicki and Contributors
+Project-URL: Homepage, https://gitlabform.github.io/gitlabform/
+Project-URL: Repository, https://github.com/gitlabform/gitlabform.git
+Project-URL: Issues, https://github.com/gitlabform/gitlabform/issues
+Project-URL: Changelog, https://gitlabform.github.io/gitlabform/changelog/
 Keywords: cli,yaml,gitlab,configuration-as-code
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 5 - Production/Stable
@@ -29,33 +32,23 @@ Requires-Dist: python-gitlab==5.6.0
 Requires-Dist: python-gitlab[graphql]==5.6.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: ruamel.yaml==0.17.21
-Requires-Dist: types-requests==2.32.0.20241016
-Requires-Dist: types-setuptools==75.8.0.20250110
+Requires-Dist: types-requests==2.32.0.20250301
+Requires-Dist: types-setuptools==75.8.2.20250301
 Requires-Dist: yamlpath==3.8.2
 Provides-Extra: test
-Requires-Dist: coverage==7.6.10; extra == "test"
-Requires-Dist: cryptography==44.0.0; extra == "test"
-Requires-Dist: deepdiff==8.1.1; extra == "test"
-Requires-Dist: mypy==1.14.1; extra == "test"
+Requires-Dist: coverage==7.6.12; extra == "test"
+Requires-Dist: cryptography==44.0.2; extra == "test"
+Requires-Dist: deepdiff==8.2.0; extra == "test"
+Requires-Dist: mypy==1.15.0; extra == "test"
 Requires-Dist: mypy-extensions==1.0.0; extra == "test"
 Requires-Dist: pre-commit==2.21.0; extra == "test"
-Requires-Dist: pytest==8.3.4; extra == "test"
+Requires-Dist: pytest==8.3.5; extra == "test"
 Requires-Dist: pytest-cov==6.0.0; extra == "test"
 Requires-Dist: pytest-rerunfailures==15.0; extra == "test"
 Requires-Dist: xkcdpass==1.19.9; extra == "test"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
-Dynamic: author
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 [![version](https://badge.fury.io/gh/gitlabform%2Fgitlabform.svg)](https://badge.fury.io/gh/gitlabform%2Fgitlabform)
 ![release date](https://img.shields.io/github/release-date/gitlabform/gitlabform)

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/__init__.py

@@ -114,15 +114,9 @@ class GitLabForm:
 
         self.gitlab, self.configuration = self._initialize_configuration_and_gitlab()
 
-        self.application_processors = ApplicationProcessors(
-            self.gitlab, self.configuration, self.strict
-        )
-        self.group_processors = GroupProcessors(
-            self.gitlab, self.configuration, self.strict
-        )
-        self.project_processors = ProjectProcessors(
-            self.gitlab, self.configuration, self.strict
-        )
+        self.application_processors = ApplicationProcessors(self.gitlab, self.configuration, self.strict)
+        self.group_processors = GroupProcessors(self.gitlab, self.configuration, self.strict)
+        self.project_processors = ProjectProcessors(self.gitlab, self.configuration, self.strict)
         self.groups_provider = GroupsProvider(
             self.gitlab,
             self.configuration,
@@ -186,15 +180,11 @@ class GitLabForm:
             help="Skips checking if the latest version is used",
         )
 
-        parser.add_argument(
-            "-c", "--config", default="config.yml", help="config file path and filename"
-        )
+        parser.add_argument("-c", "--config", default="config.yml", help="config file path and filename")
 
         verbosity_args = parser.add_mutually_exclusive_group()
 
-        verbosity_args.add_argument(
-            "-v", "--verbose", action="store_true", help="verbose output"
-        )
+        verbosity_args.add_argument("-v", "--verbose", action="store_true", help="verbose output")
 
         verbosity_args.add_argument(
             "-d",
@@ -428,9 +418,7 @@ class GitLabForm:
                 )
                 continue
 
-            group_configuration = self.configuration.get_effective_config_for_group(
-                group
-            )
+            group_configuration = self.configuration.get_effective_config_for_group(group)
 
             effective_configuration.add_placeholder(group)
 
@@ -457,9 +445,7 @@ class GitLabForm:
                 failed_groups[group_number] = group
 
                 trace = traceback.format_exc()
-                message = (
-                    f"Error occurred while processing group {group}, exception:\n\n{e}"
-                )
+                message = f"Error occurred while processing group {group}, exception:\n\n{e}"
 
                 if self.terminate_after_error:
                     effective_configuration.write_to_file()
@@ -470,9 +456,7 @@ class GitLabForm:
                     warning(message)
                     debug(trace)
             finally:
-                debug(
-                    f"@ ({group_number}/{len(groups)}) FINISHED Processing group: {group}"
-                )
+                debug(f"@ ({group_number}/{len(groups)}) FINISHED Processing group: {group}")
 
         project_number = 0
         successful_projects = 0
@@ -492,9 +476,7 @@ class GitLabForm:
                 )
                 continue
 
-            project_configuration = self.configuration.get_effective_config_for_project(
-                project_and_group
-            )
+            project_configuration = self.configuration.get_effective_config_for_project(project_and_group)
 
             effective_configuration.add_placeholder(project_and_group)
 
@@ -519,9 +501,7 @@ class GitLabForm:
 
             except Exception as e:
                 if "Non GET methods are not allowed for moved projects" in str(e):
-                    info(
-                        "Project has been transferred, no need to process original location"
-                    )
+                    info("Project has been transferred, no need to process original location")
                     continue
 
                 failed_projects[project_number] = project_and_group
@@ -539,8 +519,7 @@ class GitLabForm:
                     debug(trace)
             finally:
                 debug(
-                    f"* ({project_number}/{len(projects)})"
-                    f" FINISHED Processing project: {project_and_group}",
+                    f"* ({project_number}/{len(projects)})" f" FINISHED Processing project: {project_and_group}",
                 )
 
         effective_configuration.write_to_file()
@@ -618,9 +597,7 @@ class GitLabForm:
             info("Running in dry-run mode...")
 
         if target == "ALL":
-            info(
-                ">>> Getting ALL groups and projects that I have permission to modify..."
-            )
+            info(">>> Getting ALL groups and projects that I have permission to modify...")
         elif target == "ALL_DEFINED":
             info(">>> Getting ALL groups and projects DEFINED in the configuration...")
         else:
@@ -633,9 +610,7 @@ class GitLabForm:
             if target == "ALL":
                 error_message = "GitLab has no projects and groups!"
             elif target == "ALL_DEFINED":
-                error_message = (
-                    "Configuration does not have any groups or projects defined!"
-                )
+                error_message = "Configuration does not have any groups or projects defined!"
             else:
                 error_message = f"Project or group {target} cannot be found in GitLab!"
             fatal(
@@ -668,9 +643,7 @@ class GitLabForm:
                 if len(entities.omitted[reason]) > 0:
                     if not first:
                         entities_omitted += ","
-                    entities_omitted += (
-                        f" {reason.value}: {len(entities.omitted[reason])}"
-                    )
+                    entities_omitted += f" {reason.value}: {len(entities.omitted[reason])}"
                     entities_verbose += f"\nomitted {entities.name} - {reason.value}: {entities.get_omitted(reason)}"
                     first = False
             entities_omitted += ")"
@@ -733,21 +706,15 @@ class GitLabForm:
             # fmt: on
 
     @classmethod
-    def _info_group_count(
-        cls, prefix, i: int, n: int, *rest: Token, **kwargs: Any
-    ) -> None:
+    def _info_group_count(cls, prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> None:
         cls._info_count(purple, prefix, i, n, *rest, **kwargs)
 
     @classmethod
-    def _info_project_count(
-        cls, prefix, i: int, n: int, *rest: Token, **kwargs: Any
-    ) -> None:
+    def _info_project_count(cls, prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> None:
         cls._info_count(green, prefix, i, n, *rest, **kwargs)
 
     @classmethod
-    def _info_count(
-        cls, color, prefix, i: int, n: int, *rest: Token, **kwargs: Any
-    ) -> None:
+    def _info_count(cls, color, prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> None:
         num_digits = len(str(n))
         counter_format = f"(%{num_digits}d/%d)"
         counter_str = counter_format % (i, n)

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/configuration/core.py

@@ -101,9 +101,7 @@ class ConfigurationCore(ABC):
         if config_string:
             config = textwrap.dedent(source)
             verbose("Reading config from the provided string.")
-            (yaml_data, doc_loaded) = Parsers.get_yaml_data(
-                yaml, log, config, literal=True
-            )
+            (yaml_data, doc_loaded) = Parsers.get_yaml_data(yaml, log, config, literal=True)
         else:
             config_path = source
             verbose(f"Reading config from file: {config_path}")
@@ -157,23 +155,17 @@ class ConfigurationCore(ABC):
         return to_return
 
     @staticmethod
-    def _validate_break_inheritance_flag(
-        config: dict, section_name: str, parent_key: str = ""
-    ) -> None:
+    def _validate_break_inheritance_flag(config: dict, section_name: str, parent_key: str = "") -> None:
         for key, value in config.items():
             if "inherit" == key:
-                parent_key_description = (
-                    ' under key "' + parent_key + '"' if parent_key else ""
-                )
+                parent_key_description = ' under key "' + parent_key + '"' if parent_key else ""
                 fatal(
                     f'The inheritance-break flag set in "{section_name}"{parent_key_description} is invalid\n'
                     f"because it has no higher level setting to inherit from.\n",
                     exit_code=EXIT_INVALID_INPUT,
                 )
             elif type(value) in [CommentedMap, dict]:
-                ConfigurationCore._validate_break_inheritance_flag(
-                    value, section_name, key
-                )
+                ConfigurationCore._validate_break_inheritance_flag(value, section_name, key)
 
     @staticmethod
     def _merge_configs(more_general_config, more_specific_config) -> dict:
@@ -191,9 +183,7 @@ class ConfigurationCore(ABC):
             for key, value in specific_config.items():
                 if "inherit" == key:
                     if not value:
-                        replace_config_sections(
-                            merged_dict, parent_key, specific_config
-                        )
+                        replace_config_sections(merged_dict, parent_key, specific_config)
                         break
                     elif value:
                         fatal(

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/configuration/groups.py

@@ -88,9 +88,7 @@ class ConfigurationGroups(ConfigurationCommon, ABC):
         for element in elements:
             if not last_element:
                 effective_config = self._get_group_config(element)
-                debug(
-                    "First level config for '%s': %s", element, to_str(effective_config)
-                )
+                debug("First level config for '%s': %s", element, to_str(effective_config))
                 last_element = element
             else:
                 next_level_subgroup = last_element + "/" + element
@@ -104,9 +102,7 @@ class ConfigurationGroups(ConfigurationCommon, ABC):
                 if effective_config:
                     self._validate_break_inheritance_flag(effective_config, subgroup)
                 elif not effective_config and next_level_subgroup_config:
-                    self._validate_break_inheritance_flag(
-                        next_level_subgroup_config, next_level_subgroup
-                    )
+                    self._validate_break_inheritance_flag(next_level_subgroup_config, next_level_subgroup)
 
                 effective_config = self._merge_configs(
                     effective_config,
@@ -128,6 +124,4 @@ class ConfigurationGroups(ConfigurationCommon, ABC):
         :return: configuration for this group/subgroup or empty dict if not defined,
                  ignoring the case
         """
-        return self._get_case_insensitively(
-            self.get("projects_and_groups"), f"{group}/*"
-        )
+        return self._get_case_insensitively(self.get("projects_and_groups"), f"{group}/*")

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/configuration/projects.py

@@ -31,9 +31,7 @@ class ConfigurationProjects(ConfigurationGroups, ABC):
         :return: if project is defined in the key with projects to skip,
                  ignoring the case
         """
-        return self._is_skipped_case_insensitively(
-            self.get("skip_projects", []), project
-        )
+        return self._is_skipped_case_insensitively(self.get("skip_projects", []), project)
 
     @functools.lru_cache()
     def get_effective_config_for_project(self, group_and_project) -> dict:
@@ -72,6 +70,4 @@ class ConfigurationProjects(ConfigurationGroups, ABC):
         :return: configuration for this project or empty dict if not defined,
                  ignoring the case
         """
-        return self._get_case_insensitively(
-            self.get("projects_and_groups"), group_and_project
-        )
+        return self._get_case_insensitively(self.get("projects_and_groups"), group_and_project)

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/configuration/transform.py

@@ -26,9 +26,7 @@ from gitlabform.gitlab import GitLab
 
 class ConfigurationTransformers:
     def __init__(self, gitlab: GitLab):
-        self.merge_request_approvals_transformer = MergeRequestApprovalsTransformer(
-            gitlab
-        )
+        self.merge_request_approvals_transformer = MergeRequestApprovalsTransformer(gitlab)
         self.user_transformer = UserTransformer(gitlab)
         self.group_transformer = GroupTransformer(gitlab)
         self.implicit_name_transformer = ImplicitNameTransformer(gitlab)
@@ -94,9 +92,7 @@ class UserTransformer(ConfigurationTransformer):
             # under the given path
             pass
 
-        verbose(
-            "Getting user ids for users defined in merge_requests_approval_rules config"
-        )
+        verbose("Getting user ids for users defined in merge_requests_approval_rules config")
         try:
             for node_coordinate in processor.get_nodes(
                 "**.merge_requests_approval_rules.*.users",
@@ -184,9 +180,7 @@ class ImplicitNameTransformer(ConfigurationTransformer):
                 if type(node_coordinate.node) not in [CommentedMap, dict]:
                     continue
 
-                node_coordinate.parent[node_coordinate.parentref][
-                    "name"
-                ] = node_coordinate.parentref
+                node_coordinate.parent[node_coordinate.parentref]["name"] = node_coordinate.parentref
         except YAMLPathException:
             # this just means that we haven't found any keys in YAML
             # under the given path
@@ -228,9 +222,7 @@ class AccessLevelsTransformer(ConfigurationTransformer):
                 for node_coordinate in processor.get_nodes(path, mustexist=True):
                     try:
                         access_level_string = str(node_coordinate.node)
-                        node_coordinate.parent[node_coordinate.parentref] = (
-                            AccessLevel.get_value(access_level_string)
-                        )
+                        node_coordinate.parent[node_coordinate.parentref] = AccessLevel.get_value(access_level_string)
                     except KeyError:
                         fatal(
                             f"Configuration string '{access_level_string}' is not one of the valid access levels:"
@@ -258,8 +250,8 @@ class AccessLevelsTransformer(ConfigurationTransformer):
                     if node_coordinate.parentref == "access_level":
                         try:
                             access_level_string = str(node_coordinate.node)
-                            node_coordinate.parent[node_coordinate.parentref] = (
-                                AccessLevel.get_value(access_level_string)
+                            node_coordinate.parent[node_coordinate.parentref] = AccessLevel.get_value(
+                                access_level_string
                             )
                         except KeyError:
                             fatal(
@@ -308,24 +300,16 @@ class MergeRequestApprovalsTransformer(ConfigurationTransformer):
                     if "approvals_before_merge" in old_syntax["approvals"]:
                         # this setting is now moved inside the approval rules, so remove it from here
                         # but store it for adding there
-                        approvals_required = old_syntax["approvals"][
-                            "approvals_before_merge"
-                        ]
+                        approvals_required = old_syntax["approvals"]["approvals_before_merge"]
                         approvals_required_guessed = False
                         old_syntax["approvals"].pop("approvals_before_merge")
 
                     if old_syntax["approvals"]:
                         # add the settings, if there are left any after removing 'approvals_before_merge'
-                        where_to_add_new_syntax["merge_requests_approvals"] = (
-                            old_syntax["approvals"]
-                        )
+                        where_to_add_new_syntax["merge_requests_approvals"] = old_syntax["approvals"]
 
                 # approval rules
-                if (
-                    "approvers" in old_syntax
-                    or "approver_groups" in old_syntax
-                    or not approvals_required_guessed
-                ):
+                if "approvers" in old_syntax or "approver_groups" in old_syntax or not approvals_required_guessed:
                     old_syntax_found = True
 
                     where_to_add_new_syntax["merge_requests_approval_rules"] = {
@@ -336,22 +320,17 @@ class MergeRequestApprovalsTransformer(ConfigurationTransformer):
                     }
 
                     if "approvers" in old_syntax:
-                        where_to_add_new_syntax["merge_requests_approval_rules"][
-                            "legacy"
-                        ]["users"] = old_syntax["approvers"]
+                        where_to_add_new_syntax["merge_requests_approval_rules"]["legacy"]["users"] = old_syntax[
+                            "approvers"
+                        ]
                     if "approver_groups" in old_syntax:
-                        where_to_add_new_syntax["merge_requests_approval_rules"][
-                            "legacy"
-                        ]["groups"] = old_syntax["approver_groups"]
-
-                    if (
-                        "remove_other_approval_rules" in old_syntax
-                        and old_syntax["remove_other_approval_rules"]
-                    ):
+                        where_to_add_new_syntax["merge_requests_approval_rules"]["legacy"]["groups"] = old_syntax[
+                            "approver_groups"
+                        ]
+
+                    if "remove_other_approval_rules" in old_syntax and old_syntax["remove_other_approval_rules"]:
                         old_syntax_found = True
-                        where_to_add_new_syntax["merge_requests_approval_rules"][
-                            "enforce"
-                        ] = True
+                        where_to_add_new_syntax["merge_requests_approval_rules"]["enforce"] = True
 
                 if old_syntax_found:
                     where_to_add_new_syntax.pop("merge_requests")

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/gitlab/__init__.py

@@ -20,6 +20,7 @@ from gitlabform.gitlab.project_merge_requests_approvals import (
 )
 from gitlabform.gitlab.python_gitlab import PythonGitlab
 from gitlabform.gitlab.variables import GitLabVariables
+from gitlabform.gitlab.project_security_settings import GitlabProjectSecuritySettings
 
 
 @enum.unique
@@ -59,6 +60,7 @@ class GitLab(
     GitLabProjectProtectedEnvironments,
     GitLabProjectMergeRequestsApprovals,
     GitLabVariables,
+    GitlabProjectSecuritySettings,
 ):
     pass
 

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/gitlab/commits.py

@@ -3,13 +3,9 @@ from gitlabform.gitlab.core import GitLabCore
 
 class GitLabCommits(GitLabCore):
     def get_commit(self, project_and_group_name, sha):
-        return self._make_requests_to_api(
-            "projects/%s/repository/commits/%s", (project_and_group_name, sha)
-        )
+        return self._make_requests_to_api("projects/%s/repository/commits/%s", (project_and_group_name, sha))
 
-    def get_ahead_and_behind(
-        self, project_and_group_name, protected_branch, feature_branch
-    ):
+    def get_ahead_and_behind(self, project_and_group_name, protected_branch, feature_branch):
         ahead = 0
         behind = 0
 
@@ -30,9 +26,7 @@ class GitLabCommits(GitLabCore):
         return ahead, behind
 
     def get_last_commit(self, project_and_group_name, branch_name):
-        branch = self._make_requests_to_api(
-            "projects/%s/repository/branches/%s", (project_and_group_name, branch_name)
-        )
+        branch = self._make_requests_to_api("projects/%s/repository/branches/%s", (project_and_group_name, branch_name))
         last_commit_hash = branch["commit"]["id"]
         return self.get_commit(project_and_group_name, last_commit_hash)
 

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/gitlab/core.py

@@ -54,9 +54,7 @@ class GitLabCore:
 
         try:
             version = self._make_requests_to_api("version")
-            verbose(
-                f"Connected to GitLab version: {version['version']} ({version['revision']})"
-            )
+            verbose(f"Connected to GitLab version: {version['version']} ({version['revision']})")
             self.version = version["version"]
 
             current_user = self._make_requests_to_api("user")
@@ -64,9 +62,7 @@ class GitLabCore:
                 self.admin = True
             else:
                 self.admin = False
-            verbose(
-                f"Connected as: {current_user['username']}, admin: {'yes' if self.admin else 'no'}"
-            )
+            verbose(f"Connected as: {current_user['username']}, admin: {'yes' if self.admin else 'no'}")
             if not self.admin:
                 warning("Connected as non-admin. You may encounter permission issues.")
 
@@ -87,9 +83,7 @@ class GitLabCore:
         # also it's not possible to get more than 1 user as a result
 
         if len(users) == 0:
-            raise NotFoundException(
-                "No users found when searching for username '%s'" % username
-            )
+            raise NotFoundException("No users found when searching for username '%s'" % username)
 
         return int(users[0]["id"])
 
@@ -100,9 +94,7 @@ class GitLabCore:
 
     @functools.lru_cache()
     def _get_protected_branch_id(self, project_and_group_name, branch) -> int:
-        branch = self._make_requests_to_api(
-            "projects/%s/protected_branches/%s", (project_and_group_name, branch)
-        )
+        branch = self._make_requests_to_api("projects/%s/protected_branches/%s", (project_and_group_name, branch))
         return int(branch["id"])
 
     @functools.lru_cache()
@@ -139,9 +131,7 @@ class GitLabCore:
                  objects.
         """
         if method != "GET":
-            response = self._make_request_to_api(
-                path_as_format_string, args, method, data, expected_codes, json
-            )
+            response = self._make_request_to_api(path_as_format_string, args, method, data, expected_codes, json)
             return response.json()
         else:
             if "?" in path_as_format_string:
@@ -149,9 +139,7 @@ class GitLabCore:
             else:
                 path_as_format_string += "?per_page=100"
 
-            first_response = self._make_request_to_api(
-                path_as_format_string, args, method, data, expected_codes, json
-            )
+            first_response = self._make_request_to_api(path_as_format_string, args, method, data, expected_codes, json)
             results = first_response.json()
 
             # In newer versions of GitLab the 'x-total-pages' may not be available
@@ -160,10 +148,7 @@ class GitLabCore:
 
             response = first_response
             while True:
-                if (
-                    "x-next-page" in response.headers
-                    and response.headers["x-next-page"]
-                ):
+                if "x-next-page" in response.headers and response.headers["x-next-page"]:
                     next_page = response.headers["x-next-page"]
                     response = self._make_request_to_api(
                         path_as_format_string + "&page=" + str(next_page),
@@ -179,9 +164,7 @@ class GitLabCore:
 
         return results
 
-    def _make_request_to_api(
-        self, path_as_format_string, args, method, dict_data, expected_codes, json_data
-    ):
+    def _make_request_to_api(self, path_as_format_string, args, method, dict_data, expected_codes, json_data):
         """
         Makes a single request to the GitLab API. Takes care of the authentication, basic error processing,
         retries, timeout etc.
@@ -193,20 +176,14 @@ class GitLabCore:
         expected_codes = self._listify(expected_codes)
 
         if dict_data and json_data:
-            raise Exception(
-                "You need to pass the data either as dict (dict_data) or JSON (json_data), not both!"
-            )
+            raise Exception("You need to pass the data either as dict (dict_data) or JSON (json_data), not both!")
 
         url = f"{self.url}/api/v4/{self._format_with_url_encoding(path_as_format_string, args)}"
         if dict_data:
-            response = self.session.request(
-                method, url, data=dict_data, timeout=self.timeout
-            )
+            response = self.session.request(method, url, data=dict_data, timeout=self.timeout)
             debug(f"===> data = {to_str(dict_data)}")
         elif json_data:
-            response = self.session.request(
-                method, url, json=json_data, timeout=self.timeout
-            )
+            response = self.session.request(method, url, json=json_data, timeout=self.timeout)
             debug(f"===> json = {to_str(json_data)}")
         else:
             response = self.session.request(method, url, timeout=self.timeout)
@@ -218,9 +195,7 @@ class GitLabCore:
                 response.json = lambda: {}
         else:
             if response.status_code == 404:
-                raise NotFoundException(
-                    f"Resource with url='{url}' not found (HTTP 404)!"
-                )
+                raise NotFoundException(f"Resource with url='{url}' not found (HTTP 404)!")
             else:
                 if dict_data:
                     data_output = f"data='{to_str(dict_data)}' "

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/gitlab/group_ldap_links.py

@@ -5,9 +5,7 @@ from gitlabform.gitlab.groups import GitLabGroups
 class GitLabGroupLDAPLinks(GitLabGroups):
     def get_ldap_group_links(self, group):
         group_id = self.get_group_id_case_insensitive(group)
-        return self._make_requests_to_api(
-            "groups/%s/ldap_group_links", group_id, expected_codes=[200, 404]
-        )
+        return self._make_requests_to_api("groups/%s/ldap_group_links", group_id, expected_codes=[200, 404])
 
     def add_ldap_group_link(self, group, data):
         group_id = self.get_group_id_case_insensitive(group)
@@ -23,9 +21,7 @@ class GitLabGroupLDAPLinks(GitLabGroups):
             )
         # this is a GitLab API bug - it returns 404 here instead of 400 for bad requests...
         except NotFoundException:
-            raise InvalidParametersException(
-                f"Invalid parameters for a Group LDAP link for group {group}: {data}"
-            )
+            raise InvalidParametersException(f"Invalid parameters for a Group LDAP link for group {group}: {data}")
 
     def delete_ldap_group_link(self, group, data):
         if "group_access" in data:

{gitlabform-4.1.2 → gitlabform-4.2.0}/gitlabform/gitlab/group_variables.py

@@ -20,9 +20,7 @@ class GitLabGroupVariables(GitLabCore):
         # workaround for the GitLab bug
         variable = {k: to_string(v) for k, v in variable.items()}
 
-        self._make_requests_to_api(
-            "groups/%s/variables", group, "POST", variable, expected_codes=201
-        )
+        self._make_requests_to_api("groups/%s/variables", group, "POST", variable, expected_codes=201)
 
     def delete_group_variable(self, group, variable_object):
         self._make_requests_to_api(
@@ -47,11 +45,7 @@ class GitLabGroupVariables(GitLabCore):
         )
 
     def get_group_variable(self, group, variable_key):
-        return self._make_requests_to_api(
-            "groups/%s/variables/%s", (group, variable_key)
-        )["value"]
+        return self._make_requests_to_api("groups/%s/variables/%s", (group, variable_key))["value"]
 
     def get_group_variable_object(self, group, variable_key):
-        return self._make_requests_to_api(
-            "groups/%s/variables/%s", (group, variable_key)
-        )
+        return self._make_requests_to_api("groups/%s/variables/%s", (group, variable_key))