chore: fix precommit

Author: sgoral-splunk

solnlib/conf_manager.py

@@ -37,6 +37,7 @@
 )
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 __all__ = [

solnlib/file_monitor.py

@@ -25,6 +25,7 @@
 from typing import Any, Callable, List
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 
@@ -49,7 +50,9 @@ def __init__(self, callback: Callable[[List[str]], Any], files: List):
             try:
                 self.file_mtimes[k] = op.getmtime(k)
             except OSError:
-                logging.debug(f"Getmtime for {k}, failed: {traceback.format_exc()}")  # deprecated
+                logging.debug(
+                    f"Getmtime for {k}, failed: {traceback.format_exc()}"
+                )  # deprecated
                 logger.debug(f"Getmtime for {k}, failed: {traceback.format_exc()}")
 
     def check_changes(self) -> bool:

solnlib/log.py

@@ -25,7 +25,14 @@
 from typing import Dict, Any
 
 from .pattern import Singleton
-from .splunkenv import make_splunkhome_path
+
+try:
+    from splunk.clilib.bundle_paths import make_splunkhome_path as msp
+except ImportError:
+
+    def msp(*args, **kwargs):
+        raise ImportError("This module requires Splunk to be installed.")
+
 
 __all__ = ["log_enter_exit", "LogException", "Logs"]
 
@@ -147,7 +154,7 @@ def _get_log_file(cls, name):
             directory = cls._default_directory
         else:
             try:
-                directory = make_splunkhome_path(["var", "log", "splunk"])
+                directory = msp(["var", "log", "splunk"])
             except KeyError:
                 raise LogException(
                     "Log directory is empty, please set log directory "

solnlib/modular_input/checkpointer.py

@@ -31,6 +31,7 @@
 from solnlib import _utils, utils
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 __all__ = ["CheckpointerException", "KVStoreCheckpointer", "FileCheckpointer"]

solnlib/modular_input/modinput.py

@@ -21,6 +21,7 @@
 import solnlib.splunkenv as sp
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 

solnlib/modular_input/modular_input.py

@@ -35,6 +35,7 @@
 from . import checkpointer, event_writer
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 __all__ = ["ModularInputException", "ModularInput"]

solnlib/rest.py

@@ -29,14 +29,14 @@
 
 
 def splunkd_request(
-        splunkd_uri,
-        session_key,
-        method="GET",
-        headers=None,
-        data=None,
-        timeout=300,
-        retry=1,
-        verify=False,
+    splunkd_uri,
+    session_key,
+    method="GET",
+    headers=None,
+    data=None,
+    timeout=300,
+    retry=1,
+    verify=False,
 ) -> Optional[requests.Response]:
     headers = headers if headers is not None else {}
     headers["Authorization"] = f"Splunk {session_key}"
@@ -68,15 +68,21 @@ def splunkd_request(
             )
         except Exception as e:
             logging.error(msg_temp, splunkd_uri, "unknown", format_exc())  # deprecated
-            log_exception(logger, e, exc_label="unknown",
-                          msg_before=f"Failed to send rest request={splunkd_uri}, errcode=unknown")
+            log_exception(
+                logger,
+                e,
+                exc_label="unknown",
+                msg_before=f"Failed to send rest request={splunkd_uri}, errcode=unknown",
+            )
         else:
             if resp.status_code not in (200, 201):
                 if not (method == "GET" and resp.status_code == 404):
                     logging.debug(
                         msg_temp, splunkd_uri, resp.status_code, code_to_msg(resp)
                     )  # deprecated
-                    logger.debug(msg_temp, splunkd_uri, resp.status_code, code_to_msg(resp))
+                    logger.debug(
+                        msg_temp, splunkd_uri, resp.status_code, code_to_msg(resp)
+                    )
             else:
                 return resp
     else:

solnlib/splunk_rest_client.py

@@ -35,6 +35,7 @@
 from .splunkenv import get_splunkd_access_info
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 __all__ = ["SplunkRestClient"]

solnlib/timer_queue.py

@@ -26,6 +26,7 @@
 import sortedcontainers as sc
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 
@@ -123,6 +124,7 @@ def remove_timer(self, timer: Timer):
         """
 
         try:
+            raise ValueError
             self._timers.remove(timer)
         except ValueError:
             logging.info(

solnlib/utils.py

@@ -27,6 +27,7 @@
 
 
 from solnlib.log import Logs
+
 logger = Logs().get_logger(__name__)
 
 __all__ = [