Merge pull request #149 from desultory/dev

Remove processing for old config style, improve logging

Author: desultory

src/ugrd/fs/mounts.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "5.7.2"
+__version__ = "5.8.0"
 
 from pathlib import Path
 from typing import Union
@@ -37,20 +37,7 @@ def _validate_mount_config(self, mount_name: str, mount_config) -> None:
 
     for parameter, value in mount_config.copy().items():
         self.logger.debug("[%s] Validating parameter: %s" % (mount_name, parameter))
-        if parameter == "source" and isinstance(value, dict):
-            self.logger.warning("source dict is deprecated, please define the source type directly.")
-            self.logger.info(
-                "Simply define the source type directly in the mount config, instead of using the 'source' dict."
-            )
-            # Break if the source type is valid
-            for source_type in SOURCE_TYPES:
-                if source_type in value:
-                    mount_config[source_type] = value[source_type]
-                    break
-            else:
-                self.logger.error("Valid source types: %s" % SOURCE_TYPES)
-                raise ValueError("Invalid source type in mount: %s" % value)
-        elif parameter == "options" and not mount_config.get("no_validate_options"):
+        if parameter == "options" and not mount_config.get("no_validate_options"):
             for option in value:
                 if "subvol=" in option:
                     if mount_name == "root":
@@ -601,7 +588,8 @@ def _autodetect_mount(self, mountpoint) -> None:
     mount_name = "root" if mountpoint == "/" else mountpoint.removeprefix("/")
     if mount_name in self["mounts"] and any(s_type in self["mounts"][mount_name] for s_type in SOURCE_TYPES):
         return self.logger.warning(
-            "[%s] Mount config already set: %s" % (mountpoint, pretty_print(self["mounts"][mount_name]))
+            "[%s] Skipping autodetection, mount config already set:\n%s"
+            % (colorize(mountpoint, "yellow"), pretty_print(self["mounts"][mount_name]))
         )
 
     mount_config = {mount_name: {"type": "auto", "options": ["ro"]}}  # Default to auto and ro