mreg-cli 1.6.0__tar.gz → 1.7.0__tar.gz

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/CHANGELOG.md

@@ -7,6 +7,61 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- ## Unreleased -->
 
+## [1.7.0](https://github.com/unioslo/mreg-cli/releases/tag/1.7.0) - 2025-11-14
+
+### Added
+
+- `policy list_hosts -exclude EXCLUDEROLE [EXCLUDEROLE ...]` option to exclude hosts that have the given role(s) when listing hosts with a role. Supports multiple arguments and regular expressions.
+- Environment variable support for all config file options.
+  - Environment variables are prefixed with `MREG_CLI_` and use uppercase letters and underscores instead of lowercase letters and hyphens.
+  - For example, the `http_timeout` config file option can be set with the `MREG_CLI_HTTP_TIMEOUT` environment variable.
+  - Environment variables take precedence over config file options.
+  - All config file options and their corresponding environment vaiables:
+
+| Config  FIle                         | Env                                     |
+|----------------------------------|-----------------------------------------|
+| `url`                            | `MREG_CLI_URL`                         |
+| `user`                           | `MREG_CLI_USER`                        |
+| `domain`                        | `MREG_CLI_DOMAIN`                     |
+| `timeout`                   | `MREG_CLI_TIMEOUT`                 |
+| `prompt`                   | `MREG_CLI_PROMPT`                 |
+| `category_tags`                   | `MREG_CLI_CATEGORY_TAGS`                 |
+| `location_tags`                   | `MREG_CLI_LOCATION_TAGS`                 |
+| `cache`                           | `MREG_CLI_CACHE`                          |
+| `cache_ttl`                   | `MREG_CLI_CACHE_TTL`                 |
+| `http_timeout`                   | `MREG_CLI_HTTP_TIMEOUT`                 |
+| `record_traffic`                 | `MREG_CLI_RECORD_TRAFFIC`               |
+| `record_traffic_without_timestamps` | `MREG_CLI_RECORD_TRAFFIC_WITHOUT_TIMESTAMPS` |
+| `token_only`                     | `MREG_CLI_TOKEN_ONLY`                   |
+| `source`                         | `MREG_CLI_SOURCE`                       |
+| `verbose`                        | `MREG_CLI_VERBOSE`                      |
+| `log_file`                      | `MREG_CLI_LOG_FILE`                     |
+| `log_level`                      | `MREG_CLI_LOG_LEVEL`                    |
+
+- _New_ configuration options, previously only available as CLI options, exposed as both config file options and environment variables:
+
+| Config File                           | Env                                     |
+|----------------------------------|-----------------------------------------|
+| `http_timeout`                   | `MREG_CLI_HTTP_TIMEOUT`                 |
+| `record_traffic`                 | `MREG_CLI_RECORD_TRAFFIC`               |
+| `record_traffic_without_timestamps` | `MREG_CLI_RECORD_TRAFFIC_WITHOUT_TIMESTAMPS` |
+| `token_only`                     | `MREG_CLI_TOKEN_ONLY`                   |
+| `source`                         | `MREG_CLI_SOURCE`                       |
+| `verbose`                        | `MREG_CLI_VERBOSE`                      |
+| `log_file`\*                      | `MREG_CLI_LOG_FILE`                     |
+| `log_level`                      | `MREG_CLI_LOG_LEVEL`                    |
+
+\*: The old name `logfile` is deprecated, but remains a valid alias for this field.
+
+### Changed
+
+- Default config file location is now `$XDG_CONFIG_HOME/mreg-cli/mreg-cli.conf` (was `~/.config/mreg-cli.conf`).
+  - The old config file location remains supported for backwards compatibility, but will be removed in a future release.
+- `help configuration` now shows environment variables.
+- `logging start` no longer toggles logging on and off. Now aborts if logging is already enabled.
+- `logging stop` now aborts if logging is not enabled.
+- `logging status` now shows if logging is enabled or not.
+
 ## [1.6.0](https://github.com/unioslo/mreg-cli/releases/tag/1.6.0) - 2025-10-13
 
 ### Added

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.6.0
+Version: 1.7.0
 Summary: MREG interactive command line client
 Author: Others (see AUTHORS)
 Author-email: Øyvind Kolbu <oyvind.kolbu@usit.uio.no>, Safet A <amedov@usit.uio.no>, Magnus Hirth <mhmorgan42@gmail.com>, Nico <nicolaydmohebi@gmail.com>, Marius Bakke <marius.bakke@usit.uio.no>, Fredrik Larsen <fredrik.larsen@usit.uio.no>, Paal Braathen <paal.braathen@usit.uio.no>, Nils Hiorth <nils@nls.me>, Dmytro Karpenko <dmytrok@usit.uio.no>
