gitlabform 5.1.1__tar.gz → 5.3.0__tar.gz

{gitlabform-5.1.1 → gitlabform-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlabform
-Version: 5.1.1
+Version: 5.3.0
 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/
@@ -21,8 +21,6 @@ Requires-Python: >=3.12.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi==2026.2.25
-Requires-Dist: cli-ui==0.19.0
-Requires-Dist: ez-yaml==1.2.0
 Requires-Dist: Jinja2==3.1.6
 Requires-Dist: luddite==1.0.4
 Requires-Dist: MarkupSafe==3.0.3
@@ -31,19 +29,21 @@ Requires-Dist: packaging==26.0
 Requires-Dist: python-gitlab==8.2.0
 Requires-Dist: python-gitlab[graphql]==8.2.0
 Requires-Dist: requests==2.33.1
+Requires-Dist: rich==15.0.0
 Requires-Dist: ruamel.yaml==0.17.21
 Requires-Dist: yamlpath==3.8.2
+Requires-Dist: ez-yaml==1.2.0
 Provides-Extra: test
 Requires-Dist: coverage==7.13.5; extra == "test"
-Requires-Dist: cryptography==46.0.6; extra == "test"
+Requires-Dist: cryptography==46.0.7; extra == "test"
 Requires-Dist: deepdiff==9.0.0; extra == "test"
-Requires-Dist: mypy==1.20.0; extra == "test"
+Requires-Dist: mypy==1.20.1; extra == "test"
 Requires-Dist: mypy-extensions==1.1.0; extra == "test"
 Requires-Dist: pre-commit==2.21.0; extra == "test"
-Requires-Dist: pytest==9.0.2; extra == "test"
+Requires-Dist: pytest==9.0.3; extra == "test"
 Requires-Dist: pytest-cov==7.1.0; extra == "test"
 Requires-Dist: pytest-rerunfailures==16.1; extra == "test"
-Requires-Dist: types-requests==2.33.0.20260402; extra == "test"
+Requires-Dist: types-requests==2.33.0.20260408; extra == "test"
 Requires-Dist: types-setuptools==82.0.0.20260402; extra == "test"
 Requires-Dist: xkcdpass==1.30.0; extra == "test"
 Provides-Extra: docs

{gitlabform-5.1.1 → gitlabform-5.3.0}/gitlabform/__init__.py

@@ -1,30 +1,17 @@
 import sys
-from logging import debug
+from logging import debug, critical, error, warning, info
+
+# Use Rich to make logs have a colorized and formatted output
+from rich.logging import RichHandler
+from rich.console import Console
 
 import argparse
-import cli_ui
 import logging
 import luddite
 from importlib.metadata import version as package_version
 import textwrap
 import traceback
-from cli_ui import (
-    Symbol,
-    reset,
-    blue,
-    message,
-    error,
-    info,
-    fatal,
-    info_1,
-    debug as verbose,
-    red,
-    green,
-    yellow,
-    Token,
-    purple,
-    warning,
-)
+
 from packaging import version
 from typing import Any, Tuple
 
@@ -46,11 +33,14 @@ from gitlabform.processors.application import ApplicationProcessors
 from gitlabform.processors.group import GroupProcessors
 from gitlabform.processors.project import ProjectProcessors
 
+console = Console()
+
 
 class GitLabForm:
     def __init__(
         self,
         include_archived_projects=True,
+        include_projects_scheduled_for_deletion=True,
         target=None,
         config_string=None,
         noop=False,
@@ -72,6 +62,7 @@ class GitLabForm:
             self.output_file = output_file
             self.skip_version_check = True
             self.include_archived_projects = include_archived_projects
+            self.include_projects_scheduled_for_deletion = include_projects_scheduled_for_deletion
             self.just_show_version = False
             self.terminate_after_error = True
             self.only_sections = "all"
@@ -95,6 +86,7 @@ class GitLabForm:
                 self.output_file,
                 self.skip_version_check,
                 self.include_archived_projects,
+                self.include_projects_scheduled_for_deletion,
                 self.just_show_version,
                 self.terminate_after_error,
                 self.only_sections,
@@ -109,10 +101,8 @@ class GitLabForm:
                 sys.exit(0)
 
             if not self.target:
-                fatal(
-                    "target parameter is required.",
-                    exit_code=EXIT_INVALID_INPUT,
-                )
+                critical("target parameter is required.")
+                sys.exit(EXIT_INVALID_INPUT)
 
         self.gitlab, self.configuration = self._initialize_configuration_and_gitlab()
 
@@ -128,6 +118,7 @@ class GitLabForm:
             self.gitlab,
             self.configuration,
             self.include_archived_projects,
+            self.include_projects_scheduled_for_deletion,
             self.recurse_subgroups,
         )
 
@@ -236,6 +227,13 @@ class GitLabForm:
             help="Includes processing projects that are archived",
         )
 
