Skip to content

Commit

Permalink
Merge branch 'main' into g-marconet/checkov-3
Browse files Browse the repository at this point in the history
  • Loading branch information
g-marconet authored Oct 22, 2024
2 parents b3c996f + fd1c5d6 commit 754a37e
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion backend/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ pytest-httpserver = "~=1.1"
pytest-subtests = "~=0.13"
python-dotenv = "~=1.0"
responses = "~=0.25.3"
ruff = "~=0.6.4"
ruff = "~=0.7.0"
38 changes: 19 additions & 19 deletions backend/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions backend/engine/plugins/node_dependencies/parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ def _find_versions_v2(lockfile: dict, nodes: list, resolver: LineNumberResolver)
for node in nodes:
pkg = lockfile["packages"][node]
path = f"/{node}".replace("/node_modules/", ">")[1:]
source = resolver.find(pkg["integrity"]) or resolver.find(path)
source = resolver.find(pkg.get("integrity")) or resolver.find(path)
versions.append(
{
"path": path,
"version": pkg["version"],
"integrity": pkg["integrity"],
"integrity": pkg.get("integrity", ""),
"dev": pkg.get("dev", False),
"filename": source["filename"],
"line": source["line"],
"filename": source.get("filename", ""),
"line": source.get("line", 0),
}
)
return versions
2 changes: 1 addition & 1 deletion orchestrator/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ pylint = "~=3.2"
pytest = "~=8.3"
pytest-cov = "~=5.0"
responses = "~=0.25.3"
ruff = "==0.6.4"
ruff = "~=0.7.0"
40 changes: 20 additions & 20 deletions orchestrator/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 754a37e

Please sign in to comment.