chore: minor adjusstments and ut fixes

Author: mkolasinski-splunk

pytest_splunk_addon/fields_tests/test_generator.py

@@ -270,9 +270,7 @@ def generate_requirements_tests(self):
                 }
 
                 if event.metadata.get("ingest_with_uuid"):
-                    unique_identifier = getattr(event, "unique_identifier", None)
-                    if unique_identifier is not None:
-                        sample_event["unique_identifier"] = unique_identifier
+                    sample_event["unique_identifier"] = event.unique_identifier
 
                 yield pytest.param(
                     sample_event,

pytest_splunk_addon/fields_tests/test_templates.py

@@ -166,9 +166,7 @@ def test_requirements_fields(
             "unique_identifier"
         )
         escaped_event = splunk_searchtime_fields_requirements.get("escaped_event")
-        event_identifier = (
-            unique_identifier if unique_identifier is not None else escaped_event
-        )
+        event_identifier = unique_identifier or escaped_event
 
         record_property("Event_with", event_identifier)
         record_property("fields", splunk_searchtime_fields_requirements["fields"])
@@ -190,9 +188,9 @@ def test_requirements_fields(
             if param_value is not None:
                 basic_search += f" {param}={param_value}"
 
-        if unique_identifier is not None:
+        if unique_identifier:
             selector = f'unique_identifier="{unique_identifier}"'
-        elif escaped_event is not None:
+        elif escaped_event:
             selector = escaped_event
         else:
             selector = ""

pytest_splunk_addon/sample_generation/sample_stanza.py

@@ -104,7 +104,6 @@ def tokenize(self, conf_name):
                 if each_rule:
                     raw_event[event_counter] = each_rule.apply(raw_event[event_counter])
             for event in raw_event[event_counter]:
-                # Assign UUID per finalized event to ensure uniqueness across variants
                 if event.metadata.get("ingest_with_uuid"):
                     event.unique_identifier = str(uuid.uuid4())
 

pytest_splunk_addon/sample_generation/sample_xdist_generator.py

@@ -33,7 +33,9 @@ class SampleXdistGenerator:
         process_count (num): generate {no} process for execution
     """
 
-    def __init__(self, addon_path, ingest_with_uuid: bool, config_path=None, process_count=4):
+    def __init__(
+        self, addon_path, ingest_with_uuid: bool, config_path=None, process_count=4
+    ):
         self.addon_path = addon_path
         self.process_count = process_count
         self.config_path = config_path

tests/unit/tests_standard_lib/test_event_ingestors/test_ingestor_helper.py

@@ -124,7 +124,7 @@ def test_events_can_be_ingested(
     get_ingestor_mock, sample_mock, file_monitor_events, modinput_events
 ):
     event_ingestors.ingestor_helper.IngestorHelper.ingest_events(
-        ingest_meta_data={"ingest_with_uuid": "false"},
+        ingest_meta_data={"ingest_with_uuid": False},
         addon_path="fake_path",
         config_path="tests/unit/event_ingestors",
         thread_count=20,
@@ -133,8 +133,8 @@ def test_events_can_be_ingested(
     assert get_ingestor_mock.call_count == 2
     get_ingestor_mock.assert_has_calls(
         [
-            call("file_monitor", {"ingest_with_uuid": "false"}),
-            call("modinput", {"ingest_with_uuid": "false"}),
+            call("file_monitor", {"ingest_with_uuid": False}),
+            call("modinput", {"ingest_with_uuid": False}),
         ],
         any_order=True,
     )

tests/unit/tests_standard_lib/tests_sample_generation/test_sample_stanza.py

@@ -30,7 +30,7 @@ def get_params_for_get_raw_sample():
                     {
                         "input_type": input_type,
                         "host": "path_to.file_1",
-                        "ingest_with_uuid": "false",
+                        "ingest_with_uuid": False,
                     },
                     "path_to.file",
                 ],
@@ -54,7 +54,7 @@ def get_params_for_get_raw_sample():
                     {
                         "input_type": input_type,
                         "host": "path_to.file",
-                        "ingest_with_uuid": "false",
+                        "ingest_with_uuid": False,
                     },
                     "path_to.file",
                 ],
@@ -74,7 +74,7 @@ def func(
                 "pytest_splunk_addon.sample_generation.sample_stanza.Rule",
                 MagicMock(return_value=rule_mock_value),
             ):
-                ss = SampleStanza(SAMPLE_PATH, psa_data_params, "false")
+                ss = SampleStanza(SAMPLE_PATH, psa_data_params, False)
             return ss
 
         return func
@@ -194,7 +194,7 @@ def test_parse_meta(
                 "expected_event_count": "hh",
                 "count": "ll",
                 "index": 1,
-                "ingest_with_uuid": "false",
+                "ingest_with_uuid": False,
                 "input_type": input_type,
                 "tokens": {
                     "token_1": {"replacementType": "all"},
@@ -208,7 +208,7 @@ def test_parse_meta(
             "host": host,
             "host_type": "plugin",
             "index": 1,
-            "ingest_with_uuid": "false",
+            "ingest_with_uuid": False,
             "input_type": input_type_expected,
             "sample_count": "1",
             "timestamp_type": "plugin",
@@ -223,7 +223,7 @@ def test_get_eventmetadata(self, sample_stanza):
         assert ss.get_eventmetadata() == {
             "host": "path_to.file_1",
             "input_type": "default",
-            "ingest_with_uuid": "false",
+            "ingest_with_uuid": False,
         }
         assert ss.host_count == 1
 
@@ -257,7 +257,7 @@ def test_break_events(self, sample_stanza, sample_raw, expected):
                         "breaker": "aa",
                         "host": "path_to.file_1",
                         "input_type": "default",
-                        "ingest_with_uuid": "false",
+                        "ingest_with_uuid": False,
                     },
                     "path_to.file",
                 ],

tests/unit/tests_standard_lib/tests_sample_generation/test_uuid_e2e_flow.py

@@ -526,9 +526,7 @@ def test_uuid_not_stored_when_disabled(self):
             "os.getcwd", return_value="/fake/path"
         ), patch("os.makedirs"), patch("builtins.open", mock_open()) as open_mock:
 
-            xdist_generator = SampleXdistGenerator(
-                "/fake/addon", False, "/fake/config"
-            )
+            xdist_generator = SampleXdistGenerator("/fake/addon", False, "/fake/config")
             xdist_generator.store_events(events)
 
             # Get the written JSON

tests/unit/tests_standard_lib/tests_sample_generation/test_uuid_generation.py

@@ -40,7 +40,7 @@ def test_uuid_generated_when_flag_enabled(self):
         ), "unique_identifier should be a string"
 
     def test_uuid_not_generated_when_flag_disabled(self):
-        """Verify UUID is NOT generated when ingest_with_uuid is 'false'"""
+        """Verify UUID is NOT generated when ingest_with_uuid is False"""
         metadata = {"ingest_with_uuid": False, "index": "main"}
         event = SampleEvent(
             event_string="test event", metadata=metadata, sample_name="test.sample"