Merge branch 'main' into requirement_test/CIM_4_20_DM_update

Author: nandinivij

.pre-commit-config.yaml

@@ -19,6 +19,6 @@ repos:
     hooks:
     -   id: check-merge-conflict
 -   repo: https://github.com/psf/black
-    rev: 21.8b0
+    rev: 21.9b0
     hooks:
     -   id: black

actionlint

@@ -106,7 +106,11 @@ def datamodel_check_test(self, keyValue_dict_SPL, requrement_file_model_list):
             lis_extra_extracted_splunkside,
             list_extra_datamodel_requirement_file,
         ) = self.compare_datamodel(requrement_file_model_list, datamodel_based_on_tag)
-        return list_extra_datamodel_requirement_file, lis_extra_extracted_splunkside, datamodel_based_on_tag
+        return (
+            list_extra_datamodel_requirement_file,
+            lis_extra_extracted_splunkside,
+            datamodel_based_on_tag,
+        )
 
     def remove_empty_keys(self, event):
         event = re.sub(
@@ -138,7 +142,7 @@ def test_requirement_params(
             host = modinput_params["host"]
             source = modinput_params["source"]
             sourcetype = modinput_params["sourcetype"]
-            search = f"search index=* host={host} source={source} sourcetype={sourcetype} {escaped_event}|fields * "
+            search = f"search index=* host=\"{host}\" source=\"{source}\" sourcetype=\"{sourcetype}\" {escaped_event}|fields * "
         else:
             search = f"search index=* {escaped_event} |fields * "
         ingestion_check = splunk_search_util.checkQueryCountIsGreaterThanZero(

pytest_splunk_addon/standard_lib/requirement_tests/test_templates.py

@@ -5,7 +5,7 @@
   <version id="13.21" />
   <event code="" name="EventID_19_WmiEvent_(WmiEventFilter_activity_detected)_Change_All_Changes" format="">
     <version id="" />
-    <transport type="modinput" host="sample_host" source="XmlWinEventLog:Microsoft-Windows-Sysmon/Operational" sourcetype="xmlwineventlog"/>
+    <transport type="modinput" host="sample_host=test" source="XmlWinEventLog:Microsoft-Windows-Sysmon/Operational" sourcetype="xmlwineventlog"/>
     <source>
       <jira id="ADDON-35818 , ADDON-35825" />
       <comment />