From c7012514ebeaec84041e54634beb3cda2e23378c Mon Sep 17 00:00:00 2001
From: Daniel D'Avella <dan.davella@pixee.ai>
Date: Wed, 20 Nov 2024 19:29:32 -0500
Subject: [PATCH] Remove restriction on duplicate sarif tools

---
 src/codemodder/codemodder.py   |  4 ++--
 src/codemodder/sarifs.py       | 11 -----------
 tests/test_sarif_processing.py | 15 +++++++--------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/codemodder/codemodder.py b/src/codemodder/codemodder.py
index 8abf1f45..c1d88a37 100644
--- a/src/codemodder/codemodder.py
+++ b/src/codemodder/codemodder.py
@@ -19,7 +19,7 @@
 from codemodder.project_analysis.file_parsers.package_store import PackageStore
 from codemodder.project_analysis.python_repo_manager import PythonRepoManager
 from codemodder.result import ResultSet
-from codemodder.sarifs import DuplicateToolError, detect_sarif_tools
+from codemodder.sarifs import detect_sarif_tools
 from codemodder.semgrep import run as run_semgrep
 
 
@@ -235,7 +235,7 @@ def _run_cli(original_args) -> int:
         tool_result_files_map: DefaultDict[str, list[Path]] = detect_sarif_tools(
             [Path(name) for name in argv.sarif or []]
         )
-    except (DuplicateToolError, FileNotFoundError) as err:
+    except FileNotFoundError as err:
         logger.error(err)
         return 1
 
diff --git a/src/codemodder/sarifs.py b/src/codemodder/sarifs.py
index f155e2b7..85f4157b 100644
--- a/src/codemodder/sarifs.py
+++ b/src/codemodder/sarifs.py
@@ -15,9 +15,6 @@ def detect(cls, run_data: dict) -> bool:
         pass
 
 
-class DuplicateToolError(ValueError): ...
-
-
 def detect_sarif_tools(filenames: list[Path]) -> DefaultDict[str, list[Path]]:
     results: DefaultDict[str, list[Path]] = defaultdict(list)
 
@@ -42,15 +39,7 @@ def detect_sarif_tools(filenames: list[Path]) -> DefaultDict[str, list[Path]]:
                 try:
                     if det.detect(run):
                         logger.debug("detected %s sarif: %s", name, fname)
-                        # According to the Codemodder spec, it is invalid to have multiple SARIF results for the same tool
-                        # https://github.com/pixee/codemodder-specs/pull/36
-                        if name in results:
-                            raise DuplicateToolError(
-                                f"duplicate tool sarif detected: {name}"
-                            )
                         results[name].append(Path(fname))
-                except DuplicateToolError as err:
-                    raise err
                 except (KeyError, AttributeError, ValueError):
                     continue
 
diff --git a/tests/test_sarif_processing.py b/tests/test_sarif_processing.py
index 6b90426e..b4e75d2b 100644
--- a/tests/test_sarif_processing.py
+++ b/tests/test_sarif_processing.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from codemodder.sarifs import DuplicateToolError, detect_sarif_tools
+from codemodder.sarifs import detect_sarif_tools
 from codemodder.semgrep import SemgrepResult, SemgrepResultSet
 
 
@@ -102,15 +102,14 @@ def test_codeql_sarif_input_two_sarifs_same_tool(self, tmpdir):
             check=False,
             capture_output=True,
         )
-        assert completed_process.returncode == 1
-        assert (
-            "duplicate tool sarif detected: codeql" in completed_process.stderr.decode()
-        )
+        assert completed_process.returncode == 0
 
     def test_two_sarifs_same_tool(self):
-        with pytest.raises(DuplicateToolError) as exc:
-            detect_sarif_tools([Path("tests/samples/webgoat_v8.2.0_codeql.sarif")] * 2)
-        assert "duplicate tool sarif detected: codeql" in str(exc.value)
+        results = detect_sarif_tools(
+            [Path("tests/samples/webgoat_v8.2.0_codeql.sarif")] * 2
+        )
+        assert len(results) == 1
+        assert len(results["codeql"]) == 2
 
     def test_bad_sarif(self, tmpdir, caplog):
         sarif_file = Path("tests") / "samples" / "semgrep.sarif"