Collect xsiam items for tests even when xsoar supported

Tests/scripts/collect_tests/collect_tests.py

@@ -16,7 +16,7 @@
     DEFAULT_REPUTATION_TESTS, IGNORED_FILE_TYPES, NON_CONTENT_FOLDERS,
     ONLY_INSTALL_PACK_FILE_TYPES, SANITY_TEST_TO_PACK,
     SKIPPED_CONTENT_ITEMS__NOT_UNDER_PACK, XSOAR_SANITY_TEST_NAMES,
-    ALWAYS_INSTALLED_PACKS_MAPPING, MODELING_RULE_COMPONENT_FILES)
+    ALWAYS_INSTALLED_PACKS_MAPPING, MODELING_RULE_COMPONENT_FILES, XSIAM_COMPONENT_FILES)
 from Tests.scripts.collect_tests.exceptions import (
     DeprecatedPackException, IncompatibleMarketplaceException,
     InvalidTestException, NonDictException, NonXsoarSupportedPackException,
@@ -61,6 +61,7 @@ class CollectionReason(str, Enum):
     MODELING_RULE_TEST_DATA_CHANGED = 'modeling rule\'s associated testdata file was changed'
     MODELING_RULE_NIGHTLY = 'nightly testing of modeling rules'
     DUMMY_OBJECT_FOR_COMBINING = 'creating an empty object, to combine two CollectionResult objects'
+    XSIAM_COMPONENT_CHANGED = 'xsiam component was changed'
 
 
 REASONS_ALLOWING_NO_ID_SET_OR_CONF = {
@@ -594,6 +595,54 @@ def _collect_pack_for_modeling_rule(
             is_nightly=is_nightly
         )
 
+    def _collect_pack_for_xsiam_component(
+        self, pack_id: str, reason_description: str, changed_file_path: Path,
+        content_item_range: Optional[VersionRange] = None, is_nightly: bool = False,
+        reason: Optional[CollectionReason] = None
+    ) -> CollectionResult:
+        """Create a CollectionResult for a pack because of an xsiam component.
+
+        Marks the pack being collected and the modeling rule that needs to be tested
+
+        Args:
+            pack_id (str): the id of the pack being collected
+            reason (Optional[CollectionReason]): the reason the pack is being collected. Defaults to None.
+            reason_description (str): the reason the pack is being collected
+            changed_file_path (Path): the path to the file that was modified
+            content_item_range (Optional[VersionRange], optional): version range. Defaults to None.
+            is_nightly (Optional[bool]): whether this is a nightly flow. Defaults to False.
+
+        Returns:
+            CollectionResult: the object detailing the pack to collect and the modeling rule that should be tested
+        """
+        if self.marketplace != MarketplaceVersions.MarketplaceV2:
+            logger.info(f'Not collecting pack {pack_id} for XSIAM component {changed_file_path} because '
+                        f'it is not a collection for an XSIAM (MarketplaceV2) marketplace - '
+                        f'marketplace is {self.marketplace}')
+            raise NothingToCollectException(changed_file_path, 'packs for XSIAM components are only collected for XSIAM')
+
+        pack = PACK_MANAGER.get_pack_metadata(pack_id)
+
+        version_range = content_item_range \
+            if pack.version_range.is_default \
+            else (pack.version_range | content_item_range)
+
+        if not reason:
+            file_type = find_type(changed_file_path.as_posix())
+            reason = f"{CollectionReason.XSIAM_COMPONENT_CHANGED} {file_type.value}"
+
+        return CollectionResult(
+            test=None,
+            modeling_rule_to_test=None,
+            pack=pack_id,
+            reason=reason,
+            version_range=version_range,
+            reason_description=reason_description,
+            conf=self.conf,
+            id_set=self.id_set,
+            is_nightly=is_nightly
+        )
+
     def __validate_skipped_integration(self, id_: str, path: Path):
         if id_ in self.conf.skipped_integrations:
             raise NothingToCollectException(path, 'integration is skipped')
@@ -854,7 +903,7 @@ def _collect_single(self, path: Path) -> Optional[CollectionResult]:
             content_item = ContentItem(path)
             self._validate_content_item_compatibility(content_item, is_integration='Integrations' in path.parts)
         except IncompatibleMarketplaceException:
-            if file_type not in MODELING_RULE_COMPONENT_FILES:
+            if (file_type not in MODELING_RULE_COMPONENT_FILES) and (file_type not in XSIAM_COMPONENT_FILES):
                 raise
         except NonDictException:
             content_item = None  # py, md, etc. Anything not dictionary-based. Suitable logic follows, see collect_yml
@@ -871,6 +920,14 @@ def _collect_single(self, path: Path) -> Optional[CollectionResult]:
                     pack_id=pack_id, reason_description=reason_description,
                     changed_file_path=path, content_item_range=content_item_range
                 )
+
+            if file_type in XSIAM_COMPONENT_FILES:
+                # if the file is an xsiam component and is not a modeling rule
+                return self._collect_pack_for_xsiam_component(
+                    pack_id=pack_id, reason_description=reason_description,
+                    changed_file_path=path, content_item_range=content_item_range
+                )
+
             else:
                 # install pack without collecting tests.
                 return self._collect_pack(
@@ -1225,7 +1282,8 @@ def output(result: Optional[CollectionResult]):
     logger.info(f'collected {len(tests)} test playbooks:\n{test_str}')
     logger.info(f'collected {len(packs_to_install)} packs to install:\n{packs_to_install_str}')
     logger.info(f'collected {len(packs_to_upload)} packs to upload:\n{packs_to_upload_str}')
-    logger.info(f'collected {len(modeling_rules_to_test_str)} modeling rules to test:\n{modeling_rules_to_test_str}')
+    num_of_modeling_rules = len(modeling_rules_to_test_str.split("\n"))
+    logger.info(f'collected {num_of_modeling_rules} modeling rules to test:\n{modeling_rules_to_test_str}')
     logger.info(f'collected {len(machines)} machines: {machine_str}')
 
     PATHS.output_tests_file.write_text(test_str)

Tests/scripts/collect_tests/constants.py

@@ -68,7 +68,6 @@
     FileType.CORRELATION_RULE,
     FileType.XSIAM_DASHBOARD,
     FileType.XSIAM_REPORT,
-    FileType.REPORT,
     FileType.GENERIC_TYPE,
     FileType.GENERIC_FIELD,
     FileType.GENERIC_MODULE,
@@ -122,3 +121,13 @@
     FileType.MODELING_RULE_SCHEMA,
     FileType.MODELING_RULE_TEST_DATA,
 }
+
+XSIAM_COMPONENT_FILES: set[FileType] = {
+    FileType.PARSING_RULE,
+    FileType.CORRELATION_RULE,
+    FileType.XSIAM_DASHBOARD,
+    FileType.XSIAM_REPORT,
+    FileType.TRIGGER,
+    FileType.MODELING_RULE_SCHEMA,
+    FileType.XDRC_TEMPLATE
+}

Tests/scripts/infrastructure_tests/test_collect_tests.py

@@ -12,7 +12,7 @@
     XSOARNightlyTestCollector)
 from Tests.scripts.collect_tests.constants import (
     ALWAYS_INSTALLED_PACKS_MARKETPLACE_V2, MODELING_RULE_COMPONENT_FILES,
-    XSOAR_SANITY_TEST_NAMES, ONLY_INSTALL_PACK_FILE_TYPES)
+    XSOAR_SANITY_TEST_NAMES, ONLY_INSTALL_PACK_FILE_TYPES, XSIAM_COMPONENT_FILES)
 from Tests.scripts.collect_tests.path_manager import PathManager
 from Tests.scripts.collect_tests.utils import FilesToCollect, PackManager
 
@@ -553,8 +553,8 @@ def test_only_collect_pack(mocker, monkeypatch, file_type: collect_tests.FileTyp
                         return_value=FilesToCollect(('Packs/myPack/some_file',), ()))
     mocker.patch('Tests.scripts.collect_tests.collect_tests.find_type', return_value=file_type)
 
-    # packs of modeling rules aren't expected to be collected when collecting for an XSOAR marketplace build
-    expected_packs = ('myPack',) if file_type not in MODELING_RULE_COMPONENT_FILES else ()
+    # packs of xsiam component files aren't expected to be collected when collecting for an XSOAR marketplace build
+    expected_packs = ('myPack',) if file_type not in MODELING_RULE_COMPONENT_FILES.union(XSIAM_COMPONENT_FILES) else ()
 
     # noinspection PyTypeChecker
     _test(monkeypatch, case_mocker=MockerCases.H, collector_class=BranchTestCollector,