mreg-cli 1.7.2__tar.gz → 1.7.3__tar.gz

{mreg_cli-1.7.2 → mreg_cli-1.7.3}/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- ## Unreleased -->
 
+## [1.7.3](https://github.com/unioslo/mreg-cli/releases/tag/1.7.3) - 2025-11-18
+
+### Changed
+
+- No longer requires a writable log file to start the application. In extreme cases where no writable log file directory can be found, logging will be disabled.
+
+### Fixed
+
+- Temporary file creation failing due to non-unique filename in `/tmp` directory. Now creates a unique temporary directory for the temporary file.
+
 ## [1.7.2](https://github.com/unioslo/mreg-cli/releases/tag/1.7.2) - 2025-11-17
 
 ### Fixed

{mreg_cli-1.7.2 → mreg_cli-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.7.2
+Version: 1.7.3
 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>

{mreg_cli-1.7.2 → mreg_cli-1.7.3}/mreg_cli/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.7.2'
-__version_tuple__ = version_tuple = (1, 7, 2)
+__version__ = version = '1.7.3'
+__version_tuple__ = version_tuple = (1, 7, 3)
 
-__commit_id__ = commit_id = 'g0bceea78e'
+__commit_id__ = commit_id = 'g9939333a3'

{mreg_cli-1.7.2 → mreg_cli-1.7.3}/mreg_cli/commands/logging.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+from pathlib import Path
 from typing import Any
 
 from mreg_cli.commands.base import BaseCommand
@@ -66,10 +67,9 @@ def start_logging(args: argparse.Namespace) -> None:
     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}")
-
+        raise InputFailure(f"Logging already enabled: {status.as_str()}")
     log.start_logging(log_file, level)