@@ -702,6 +702,7 @@ Requires-Dist: pydantic[email]>=2.7.1
 Requires-Dist: pydantic-extra-types>=2.1.0
 Requires-Dist: platformdirs>=4.3.0
 Requires-Dist: diskcache>=5.6.3
+Requires-Dist: pydantic-settings>=2.10.1
 Dynamic: license-file
 
 # MREG CLI [![Build Status](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml/badge.svg)](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml)

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.7.0'
+__version_tuple__ = version_tuple = (1, 7, 0)
 
-__commit_id__ = commit_id = 'gaa96abf31'
+__commit_id__ = commit_id = 'g0f525f9e1'

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/api/fields.py

@@ -73,10 +73,10 @@ class HostName(str):
             return value
 
         config = MregCliConfig()
-        default_domain = config.get("domain")
+        domain = config.domain
         # Append domain name if in config and it does not end with it
-        if default_domain and not value.endswith(default_domain):
-            return f"{value}.{default_domain}"
+        if domain and not value.endswith(domain):
+            return f"{value}.{domain}"
         return value
 
     @classmethod

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/api/models.py

@@ -35,7 +35,7 @@ from mreg_cli.api.endpoints import Endpoint
 from mreg_cli.api.fields import HostName, MacAddress, NameList
 from mreg_cli.api.history import HistoryItem, HistoryResource
 from mreg_cli.exceptions import (
-    APINotOk,
+    APIError,
     CreateError,
     DeleteError,
     EntityAlreadyExists,
@@ -1012,11 +1012,11 @@ class ForwardZone(Zone, WithName, APIMixin):
         :param hostname: The hostname to search for.
         :returns: The zone if found, None otherwise.
         """
-        data = get(Endpoint.ForwardZoneForHost.with_id(hostname), ok404=True)
-        if not data:
+        resp = get(Endpoint.ForwardZoneForHost.with_id(hostname), ok404=True)
+        if not resp:
             return None
 
-        zoneblob = data.json()
+        zoneblob = resp.json()
 
         if "delegate" in zoneblob:
             return ForwardZoneDelegation.model_validate(zoneblob)
@@ -1027,7 +1027,7 @@ class ForwardZone(Zone, WithName, APIMixin):
         if "delegation" in zoneblob:
             return ForwardZoneDelegation.model_validate(zoneblob["delegation"])
 
-        raise UnexpectedDataError(f"Unexpected response from server: {zoneblob}")
+        raise UnexpectedDataError(f"Unexpected response from server: {zoneblob}", resp)
 
 
 class ReverseZone(Zone, WithName, APIMixin):
@@ -1268,15 +1268,28 @@ class Role(HostPolicy, WithHistory):
         for label in labels:
             output_manager.add_formatted_line("", label.name, padding)
 
-    def output_hosts(self, _padding: int = 14) -> None:
+    def output_hosts(self, _padding: int = 14, exclude_roles: list[Role] | None = None) -> None:
         """Output the hosts that use the role.
 
         :param padding: Number of spaces for left-padding the output.
+        :param exclude_roles: List of other roles to exclude hosts with.
         """
         manager = OutputManager()
-        if self.hosts:
+        hosts = self.hosts
+
+        if exclude_roles:
+            # Exclude any hosts that are found in the excluded roles
+            excluded_hosts: set[str] = set()
+            for host in hosts:
+                for role in exclude_roles:
+                    if host in role.hosts:
+                        excluded_hosts.add(host)
+                        break
+            hosts = [host for host in hosts if host not in excluded_hosts]
+
+        if hosts:
             manager.add_line("Name:")
-            for host in self.hosts:
+            for host in hosts:
                 manager.add_line(f" {host}")
         else:
             manager.add_line("No host uses this role")
@@ -2463,7 +2476,7 @@ class IPAddress(FrozenModelWithTimestamps, WithHost, APIMixin):
         """Return the network of the IP address."""
         try:
             return get_typed(Endpoint.NetworksByIP.with_id(str(self.ipaddress)), Network)
-        except APINotOk:
+        except APIError:
             return None
 
     def vlan(self) -> int | None:
@@ -4545,13 +4558,13 @@ class LDAPHealth(BaseModel, APIMixin):
 
         :param ignore_errors: Ignore non-503 errors. 503 means LDAP is down,
             and should not be treated as an error in the traditional sense.
-        :raises requests.APINotOk: If the response code is not 200 or 503.
+        :raises requests.APIError: If the response code is not 200 or 503.
         :returns: An instance of LDAPStatus.
         """
         try:
             get(cls.endpoint())
             return cls(status="OK")
-        except APINotOk as e:
+        except APIError as e:
             if ignore_errors:
                 logger.error("Failed to fetch LDAP health: %s", e)
                 if e.response.status_code == 503:

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/cache.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import functools
 import logging
 from dataclasses import dataclass
 from types import ModuleType
@@ -72,7 +73,7 @@ class NullCache:
         tag: str | None = None,
         ignore: tuple[str, ...] = (),
     ) -> Callable[[Callable[P, T]], Callable[P, T]]:
-        """Returns a decorator that does nothing"""
+        """Returns a decorator that does nothing."""
 
         def decorator(func: Callable[P, T]) -> Callable[P, T]:
             return func  # Just return the original function unchanged
@@ -148,7 +149,7 @@ def _create_cache(config: MregCliConfig) -> CacheLike:
 
     Falls back to a no-op cache object if the diskcache cache cannot be created.
     """
-    if not config.get_cache_enabled():
+    if not config.cache:
         logger.debug("Cache is disabled in configuration, using NullCache.")
         return NullCache()
 
@@ -168,7 +169,7 @@ def configure(config: MregCliConfig) -> None:
     cache = _create_cache(config)
     _CACHE = MregCliCache(cache)  # pyright: ignore[reportConstantRedefinition]
 
-    if not config.get_cache_enabled():
+    if not config.cache:
         logger.debug("Cache is disabled in configuration, not configuring cache.")
         return
 
@@ -227,7 +228,7 @@ class MregCliCache:
             misses=misses,
             items=len(self.cache),
             directory=self.cache.directory,
-            ttl=conf.get_cache_ttl(),
+            ttl=conf.cache_ttl,
         )
 
     def _patch_functions(self) -> None:
@@ -243,10 +244,11 @@ class MregCliCache:
         self._patch_functions()
         logger.info("Cache enabled")
 
-    def disable(self) -> None:
+    def disable(self, *, clear: bool = True) -> None:
         """Disable caching by restoring patched functions and clearing the cache."""
         self._unpatch_functions()
-        self.clear()
+        if clear:
+            self.clear()
         logger.info("Cache disabled")
 
     def clear(self) -> None:
@@ -298,8 +300,6 @@ class MregCliCache:
 
     def memoize_function(self, memfunc: MemoizedFunction) -> None:
         """Memoize a given function."""
-        from mreg_cli.config import MregCliConfig
-
         config = MregCliConfig()
 
         mod_path = memfunc.func
@@ -314,5 +314,20 @@ class MregCliCache:
         self.save_original_function(mod_path, mod, func)
 
         self.patch_function(
-            mod, self.cache.memoize(expire=config.get_cache_ttl(), tag=memfunc.tag)(func)
+            mod, self.cache.memoize(expire=config.cache_ttl, tag=memfunc.tag)(func)
         )
+
+
+def disable_cache(func: Callable[P, T]) -> Callable[P, T]:
+    """Disable cache for the duration of the decorated function."""
+
+    @functools.wraps(func)
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+        cache = get_cache()
+        try:
+            cache.disable(clear=False)
+            return func(*args, **kwargs)
+        finally:
+            cache.enable()
+
+    return wrapper

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/cli.py

@@ -12,6 +12,7 @@ import os
 import shlex
 import sys
 from collections.abc import Generator
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, Protocol
 
 from prompt_toolkit import HTML, document, print_formatted_text
@@ -39,6 +40,7 @@ from mreg_cli.help_formatter import CustomHelpFormatter
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import CommandFunc, Flag
 from mreg_cli.utilities.api import create_and_set_corrolation_id, last_request_url
+from mreg_cli.utilities.fs import to_path
 
 logger = logging.getLogger(__name__)
 
@@ -307,7 +309,7 @@ for command in commands:
     command(cli).register_all_commands()
 
 
-def source(files: list[str], ignore_errors: bool, verbose: bool) -> Generator[str]:
+def source(files: list[Path], ignore_errors: bool, verbose: bool) -> Generator[str]:
     """Read commands from one or more source files and yield them.
 
     :param files: List of file paths to read commands from.