+        parser.add_argument(
+            "--include-projects-scheduled-for-deletion",
+            dest="include_projects_scheduled_for_deletion",
+            action="store_true",
+            help="Includes processing projects that are scheduled for deletion",
+        )
+
         parser.add_argument(
             "-t",
             "--terminate",
@@ -317,6 +315,7 @@ class GitLabForm:
             args.output_file,
             args.skip_version_check,
             args.include_archived_projects,
+            args.include_projects_scheduled_for_deletion,
             args.just_show_version,
             args.terminate_after_error,
             args.only_sections,
@@ -326,37 +325,26 @@ class GitLabForm:
 
     def _configure_output(self, tests=False) -> None:
         """
-        Configures the application output using cli_ui and logging, based on debug and verbose flags:
+        Configures the application output using logging, based on debug and verbose flags:
 
-        * normal mode - print cli_ui.* except debug as verbose
-        * verbose mode - print all cli_ui.*, including debug as verbose
-        * debug / tests mode - like above + (logging.)debug
+        * normal mode - logging only WARNING logs
+        * verbose mode - logging INFO level and above
+        * debug / tests mode - logging DEBUG level and above, along with rich exception tracebacks (may expose secrets)
 
         :param tests: True if we are running in tests mode
         """
-
-        logging.basicConfig()
-
-        if self.debug or tests:
-            # debug / tests
-            cli_ui_verbose = True
+        rich_tracebacks = False
+        if tests or self.debug:
             level = logging.DEBUG
+            rich_tracebacks = True
         elif self.verbose:
-            # verbose
-            cli_ui_verbose = True
-            # de facto disabled as we don't use logging different from debug in this project
-            level = logging.FATAL
+            level = logging.INFO
         else:
-            # normal
-            cli_ui_verbose = False
-            # de facto disabled as we don't use logging different from debug in this project
-            level = logging.FATAL
-
-        cli_ui.setup(verbose=cli_ui_verbose)
-        logging.getLogger().setLevel(level)
+            level = logging.WARNING
 
-        fmt = logging.Formatter("%(message)s")
-        logging.getLogger().handlers[0].setFormatter(fmt)
+        logging.basicConfig(
+            level=level, format="%(message)s", datefmt="[%X]", handlers=[RichHandler(rich_tracebacks=rich_tracebacks)]
+        )
 
     def _initialize_configuration_and_gitlab(self) -> Tuple[GitLab, Configuration]:
         """
@@ -378,20 +366,14 @@ class GitLabForm:
             configuration_transformers.transform(configuration)
 
         except ConfigFileNotFoundException as e:
-            fatal(
-                f"Config file not found at: {e}",
-                exit_code=EXIT_INVALID_INPUT,
-            )
+            critical(f"Config file not found at: {e}")
+            sys.exit(EXIT_INVALID_INPUT)
         except ConfigInvalidException as e:
-            fatal(
-                f"Invalid config:\n{e.underlying}",
-                exit_code=EXIT_INVALID_INPUT,
-            )
+            critical(f"Invalid config:\n{e.underlying}")
+            sys.exit(EXIT_INVALID_INPUT)
         except TestRequestFailedException as e:
-            fatal(
-                f"GitLab test request failed:\n{e.underlying}",
-                exit_code=EXIT_PROCESSING_ERROR,
-            )
+            critical(f"GitLab test request failed:\n{e.underlying}")
+            sys.exit(EXIT_INVALID_INPUT)
 
         return gitlab, configuration
 
@@ -430,9 +412,8 @@ class GitLabForm:
                     "@",
                     group_number,
                     len(groups),
-                    yellow,
+                    "yellow",
                     f"Skipping group {group} as requested to start from {self.start_from_group}...",
-                    reset,
                 )
                 continue
 
@@ -444,6 +425,7 @@ class GitLabForm:
                 "@",
                 group_number,
                 len(groups),
+                "black",
                 f"Processing group: {group}",
             )
 
@@ -489,9 +471,8 @@ class GitLabForm:
                     "*",
                     project_number,
                     len(projects),
-                    yellow,
+                    "yellow",
                     f"Skipping project {project_and_group} as requested to start from {self.start_from}...",
-                    reset,
                 )
                 continue
 
@@ -503,6 +484,7 @@ class GitLabForm:
                 "*",
                 project_number,
                 len(projects),
+                "black",
                 f"Processing project: {project_and_group}",
             )
 
@@ -564,15 +546,15 @@ class GitLabForm:
 
         local_version = package_version("gitlabform")
 
-        # fmt: off
-        tower_crane = Symbol("🏗", "")
-        to_show = [reset, tower_crane, "GitLabForm version:", blue, local_version, reset]
-        # fmt: on
-        message(*to_show, sep=" ", end="")
+        version_text = ""
+        # Legacy windows console  cannot support unicode emoji rendering via Rich
+        if not console.legacy_windows:
+            version_text = "🏗 "
+        version_text += f"GitLabForm version: [bold blue]{local_version}[/]"
 
         if skip_version_check:
-            # just print end of the line
-            print()
+            # just print version in use
+            console.print(version_text)
         else:
             try:
                 latest_version = luddite.get_version_pypi("gitlabform")
@@ -582,24 +564,26 @@ class GitLabForm:
                 error(f"Checking latest version failed:\n{e}")
                 return
 
+            latest_stable_text = "(the latest stable is {latest_version})"
+
             if local_version == latest_version:
-                # fmt: off
-                happy = Symbol("😊", ":)")
-                to_show = ["= the latest stable ", happy]
-                # fmt: on
+                version_info = "= the latest stable"
+                # Legacy windows console  cannot support unicode emoji rendering via Rich
+                if not console.legacy_windows:
+                    version_info = f"{version_info} ☺️"
             elif version.parse(local_version) < version.parse(latest_version):
-                # fmt: off
-                sad = Symbol("😔", ":(")
-                to_show = ["= outdated ", sad, " , please update! (the latest stable is ", latest_version, ")"]
-                # fmt: on
+                version_info = f"= outdated, please update"
+                if not console.legacy_windows:
+                    version_info = f"{version_info} 😔"
+                version_info = f"{version_info}! {latest_stable_text}"
             else:
-                # fmt: off
-                excited = Symbol("🤩", "8)")
-                to_show = ["= pre-release ", excited, " (the latest stable is ", latest_version, ")"]
-                # fmt: on
+                version_info = f"= pre-release: "
+                if not console.legacy_windows:
+                    version_info = f"{version_info} 🤩"
+                version_info = f"{version_info} {latest_stable_text}"
 
             # complete the line with a line ending
-            message(*to_show, sep="")
+            console.print(f"{version_text} {version_info}")
 
     def _get_groups_and_projects(
         self,
@@ -633,10 +617,8 @@ class GitLabForm:
                 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(
-                error_message,
-                exit_code=EXIT_INVALID_INPUT,
-            )
+            critical(error_message)
+            sys.exit(EXIT_INVALID_INPUT)
 
         self.groups_and_projects_filters.filter(groups, projects)
 
@@ -652,7 +634,7 @@ class GitLabForm:
 
         :param entities: groups or projects
         """
-        info_1(f"# of {entities.name} to process: {len(entities.get_effective())}")
+        info(f"# of {entities.name} to process: {len(entities.get_effective())}")
 
         entities_omitted = ""
         entities_verbose = f"{entities.name}: {entities.get_effective()}"
@@ -669,9 +651,9 @@ class GitLabForm:
             entities_omitted += ")"
 
         if entities_omitted:
-            info_1(entities_omitted)
+            info(entities_omitted)
 
-        verbose(entities_verbose)
+        info(entities_verbose)
 
     @classmethod
     def _show_summary(
@@ -695,50 +677,39 @@ class GitLabForm:
         """
 
         if len(effective_groups) > 0 or len(effective_projects) > 0:
-            info_1(f"# of groups processed successfully: {successful_groups}")
-            info_1(f"# of projects processed successfully: {successful_projects}")
+            info(f"# of groups processed successfully: {successful_groups}")
+            info(f"# of projects processed successfully: {successful_projects}")
 
         if len(failed_groups) > 0:
-            info_1(red, f"# of groups failed: {len(failed_groups)}", reset)
+            console.print(f"# of groups failed: {len(failed_groups)}", style="red")
             for group_number in failed_groups.keys():
-                # fmt: off
-                info_1(red, f"Failed group {group_number}: {failed_groups[group_number]}", reset)
-                # fmt: on
+                console.print(f"Failed group {group_number}: {failed_groups[group_number]}", style="red")
         if len(failed_projects) > 0:
-            # fmt: off
-            info_1(red, f"# of projects failed: {len(failed_projects)}", reset)
-            # fmt: on
+            console.print(f"# of projects failed: {len(failed_projects)}", style="red")
             for project_number in failed_projects.keys():
-                # fmt: off
-                info_1(red, f"Failed project {project_number}: {failed_projects[project_number]}", reset)
-                # fmt: on
+                console.print(f"Failed project {project_number}: {failed_projects[project_number]}", style="red")
 
         if len(failed_groups) > 0 or len(failed_projects) > 0:
             sys.exit(EXIT_PROCESSING_ERROR)
         elif successful_groups > 0 or successful_projects > 0:
-            # fmt: off
-            shine = Symbol("✨", "!!!")
-            info_1(green, "All requested groups/projects processed successfully!", reset, shine)
-            # fmt: on
+            console.print("All requested groups/projects processed successfully! :sparkles:", style="green")
         else:
-            # fmt: off
-            info_1(yellow, "Nothing to do.", reset)
-            # fmt: on
+            console.print("Nothing to do.", style="yellow")
 
     @classmethod
-    def _info_group_count(cls, prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> None:
-        cls._info_count(purple, prefix, i, n, *rest, **kwargs)
+    def _info_group_count(cls, prefix, i: int, n: int, second_color: str, second_text: str) -> None:
+        cls._info_count("purple", prefix, i, n, second_color, second_text)
 
     @classmethod
-    def _info_project_count(cls, prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> None:
-        cls._info_count(green, prefix, i, n, *rest, **kwargs)
+    def _info_project_count(cls, prefix, i: int, n: int, second_color: str, second_text: str) -> None:
+        cls._info_count("green", prefix, i, n, second_color, second_text)
 
     @classmethod
-    def _info_count(cls, color, prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> None:
+    def _info_count(cls, color: str, prefix, i: int, n: int, second_color: str, second_text: str) -> None:
         num_digits = len(str(n))
         counter_format = f"(%{num_digits}d/%d)"
         counter_str = counter_format % (i, n)
-        info(color, prefix, reset, counter_str, reset, *rest, **kwargs)
+        console.print(f"[bold {color}]{prefix} {counter_str}[/] [{second_color}]{second_text}[/]")
 
 
 class Formatter(

{gitlabform-5.1.1 → gitlabform-5.3.0}/gitlabform/configuration/core.py

@@ -1,3 +1,4 @@
+import sys
 from typing import Any
 
 import os
@@ -10,8 +11,8 @@ from pathlib import Path
 from ruamel.yaml.scalarstring import ScalarString
 from types import SimpleNamespace
 
-from cli_ui import debug as verbose
-from cli_ui import fatal
+from logging import critical, info
+
 from mergedeep import merge
 from yamlpath.common import Parsers
 from yamlpath.wrappers import ConsolePrinter
@@ -28,10 +29,8 @@ class ConfigurationCore(ABC):
 
     def __init__(self, config_path=None, config_string=None):
         if config_path and config_string:
-            fatal(
-                "Please initialize with either config_path or config_string, not both.",
-                exit_code=EXIT_INVALID_INPUT,
-            )
+            critical("Please initialize with either config_path or config_string, not both.")
+            sys.exit(EXIT_INVALID_INPUT)
         try:
             if config_string:
                 self.config = self._parse_yaml(config_string, config_string=True)
@@ -44,22 +43,22 @@ class ConfigurationCore(ABC):
                 # below checks are only needed in the non-test mode, when the config is read from file
 
                 if self.config.get("example_config"):
-                    fatal(
+                    critical(
                         "Example config detected, aborting.\n"
                         "Haven't you forgotten to use `-c <config_file>` parameter?\n"
                         "If you created your config based on the example config.yml,"
-                        " then please remove 'example_config' key.",
-                        exit_code=EXIT_INVALID_INPUT,
+                        " then please remove 'example_config' key."
                     )
+                    sys.exit(EXIT_INVALID_INPUT)
 
                 if self.config.get("config_version", 1) != 4:
-                    fatal(
+                    critical(
                         "This version of GitLabForm requires 'config_version: 4' entry in the config. "
                         "This ensures that if the application behavior changes in a backward-incompatible way,"
                         " you won't apply unwanted configuration to your GitLab instance.\n"
-                        "Please follow this guide: https://gitlabform.github.io/gitlabform/upgrade/\n",
-                        exit_code=EXIT_INVALID_INPUT,
+                        "Please follow this guide: https://gitlabform.github.io/gitlabform/upgrade/\n"
                     )
+                    sys.exit(EXIT_INVALID_INPUT)
 
             self._find_almost_duplicates()
 
@@ -100,11 +99,11 @@ class ConfigurationCore(ABC):
 
         if config_string:
             config = textwrap.dedent(source)
-            verbose("Reading config from the provided string.")
+            info("Reading config from the provided string.")
             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}")
+            info(f"Reading config from file: {config_path}")
             yaml_data, doc_loaded = Parsers.get_yaml_data(yaml, log, config_path)
 
         if doc_loaded:
@@ -159,11 +158,11 @@ class ConfigurationCore(ABC):
         for key, value in config.items():
             if "inherit" == key:
                 parent_key_description = ' under key "' + parent_key + '"' if parent_key else ""
-                fatal(
+                critical(
                     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,
+                    f"because it has no higher level setting to inherit from.\n"
                 )
+                sys.exit(EXIT_INVALID_INPUT)
             elif type(value) in [CommentedMap, dict]:
                 ConfigurationCore._validate_break_inheritance_flag(value, section_name, key)
 
@@ -194,10 +193,8 @@ class ConfigurationCore(ABC):
                         replace_config_section(merged_dict, parent_path, specific_config)
                         break
                     elif value:
-                        fatal(
-                            f"Cannot set the inheritance break flag with true\n",
-                            exit_code=EXIT_INVALID_INPUT,
-                        )
+                        critical(f"Cannot set the inheritance break flag with true\n")
+                        sys.exit(EXIT_INVALID_INPUT)
                 elif type(value) in [CommentedMap, dict]:
                     break_inheritance(value, parent_path + (key,))
 
@@ -262,12 +259,12 @@ class ConfigurationCore(ABC):
             if self.get(path, 0):
                 almost_duplicates = self._find_almost_duplicates_in(path)
                 if almost_duplicates:
-                    fatal(
+                    critical(
                         f"There are almost duplicates in the keys of {path} - they differ only in case.\n"
                         f"They are: {', '.join(almost_duplicates)}\n"
-                        f"This is not allowed as we ignore the case for group and project names.",
-                        exit_code=EXIT_INVALID_INPUT,
+                        f"This is not allowed as we ignore the case for group and project names."
                     )
+                    sys.exit(EXIT_INVALID_INPUT)
 
     def _find_almost_duplicates_in(self, configuration_path):
         """
@@ -322,7 +319,5 @@ class KeyNotFoundException(Exception):
         if logging.getLogger().getEffectiveLevel() <= logging.DEBUG:
             self.key = key
         else:
-            fatal(
-                f"Unable to find the key: {key.replace('|', '.')}\n",
-                exit_code=EXIT_INVALID_INPUT,
-            )
+            critical(f"Unable to find the key: {key.replace('|', '.')}\n")
+            sys.exit(EXIT_INVALID_INPUT)

{gitlabform-5.1.1 → gitlabform-5.3.0}/gitlabform/configuration/transform.py

@@ -1,10 +1,10 @@
-from logging import debug
+import sys
+from logging import debug, info, critical
 from abc import ABC, abstractmethod
 from ez_yaml import ez_yaml
 from ruamel.yaml import YAML
 from types import SimpleNamespace
 
-from cli_ui import fatal, warning, debug as verbose
 from ruamel.yaml.comments import CommentedMap
 from yamlpath import Processor
 from yamlpath.exceptions import YAMLPathException
@@ -72,7 +72,7 @@ class UserTransformer(ConfigurationTransformer):
         logging_args = SimpleNamespace(quiet=False, verbose=False, debug=False)
         log = ConsolePrinter(logging_args)
         processor = Processor(log, configuration.config)
-        verbose("Getting user ids for users defined in protect_environments config")
+        info("Getting user ids for users defined in protect_environments config")
         try:
             for node_coordinate in processor.get_nodes(
                 "projects_and_groups.*.protected_environments.*.deploy_access_levels.user",
@@ -86,7 +86,7 @@ class UserTransformer(ConfigurationTransformer):
             # under the given path
             pass
 
-        verbose("Getting user ids for users defined in merge_requests_approval_rules config")
+        info("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",
@@ -218,11 +218,11 @@ class AccessLevelsTransformer(ConfigurationTransformer):
                         access_level_string = str(node_coordinate.node)
                         node_coordinate.parent[node_coordinate.parentref] = AccessLevel.get_value(access_level_string)
                     except KeyError:
-                        fatal(
+                        critical(
                             f"Configuration string '{access_level_string}' is not one of the valid access levels:"
-                            f" {', '.join(AccessLevel.get_canonical_names())}",
-                            exit_code=EXIT_INVALID_INPUT,
+                            f" {', '.join(AccessLevel.get_canonical_names())}"
                         )
+                        sys.exit(EXIT_INVALID_INPUT)
             except YAMLPathException:
                 # this just means that we haven't found any keys in YAML
                 # under the given path
@@ -248,11 +248,11 @@ class AccessLevelsTransformer(ConfigurationTransformer):
                                 access_level_string
                             )
                         except KeyError:
-                            fatal(
+                            critical(
                                 f"Configuration string '{access_level_string}' is not one of the valid access levels:"
-                                f" {', '.join(AccessLevel.get_canonical_names())}",
-                                exit_code=EXIT_INVALID_INPUT,
+                                f" {', '.join(AccessLevel.get_canonical_names())}"
                             )
+                            sys.exit(EXIT_INVALID_INPUT)
             except YAMLPathException:
                 # this just means that we haven't found any keys in YAML
                 # under the given path

{gitlabform-5.1.1 → gitlabform-5.3.0}/gitlabform/gitlab/__init__.py

@@ -1,5 +1,6 @@
 import enum
 import inspect
+import logging
 
 from typing import List
 

{gitlabform-5.1.1 → gitlabform-5.3.0}/gitlabform/gitlab/core.py

@@ -1,7 +1,7 @@
 import functools
 import os
 import re
-from logging import debug
+from logging import debug, info, warning
 from typing import Union
 from urllib import parse
 
@@ -12,7 +12,6 @@ import requests
 
 # noinspection PyPackageRequirements
 import urllib3
-from cli_ui import debug as verbose, warning
 from requests.adapters import HTTPAdapter
 
 # noinspection PyPackageRequirements
@@ -73,7 +72,7 @@ class GitLabCore:
 
         try:
             version_response = self._make_requests_to_api("version")
-            verbose(
+            info(
                 f"Connected to GitLab version: {version_response['version']} ({version_response['revision']}), Enterprise Edition: {version_response['enterprise']}"
             )
             self.version = version_response["version"]
@@ -89,7 +88,7 @@ class GitLabCore:
                 self.admin = True
             else:
                 self.admin = False
-            verbose(f"Connected as: {current_user['username']}, admin: {'yes' if self.admin else 'no'}")
+            info(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.")
 

{gitlabform-5.1.1 → gitlabform-5.3.0}/gitlabform/gitlab/project_protected_environments.py

@@ -1,4 +1,4 @@
-from cli_ui import debug as verbose
+from logging import info
 
 from gitlabform.gitlab.projects import GitLabProjects
 
@@ -20,7 +20,7 @@ class GitLabProjectProtectedEnvironments(GitLabProjects):
 
         # TODO: remove this when this issue is resolved -> https://gitlab.com/gitlab-org/gitlab/-/issues/378657
         if retry and (len(protected_env_cfg["deploy_access_levels"]) != len(response["deploy_access_levels"])):
-            verbose(f'Gitlab\'s returned "deploy_access_levels" differs from the sent cfg, trying again...')
+            info(f'Gitlab\'s returned "deploy_access_levels" differs from the sent cfg, trying again...')
 
             self.unprotect_environment(project_and_group_name, protected_env_cfg)