feat: remove eventgen.conf support

Author: artemrys

pytest_splunk_addon/standard_lib/sample_generation/eventgen_parser.py

@@ -17,24 +17,23 @@
 import re
 import logging
 from splunk_appinspect import App
-from .rule import Rule, raise_warning
+from .rule import raise_warning
 from . import SampleStanza
 
 LOGGER = logging.getLogger("pytest-splunk-addon")
-import warnings
 
 
 class EventgenParser:
     """
     This class represents the entire eventgen.conf file and handles parsing mechanism of eventgen and the rules.
 
     Args:
-        addon_path (str): Path to the Splunk App
+        addon_path: Path to the Splunk App
     """
 
     conf_name = " "
 
-    def __init__(self, addon_path, config_path=None):
+    def __init__(self, addon_path: str, config_path: str):
         self._app = App(addon_path, python_analyzer_enable=False)
         self.config_path = config_path
         self._eventgen = None
@@ -84,31 +83,14 @@ def eventgen(self):
                 path = self._app.get_filename(
                     relative_path, "pytest-splunk-addon-data.conf"
                 )
-
-            elif os.path.exists(os.path.join(self.config_path, "eventgen.conf")):
-
-                self._eventgen = self._app.get_config(
-                    "eventgen.conf", dir=relative_path
-                )
-                self.conf_name = "eventgen"
-                path = self._app.get_filename(relative_path, "eventgen.conf")
-
-            else:
-                self._eventgen = self._app.get_config("eventgen.conf")
-                self.conf_name = "eventgen"
-                path = self._app.get_filename("default", "eventgen.conf")
-            LOGGER.info(
-                "Using Eventgen path: {e}\nUsing Conf file name: {c}".format(
-                    e=path, c=self.conf_name
+                LOGGER.info(
+                    f"Using Eventgen path: {path}\nUsing Conf file name: {self.conf_name}"
                 )
-            )
             return self._eventgen
 
         except OSError:
-            LOGGER.warning("pytest-splunk-addon-data.conf/eventgen.conf not Found")
-            raise FileNotFoundError(
-                "pytest-splunk-addon-data.conf/eventgen.conf not Found"
-            )
+            LOGGER.warning("pytest-splunk-addon-data.conf not found")
+            raise FileNotFoundError("pytest-splunk-addon-data.conf not found")
 
     def get_sample_stanzas(self):
         """

pytest_splunk_addon/standard_lib/sample_generation/sample_generator.py

@@ -44,9 +44,7 @@ def get_samples(self):
         Generate SampleEvent object
         """
         if not SampleGenerator.sample_stanzas:
-            eventgen_parser = EventgenParser(
-                self.addon_path, config_path=self.config_path
-            )
+            eventgen_parser = EventgenParser(self.addon_path, self.config_path)
             sample_stanzas = list(eventgen_parser.get_sample_stanzas())
             SampleGenerator.conf_name = eventgen_parser.conf_name
             with ThreadPoolExecutor(min(20, max(len(sample_stanzas), 1))) as t:

tests/unit/tests_standard_lib/tests_sample_generation/test_eventgen_parser.py

@@ -69,25 +69,11 @@ def test_path_to_samples(self, eventgen_parser, exist_path):
         ), patch("os.path.abspath", lambda x: x), patch("os.sep", "/"):
             assert ep.path_to_samples == path
 
-    @pytest.mark.parametrize(
-        "exist_path, expected, args, kwargs",
-        [
-            (
-                f"{CONFIG_PATH}/pytest-splunk-addon-data.conf",
-                DATA_CONFIG,
-                ("pytest-splunk-addon-data.conf",),
-                {"dir": "relpath_/config/path"},
-            ),
-            (
-                f"{CONFIG_PATH}/eventgen.conf",
-                DATA_CONFIG,
-                ("eventgen.conf",),
-                {"dir": "relpath_/config/path"},
-            ),
-            (f"{CONFIG_PATH}/other", DATA_CONFIG, ("eventgen.conf",), {}),
-        ],
-    )
-    def test_eventgen(self, eventgen_parser, exist_path, expected, args, kwargs):
+    def test_eventgen(self, eventgen_parser):
+        exist_path = f"{CONFIG_PATH}/pytest-splunk-addon-data.conf"
+        expected = DATA_CONFIG
+        args = ("pytest-splunk-addon-data.conf",)
+        kwargs = {"dir": "relpath_/config/path"}
         ep = eventgen_parser(ADDON_PATH, CONFIG_PATH)
         path = exist_path
         app_mock = MagicMock(spec=App)
@@ -104,7 +90,7 @@ def test_eventgen_os_error(self, eventgen_parser):
         with patch("os.path.exists", MagicMock(side_effect=OSError)):
             with pytest.raises(
                 FileNotFoundError,
-                match="pytest-splunk-addon-data.conf/eventgen.conf not Found",
+                match="pytest-splunk-addon-data.conf not found",
             ):
                 ep.eventgen