@@ -317,8 +319,7 @@ def source(files: list[str], ignore_errors: bool, verbose: bool) -> Generator[st
     :yields: Command lines from the files.
     """
     for filename in files:
-        if filename.startswith("~"):
-            filename = os.path.expanduser(filename)
+        filename = filename.expanduser()
         try:
             with open(filename) as f:
                 logger.info("Reading commands from %s", filename)
@@ -357,7 +358,8 @@ def _source(args: argparse.Namespace):
 
     :param args: The arguments passed to the command.
     """
-    for command in source(args.files, args.ignore_errors, args.verbose):
+    files = [to_path(f) for f in args.files]
+    for command in source(files, args.ignore_errors, args.verbose):
         # Process each command here as needed, similar to the main loop
         print(f"Processing command: {command}")
         cli.process_command_line(command)

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/commands/cache.py

@@ -43,7 +43,7 @@ def cache_clear(_: argparse.Namespace) -> None:
 def cache_info(_: argparse.Namespace) -> None:
     """Show cache information."""
     conf = MregCliConfig()
-    if not conf.get_cache_enabled():
+    if not conf.cache:
         OutputManager().add_line("Cache is disabled")
         return
 
@@ -61,13 +61,13 @@ def cache_info(_: argparse.Namespace) -> None:
 def cache_enable(_: argparse.Namespace) -> None:
     """Enable caching."""
     conf = MregCliConfig()
-    if conf.get_cache_enabled():
+    if conf.cache:
         OutputManager().add_line("Cache is already enabled")
         return
 
     cache = get_cache()
     cache.enable()
-    conf.set_cache_enabled(True)
+    conf.cache = True
     OutputManager().add_ok("Enabled cache")
 
 
@@ -77,11 +77,11 @@ def cache_enable(_: argparse.Namespace) -> None:
 def cache_disable(_: argparse.Namespace) -> None:
     """Disable caching."""
     conf = MregCliConfig()
-    if not conf.get_cache_enabled():
+    if not conf.cache:
         OutputManager().add_line("Cache is already disabled")
         return
 
     cache = get_cache()
     cache.disable()
-    conf.set_cache_enabled(False)
+    conf.cache = False
     OutputManager().add_ok("Cleared and disabled cache")

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/commands/help.py

@@ -7,6 +7,7 @@ from typing import Any
 
 from mreg_cli.__about__ import __version__ as mreg_cli_version
 from mreg_cli.api.models import HealthInfo, ServerLibraries, ServerVersion, UserInfo
+from mreg_cli.cache import disable_cache
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.config import MregCliConfig
@@ -91,6 +92,7 @@ def configuration_help(_: argparse.Namespace) -> None:
     description="Show versions of client and server as much as possible",
     short_desc="Show versions",
 )
+@disable_cache
 def versions_help(_: argparse.Namespace) -> None:
     """Show versions of client and server as much as possible."""
     output_manager = OutputManager()
@@ -108,13 +110,14 @@ def versions_help(_: argparse.Namespace) -> None:
         Flag("-django", action="store_true", description="Show Django internal roles"),
     ],
 )
+@disable_cache
 def whoami_help(args: argparse.Namespace) -> None:
     """Show information about the current user."""
     try:
         UserInfo.fetch(ignore_errors=False).output(django=args.django)
     except Exception as e:
         raise CliError(
-            f"Failed to display user info for current user {MregCliConfig().get_user()!r}: {e}"
+            f"Failed to display user info for current user {MregCliConfig().user!r}: {e}"
         ) from e
 
 