-    OutputManager().add_line(f"Logging started: {level} > {log_file}")
+    OutputManager().add_line(f"Logging started: {status.as_str()}")
 
 
 @command_registry.register_command(
@@ -81,7 +81,7 @@ def stop_logging(_: argparse.Namespace):
     """Stop logging."""
     log = MregCliLogger()
     if not log.status.enabled:
-        raise InputFailure("Logging is not enabled.")
+        raise InputFailure("Logging is already disabled.")
 
     log.stop_logging()
     OutputManager().add_line("Logging stopped.")
@@ -110,7 +110,7 @@ def set_logging_level(args: argparse.Namespace) -> None:
         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...
+    log_file = log.status.file or config.log_file
     level = LogLevel(args.level)
     log.start_logging(log_file, level)
 
@@ -125,19 +125,21 @@ def logging_status(_: argparse.Namespace):
     conf = MregCliConfig()
 
     status = MregCliLogger().status
+    log_file = status.file or conf.log_file  # fallback should never be reachable...
+
     if not status.enabled:
         raise InputFailure("Logging is disabled.")
-
-    level = status.level
-    file = status.file or conf.log_file  # fallback should never be reachable...
+    elif not log_file:
+        OutputManager().add_line(status.as_str())
+        return
 
     lines_in_logfile = 0
     try:
-        with open(file) as f:
+        with open(log_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
+        raise FileError(f"Unable to read log file {log_file}: {e}") from e
 
-    filesize = sizeof_fmt(file.stat().st_size)
+    filesize = sizeof_fmt(log_file.stat().st_size)
 
-    OutputManager().add_line(f"{level} > {file} ({lines_in_logfile} lines, {filesize})")
+    OutputManager().add_line(f"{status.as_str()} ({lines_in_logfile} lines, {filesize})")

{mreg_cli-1.7.2 → mreg_cli-1.7.3}/mreg_cli/config.py

@@ -157,7 +157,14 @@ class IniConfigSettingsSource(InitSettingsSource, ConfigFileSourceMixin):
         return f"{self.__class__.__name__}()"
 
 
-ResolvedPath = Annotated[Path, AfterValidator(to_path)]
+def to_path_optional(value: Any) -> Path | None:
+    """Convert a value to a Path object with expanded user and resolved symlinks, or None."""
+    if value is None:
+        return None
+    return to_path(value)
+
+
+ResolvedPath = Annotated[Path, AfterValidator(to_path_optional)]
 """Path type that is user expanded (~) and resolved (absolute+symlinks) after validation."""
 
 
@@ -179,7 +186,7 @@ class MregCliConfig(BaseSettings):
     token_only: bool = False
     source: ResolvedPath | None = None
     verbose: bool = False
-    log_file: ResolvedPath = Field(
+    log_file: ResolvedPath | None = Field(
         LOG_FILE_DEFAULT,
         # New and old names both valid
         validation_alias=AliasChoices("logfile", "log_file"),
@@ -247,9 +254,13 @@ class MregCliConfig(BaseSettings):
         return []
 
     @field_validator("log_file", mode="after")
-    def _ensure_log_file_writable(cls, v: Path) -> Path:
+    def _ensure_log_file_writable(cls, v: Path) -> Path | None:
         """Ensure we have a writable log file."""
-        return get_writable_file_or_tempfile(v)
+        try:
+            return get_writable_file_or_tempfile(v)
+        except OSError as e:
+            logger.error(str(e))
+            return None
 
     @override
     @classmethod

{mreg_cli-1.7.2 → mreg_cli-1.7.3}/mreg_cli/log.py

@@ -23,6 +23,10 @@ class LoggingStatus(NamedTuple):
     file: Path | None
     level: LogLevel
 
+    def as_str(self) -> str:
+        """Get a string representation of the logging status."""
+        return f"{self.level} > {self.file or 'stderr'}" if self.enabled else "disabled"
+
 
 class MregCliLogger:
     """Singleton that manages logging state."""
@@ -44,7 +48,10 @@ class MregCliLogger:
         return LoggingStatus(self._is_logging, self._file, self._level)
 
     def start_logging(
-        self, logfile: Path, level: LogLevel | str = LogLevel.INFO, fmt: str = LOGGING_FORMAT
+        self,
+        logfile: Path | None,
+        level: LogLevel | str = LogLevel.INFO,
+        fmt: str = LOGGING_FORMAT,
     ) -> None:
         """Start logging to the specified file. Disables logging if already enabled."""
         level = LogLevel(level)

mreg_cli-1.7.3/mreg_cli/utilities/fs.py

@@ -0,0 +1,86 @@
+"""File system utilities."""
+
+from __future__ import annotations
+
+import logging
+import os
+import functools
+from pathlib import Path
+from typing import Any
+
+from mreg_cli.exceptions import InputFailure
+
+logger = logging.getLogger(__name__)
+
+
+def get_writable_file_or_tempfile(path: Path) -> Path:
+    """Ensure a writable file path exists, creating it if necessary, or fall back to a temporary file.
+
+    :param path: The desired file path.
+    :returns: The original path if writable, otherwise a temporary file path.
+    """
+    try:
+        path.parent.mkdir(parents=True, exist_ok=True)
+        if path.exists() and path.is_dir():
+            raise IsADirectoryError(f"Path {path} is a directory, not a file")
+        if path.exists():
+            check_writable(path)
+        else:
+            # Create new file if it doesn't exist (very defensively)
+            path.touch(exist_ok=True)
+    except OSError as e:
+        import time  # noqa: PLC0415
+
+        logger.error(
+            "Unable to create file at %s: %s",
+            path,
+            e,
+        )
+
+        filename = path.name or f"mreg-cli-temp-{int(time.time())}"
+        # NOTE: Not really a temporary dir, since we never delete it!
+        tempdir = get_temp_dir()
+        tmpfile = tempdir / filename
+        try:
+            tmpfile.touch(exist_ok=True)
+            check_writable(tmpfile)
+        except Exception as tmp_err:
+            raise OSError(f"Unable to create temporary file at {tmpfile}: {tmp_err}") from tmp_err
+        logger.warning("Using temporary file at %s", tmpfile)
+        return tmpfile
+    return path
+
+
+def check_writable(path: Path) -> None:
+    """Check if the given path is writable.
+
+    HACKY: Tests write access on file by opening in append mode.
+    """
+    # Check write privileges without overwriting existing content
+    with path.open("a"):
+        pass
+
+
+@functools.cache
+def get_temp_dir() -> Path:
+    """Get a temporary directory for use by the CLI.
+
+    Always returns the same directory for the lifetime of the process.
+    """
+    import tempfile  # noqa: PLC0415
+
+    temp_dir = tempfile.mkdtemp(prefix="mreg-cli.", suffix="." + str(os.getuid()))
+    return Path(temp_dir)
+
+
+def to_path(value: Any) -> Path:
+    """Convert a value to a Path object with expanded user and resolved symlinks."""
+    try:
+        p = Path(value)
+        try:
+            p = p.expanduser()
+        except RuntimeError:  # no homedir
+            pass
+        return p.resolve()
+    except Exception as e:
+        raise InputFailure(f"Invalid path {value}: {e}") from e

{mreg_cli-1.7.2 → mreg_cli-1.7.3}/mreg_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.7.2
+Version: 1.7.3
 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>

mreg_cli-1.7.2/mreg_cli/utilities/fs.py

@@ -1,57 +0,0 @@
-"""File system utilities."""
-
-from __future__ import annotations
-
-import logging
-from pathlib import Path
-from typing import Any
-
-from mreg_cli.exceptions import InputFailure
-
-logger = logging.getLogger(__name__)
-
-
-def get_writable_file_or_tempfile(path: Path) -> Path:
-    """Ensure a file path exists and is writable, otherwise return a temporary file."""
-    try:
-        path.parent.mkdir(parents=True, exist_ok=True)
-        if path.exists() and path.is_dir():
-            raise IsADirectoryError(f"Path {path} is a directory, not a file")
-        # Check write privileges without overwriting existing content
-        if path.exists():
-            # Test write access on existing file by opening in append mode
-            with path.open("a"):
-                pass
-        else:
-            # Create new file if it doesn't exist
-            path.touch()
-    except OSError as e:
-        import tempfile  # noqa: PLC0415 # only import if we really need it
-        import time  # noqa: PLC0415
-
-        # NOTE: we might not be able to write to the temp file either
-        # but in that case we are so far outside the normal
-        # usage patterns that we should probably just fail
-        tmpfile = Path(tempfile.gettempdir()) / path.name or f"mreg-cli-temp-{int(time.time())}"
-        logger.error(
-            "Unable to create file at %s due to: %s; falling back to temporary file at %s",
-            path,
-            e,
-            tmpfile,
-        )
-        tmpfile.touch()
-        return tmpfile
-    return path
-
-
-def to_path(value: Any) -> Path:
-    """Convert a value to a Path object with expanded user and resolved symlinks."""
-    try:
-        p = Path(value)
-        try:
-            p = p.expanduser()
-        except RuntimeError:  # no homedir
-            pass
-        return p.resolve()
-    except Exception as e:
-        raise InputFailure(f"Invalid path {value}: {e}") from e