Filter sonar issues by status

pixee · Feb 16, 2024 · 94d1e51 · 94d1e51
1 parent 10184d4
commit 94d1e51
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 2 deletions.
diff --git a/src/codemodder/sonar_results.py b/src/codemodder/sonar_results.py
@@ -50,7 +50,8 @@ def from_json(cls, json_file: str | Path) -> Self:
 
             result_set = cls()
             for issue in data.get("issues"):
-                result_set.add_result(SonarResult.from_issue(issue))
+                if issue["status"].lower() == "open":
+                    result_set.add_result(SonarResult.from_issue(issue))
 
             return result_set
         except Exception:

diff --git a/tests/codemods/test_sonar_django_json_response_type.py b/tests/codemods/test_sonar_django_json_response_type.py
@@ -33,6 +33,7 @@ def foo(request):
             "issues": [
                 {
                     "rule": "pythonsecurity:S5131",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 7,

diff --git a/tests/codemods/test_sonar_django_receiver_on_top.py b/tests/codemods/test_sonar_django_receiver_on_top.py
@@ -31,6 +31,7 @@ def foo():
             "issues": [
                 {
                     "rule": "python:S6552",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 5,

diff --git a/tests/codemods/test_sonar_exception_without_raise.py b/tests/codemods/test_sonar_exception_without_raise.py
@@ -21,6 +21,7 @@ def test_simple(self, tmpdir):
             "issues": [
                 {
                     "rule": "python:S3984",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 2,

diff --git a/tests/codemods/test_sonar_fix_assert_tuple.py b/tests/codemods/test_sonar_fix_assert_tuple.py
@@ -23,6 +23,7 @@ def test_simple(self, tmpdir):
             "issues": [
                 {
                     "rule": "python:S5905",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 2,

diff --git a/tests/codemods/test_sonar_flask_json_response_type.py b/tests/codemods/test_sonar_flask_json_response_type.py
@@ -39,6 +39,7 @@ def foo(request):
             "issues": [
                 {
                     "rule": "pythonsecurity:S5131",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 10,

diff --git a/tests/codemods/test_sonar_literal_or_new_object_identity.py b/tests/codemods/test_sonar_literal_or_new_object_identity.py
@@ -23,6 +23,7 @@ def test_list(self, tmpdir):
             "issues": [
                 {
                     "rule": "python:S5796",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 2,

diff --git a/tests/codemods/test_sonar_numpy_nan_equality.py b/tests/codemods/test_sonar_numpy_nan_equality.py
@@ -25,6 +25,7 @@ def test_simple(self, tmpdir):
             "issues": [
                 {
                     "rule": "python:S6725",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 3,

diff --git a/tests/codemods/test_sonar_remove_assertion_in_pytest_raises.py b/tests/codemods/test_sonar_remove_assertion_in_pytest_raises.py
@@ -31,6 +31,7 @@ def foo():
             "issues": [
                 {
                     "rule": "python:S5915",
+                    "status": "OPEN",
                     "component": f"{tmpdir / 'code.py'}",
                     "textRange": {
                         "startLine": 6,

diff --git a/tests/samples/sonar_issues.json b/tests/samples/sonar_issues.json
diff --git a/tests/test_results.py b/tests/test_results.py
@@ -9,6 +9,7 @@ def test_or(self, tmpdir):
             "issues": [
                 {
                     "rule": "rule",
+                    "status": "OPEN",
                     "component": "code.py",
                     "textRange": {
                         "startLine": 2,
@@ -23,6 +24,7 @@ def test_or(self, tmpdir):
             "issues": [
                 {
                     "rule": "rule",
+                    "status": "OPEN",
                     "component": "code.py",
                     "textRange": {
                         "startLine": 1,
@@ -46,6 +48,39 @@ def test_or(self, tmpdir):
         assert result2["rule"][Path("code.py")][0] in combined["rule"][Path("code.py")]
         assert result1["rule"][Path("code.py")][0] in combined["rule"][Path("code.py")]
 
+    def test_sonar_only_open_issues(self, tmpdir):
+        issues = {
+            "issues": [
+                {
+                    "rule": "rule",
+                    "status": "OPEN",
+                    "component": "code.py",
+                    "textRange": {
+                        "startLine": 1,
+                        "endLine": 1,
+                        "startOffset": 1,
+                        "endOffset": 1,
+                    },
+                },
+                {
+                    "rule": "rule",
+                    "status": "RESOLVED",
+                    "component": "code.py",
+                    "textRange": {
+                        "startLine": 1,
+                        "endLine": 1,
+                        "startOffset": 1,
+                        "endOffset": 1,
+                    },
+                },
+            ]
+        }
+        sonar_json1 = Path(tmpdir) / "sonar1.json"
+        sonar_json1.write_text(json.dumps(issues))
+
+        result = SonarResultSet.from_json(sonar_json1)
+        assert len(result["rule"][Path("code.py")]) == 1
+
     def test_sonar_robustness(self, tmpdir):
         sonar_json = Path(tmpdir) / "sonar1.json"
         # not a valid json