@@ -127,6 +130,7 @@ def whoami_help(args: argparse.Namespace) -> None:
         Flag("-django", action="store_true", description="Show Django internal roles"),
     ],
 )
+@disable_cache
 def whois_help(args: argparse.Namespace) -> None:
     """Show information about a user."""
     try:
@@ -140,6 +144,7 @@ def whois_help(args: argparse.Namespace) -> None:
     description="Show information about the health of the server",
     short_desc="Show health info",
 )
+@disable_cache
 def meta_health(_: argparse.Namespace) -> None:
     """Show information about the health of the server."""
     try:

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/commands/host_submodules/core.py

@@ -28,7 +28,7 @@ from mreg_cli.api.models import (
 )
 from mreg_cli.commands.host import registry as command_registry
 from mreg_cli.exceptions import (
-    APINotOk,
+    APIError,
     CreateError,
     DeleteError,
     EntityAlreadyExists,
@@ -149,7 +149,7 @@ def add(args: argparse.Namespace) -> None:
                         raise InvalidIPAddress(
                             f"IP {ipaddr} is a broadcast address, not a host address, must force"
                         )
-            except (EntityNotFound, APINotOk) as e:
+            except (EntityNotFound, APIError) as e:
                 if not force:
                     raise ForceMissing(f"IP {ipaddr} is not in a network, must force") from e
             data["ipaddress"] = str(network_or_ip)

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/commands/logging.py

@@ -3,15 +3,16 @@
 from __future__ import annotations
 
 import argparse
-import os
 from typing import Any
 
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.config import MregCliConfig
-from mreg_cli.exceptions import InputFailure
+from mreg_cli.exceptions import FileError, InputFailure
+from mreg_cli.log import MregCliLogger
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag, LogLevel
+from mreg_cli.utilities.fs import to_path
 from mreg_cli.utilities.shared import sizeof_fmt
 
 command_registry = CommandRegistry()
@@ -37,13 +38,14 @@ class LoggingCommmands(BaseCommand):
     short_desc="Start logging",
     flags=[
         Flag(
-            "filename",
-            description="The filename to log to.",
+            "-filename",
+            description="The filename to log to. Uses default log file if not given.",
             short_desc="Filename",
             metavar="filename",
+            default=None,
         ),
         Flag(
-            "level",
+            "-level",
             description="The logging level to use.",
             short_desc="Level",
             metavar="level",
@@ -54,12 +56,20 @@ class LoggingCommmands(BaseCommand):
 )
 def start_logging(args: argparse.Namespace) -> None:
     """Start logging to the given file."""
-    if not args.filename:
-        raise InputFailure("No filename given.")
+    if args.filename is not None:
+        log_file = to_path(args.filename)
+    else:
+        log_file = MregCliConfig().log_file
+    level = LogLevel(args.level)
 
-    config = MregCliConfig()
-    config.stop_logging()
-    config.start_logging(args.filename, args.level)
+    log = MregCliLogger()
+    status = log.status
+    # Abort if already logging with same params
+    if status.enabled and status.file == log_file and status.level == level:
+        raise InputFailure(f"Logging already enabled: {level} > {log_file}")
+
+    log.start_logging(log_file, level)
+    OutputManager().add_line(f"Logging started: {level} > {log_file}")
 
 
 @command_registry.register_command(
@@ -69,7 +79,12 @@ def start_logging(args: argparse.Namespace) -> None:
 )
 def stop_logging(_: argparse.Namespace):
     """Stop logging."""
-    MregCliConfig().stop_logging()
+    log = MregCliLogger()
+    if not log.status.enabled:
+        raise InputFailure("Logging is not enabled.")
+
+    log.stop_logging()
+    OutputManager().add_line("Logging stopped.")
 
 
 @command_registry.register_command(
@@ -89,8 +104,15 @@ def stop_logging(_: argparse.Namespace):
 def set_logging_level(args: argparse.Namespace) -> None:
     """Set the logging level."""
     config = MregCliConfig()
-    config.stop_logging()
-    config.start_logging(config.get_default_logfile(), args.level)
+    log = MregCliLogger()
+
+    if not log.status.enabled:
+        raise InputFailure("Logging is not enabled, cannot set level.")
+
+    # Determine logging params
+    log_file = log.status.file or config.log_file  # fallback should never be reachable...
+    level = LogLevel(args.level)
+    log.start_logging(log_file, level)
 
 
 @command_registry.register_command(
@@ -100,13 +122,22 @@ def set_logging_level(args: argparse.Namespace) -> None:
 )
 def logging_status(_: argparse.Namespace):
     """Print the logging status."""
-    level = MregCliConfig().get_logging_level()
-    file = MregCliConfig().get_default_logfile()
+    conf = MregCliConfig()
+
+    status = MregCliLogger().status
+    if not status.enabled:
+        raise InputFailure("Logging is disabled.")
+
+    level = status.level
+    file = status.file or conf.log_file  # fallback should never be reachable...
 
     lines_in_logfile = 0
-    with open(file) as f:
-        lines_in_logfile = sum(1 for _ in f)
+    try:
+        with open(file) as f:
+            lines_in_logfile = sum(1 for _ in f)
+    except OSError as e:
+        raise FileError(f"Unable to read log file {file}: {e}") from e
 
-    filesize = sizeof_fmt(os.path.getsize(file))
+    filesize = sizeof_fmt(file.stat().st_size)
 
     OutputManager().add_line(f"{level} > {file} ({lines_in_logfile} lines, {filesize})")

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/commands/policy.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+import itertools
 from typing import Any
 
 from mreg_cli.api.models import (
@@ -13,7 +14,7 @@ from mreg_cli.api.models import (
 )
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
-from mreg_cli.exceptions import APINotOk, CreateError, DeleteError, EntityAlreadyExists
+from mreg_cli.exceptions import APIError, CreateError, DeleteError, EntityAlreadyExists, PatchError
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
@@ -259,6 +260,15 @@ def list_roles(args: argparse.Namespace) -> None:
     short_desc="List hosts which use the given role",
     flags=[
         Flag("name", description="Role name", metavar="ROLE"),
+        Flag(
+            "-exclude",
+            description=(
+                "Exclude hosts that have these roles. "
+                "Supports regular expressions and multiple arguments."
+            ),
+            metavar="EXCLUDEROLE",
+            nargs="+",
+        ),
     ],
 )
 def list_hosts(args: argparse.Namespace) -> None:
@@ -267,9 +277,15 @@ def list_hosts(args: argparse.Namespace) -> None:
     :param args: argparse.Namespace (name)
     """
     name: str = args.name
+    exclude: list[str] = args.exclude if args.exclude else []
 
     role = Role.get_by_name_or_raise(name)
-    role.output_hosts()
+
+    exclude_roles = list(
+        itertools.chain.from_iterable(Role.get_list_by_name_regex(r) for r in exclude)
+    )
+
+    role.output_hosts(exclude_roles=exclude_roles)
 
 
 @command_registry.register_command(
@@ -312,18 +328,20 @@ def host_add(args: argparse.Namespace) -> None:
     hosts = [Host.get_by_any_means_or_raise(host) for host in host_names]
 
     for host in hosts:
+        # Best-effort approach – try to assign roles to all hosts
         try:
             role.add_host(host.name)
             OutputManager().add_ok(f"Added host {host.name} to role {role_name!r}")
-        except APINotOk as e:
+        except APIError as e:
             if e.response.status_code == 409:
                 OutputManager().add_line(
                     f"Host {host.name} is already a member of role {role_name!r}"
                 )
             else:
-                OutputManager().add_error(
-                    f"Failed to add host {host.name} to role {role_name!r}: {e}"
+                err = PatchError.from_api_error(
+                    e, f"Failed to add host {host.name} to role {role_name!r}"
                 )
+                err.print_and_log()
 
 
 @command_registry.register_command(

{mreg_cli-1.6.0 → mreg_cli-1.7.0}/mreg_cli/commands/recording.py

@@ -10,6 +10,7 @@ from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.exceptions import InputFailure
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
+from mreg_cli.utilities.fs import to_path
 
 command_registry = CommandRegistry()
 
@@ -45,8 +46,8 @@ def start_recording(args: argparse.Namespace) -> None:
     """Start recording commands and output to the given file."""
     if not args.filename:
         raise InputFailure("No filename given.")
-
-    OutputManager().recording_start(args.filename)
+    path = to_path(args.filename)
+    OutputManager().recording_start(path)
 
 
 @command_registry.register_command(