Revert configurable directory

Author: ikretz

README.md

@@ -42,8 +42,6 @@ options:
   --dry-run          Verify any installation targets but do not run the package manager command
   --log-level LEVEL  Desired logging level (default: WARNING, options: DEBUG, INFO, WARNING, ERROR)
   --executable PATH  Python or npm executable to use for running commands (default: environmentally determined)
-  --verifiers PATH   Directory from which installation target verifiers should be sourced (default: scfw/verifiers)
-  --loggers PATH     Directory from which loggers should be sourced (default: scfw/loggers)
 ```
 
 ### Compatibility

scfw/cli.py

@@ -57,22 +57,6 @@ def _cli() -> ArgumentParser:
         help="Python or npm executable to use for running commands (default: environmentally determined)"
     )
 
-    parser.add_argument(
-        "--verifiers",
-        type=str,
-        default=None,
-        metavar="PATH",
-        help="Directory from which installation target verifiers should be sourced (default: scfw/verifiers)"
-    )
-
-    parser.add_argument(
-        "--loggers",
-        type=str,
-        default=None,
-        metavar="PATH",
-        help="Directory from which loggers should be sourced (default: scfw/loggers)"
-    )
-
     return parser
 
 

scfw/firewall.py

@@ -33,7 +33,7 @@ def run_firewall() -> int:
             return 0
 
         log.setLevel(args.log_level)
-        logs = loggers.get_firewall_loggers(args.loggers)
+        logs = loggers.get_firewall_loggers()
 
         log.info(f"Starting supply-chain firewall on {time.asctime(time.localtime())}")
         log.info(f"Command: '{' '.join(args.command)}'")
@@ -44,7 +44,7 @@ def run_firewall() -> int:
         log.info(f"Command would install: [{', '.join(map(str, targets))}]")
 
         if targets:
-            verifiers = verifs.get_install_target_verifiers(args.verifiers)
+            verifiers = verifs.get_install_target_verifiers()
             log.info(
                 f"Using installation target verifiers: [{', '.join(v.name() for v in verifiers)}]"
             )

scfw/loggers/__init__.py

@@ -15,37 +15,33 @@ def load_logger() -> FirewallLogger
 ```
 
 This `load_logger` function should return an instance of the custom logger
-for the firewall's use. The module may then be placed in the directory configured
-on the command line (in this directory otherwise) from which loggers should be
-sourced for runtime import.
+for the firewall's use. The module may then be placed in the same directory
+as this source file for runtime import. Make sure to reinstall the package
+after doing so.
 """
 
 import importlib
 import logging
 import os
 import pkgutil
-from typing import Optional
 
 from scfw.logger import FirewallLogger
 
 _log = logging.getLogger(__name__)
 
 
-def get_firewall_loggers(source: Optional[str]) -> list[FirewallLogger]:
+def get_firewall_loggers() -> list[FirewallLogger]:
     """
     Return the currently discoverable set of client loggers.
 
-    Args:
-        source: An optional direction from which to source loggers.
-
     Returns:
         A `list` of the discovered `FirewallLogger`s.
     """
     loggers = []
 
-    for _, module, _ in pkgutil.iter_modules([source if source else os.path.dirname(__file__)]):
+    for _, module, _ in pkgutil.iter_modules([os.path.dirname(__file__)]):
         try:
-            logger = importlib.import_module(module).load_logger()
+            logger = importlib.import_module(f".{module}", package=__name__).load_logger()
             loggers.append(logger)
         except ModuleNotFoundError:
             _log.warning(f"Failed to load module {module} while collecting loggers")

scfw/verifiers/__init__.py

@@ -17,37 +17,33 @@ def load_verifier() -> InstallTargetVerifier
 ```
 
 This `load_verifier` function should return an instance of the custom verifier
-for the firewall's use. The module may then be placed in the directory configured
-on the command line (in this directory otherwise) from which verifiers should be
-sourced for runtime import.
+for the firewall's use. The module may then be placed in the same directory
+as this source file for runtime import. Make sure to reinstall the package
+after doing so.
 """
 
 import importlib
 import logging
 import os
 import pkgutil
-from typing import Optional
 
 from scfw.verifier import InstallTargetVerifier
 
 _log = logging.getLogger(__name__)
 
 
-def get_install_target_verifiers(source: Optional[str]) -> list[InstallTargetVerifier]:
+def get_install_target_verifiers() -> list[InstallTargetVerifier]:
     """
     Return the currently discoverable set of installation target verifiers.
 
-    Args:
-        source: An optional directory from which to source verifiers.
-
     Returns:
         A list of the discovered installation target verifiers.
     """
     verifiers = []
 
-    for _, module, _ in pkgutil.iter_modules([source if source else os.path.dirname(__file__)]):
+    for _, module, _ in pkgutil.iter_modules([os.path.dirname(__file__)]):
         try:
-            verifier = importlib.import_module(module).load_verifier()
+            verifier = importlib.import_module(f".{module}", package=__name__).load_verifier()
             verifiers.append(verifier)
         except ModuleNotFoundError:
             _log.warning(f"Failed to load module {module} while collecting installation target verifiers")