Merge pull request #496 from DataDog/s.obregoso/update_pkgs_and_top

Fix tests and upgrade pkgs
DataDog · Dec 5, 2024 · 97be47b · 97be47b
2 parents 9ea476c + 329bcc5
commit 97be47b
Show file tree

Hide file tree

Showing 8 changed files with 24,399 additions and 23,800 deletions.
diff --git a/guarddog/analyzer/metadata/resources/top_npm_packages.json b/guarddog/analyzer/metadata/resources/top_npm_packages.json
diff --git a/guarddog/analyzer/metadata/resources/top_pypi_packages.json b/guarddog/analyzer/metadata/resources/top_pypi_packages.json
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ guarddog = "guarddog.cli:cli"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4"
-semgrep = "1.67.0"
+semgrep = "^1.97.0"
 requests = "^2.29.0"
 python-dateutil = "^2.8.2"
 click = "^8.1.3"

diff --git a/requirements-dev.txt b/requirements-dev.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/tests/analyzer/metadata/test_typosquatting.py b/tests/analyzer/metadata/test_typosquatting.py
@@ -48,7 +48,7 @@ class TestTyposquatting:
         ("github.com/gin-golangnic/gin", "github.com/gin-gonic/gin")
     ]
 
-    negative_cases = ["hello-world", "foo", "bar"]
+    negative_cases = ["hello-world", "foo"] 
     same_names = ["pip", "Numpy", "openCv-python", "requests_oauthlib"]
 
     @pytest.mark.parametrize("typo_name, real_name", pypi_typosquats)

diff --git a/tests/reporters/test_sarif.py b/tests/reporters/test_sarif.py
@@ -156,5 +156,5 @@ def monkey_localscan(*args, **kwargs):
         with open(os.path.join(tmp_dirname, "results.sarif"), "w") as fd:
             fd.write(raw_output)
         sarif_data = load_sarif_file(os.path.join(tmp_dirname, "results.sarif"))
-        stats = sarif_data.get_result_count_by_severity()
-        assert stats["warning"] == warning_count
+        stats_warning = sarif_data.get_report().get_issue_count_for_severity("warning")
+        assert stats_warning == warning_count