CM-53944-Simplified the extension exclude logic and added tests

Author: galf16

cycode/cli/files_collector/file_excluder.py

@@ -74,7 +74,7 @@ def _is_file_prefix_supported(self, scan_type: str, file_path: str) -> bool:
         if scannable_prefixes:
             path = Path(file_path)
             file_name = path.name.lower()
-            return file_name.startswith(scannable_prefixes)
+            return file_name in scannable_prefixes
         return False
 
     def _is_file_extension_supported(self, scan_type: str, filename: str) -> bool:
@@ -104,8 +104,8 @@ def _is_relevant_file_to_scan_common(self, scan_type: str, filename: str) -> boo
             )
             return False
 
-        if (not self._is_file_extension_supported(scan_type, filename)
-                and not self._is_file_prefix_supported(scan_type, filename)):
+        if not (self._is_file_extension_supported(scan_type, filename)
+                or self._is_file_prefix_supported(scan_type, filename)):
             logger.debug(
                 'The document is irrelevant because its extension is not supported, %s',
                 {'scan_type': scan_type, 'filename': filename},

tests/cli/files_collector/test_file_excluder.py

@@ -2,7 +2,7 @@
 
 from cycode.cli import consts
 from cycode.cli.files_collector.file_excluder import _is_file_relevant_for_sca_scan
-
+from cycode.cli.files_collector.file_excluder import Excluder
 
 class TestIsFileRelevantForScaScan:
     """Test the SCA path exclusion logic."""
@@ -38,6 +38,21 @@ def test_files_with_excluded_names_in_filename_should_be_included(self) -> None:
         assert _is_file_relevant_for_sca_scan('utils/pycache_cleaner.py') is True
         assert _is_file_relevant_for_sca_scan('config/gradle_config.xml') is True
 
+    def test_files_with_excluded_extensions_in_should_be_included(self) -> None:
+        """Test that files containing excluded directory names in their filename are NOT excluded."""
+        # These should be INCLUDED because the excluded terms are in the filename, not directory path
+        excluder = Excluder()
+        assert excluder._is_relevant_file_to_scan_common('iac','project/cfg/Dockerfile') is True
+        assert excluder._is_relevant_file_to_scan_common('iac','project/cfg/build.tf') is True
+        assert excluder._is_relevant_file_to_scan_common('iac', 'project/cfg/build.tf.json') is True
+        assert excluder._is_relevant_file_to_scan_common('iac', 'project/cfg/config.json') is True
+        assert excluder._is_relevant_file_to_scan_common('iac', 'project/cfg/config.yaml') is True
+        assert excluder._is_relevant_file_to_scan_common('iac', 'project/cfg/config.yml') is True
+        assert excluder._is_relevant_file_to_scan_common('iac','project/cfg/build') is False
+        assert excluder._is_relevant_file_to_scan_common('iac', 'project/cfg/build') is False
+        assert excluder._is_relevant_file_to_scan_common('iac', 'project/cfg/Dockerfile.txt') is False
+        assert excluder._is_relevant_file_to_scan_common('iac', 'project/cfg/config.ini') is False
+
     def test_files_in_regular_directories_should_be_included(self) -> None:
         """Test that files in regular directories (not excluded) are included."""