Generate composer.lock files #471
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
catching up branch with main
ZoogieZork
reviewed
May 20, 2025
| def install_package_files(include_dev: bool, path: str, root_path: str): | ||
| # Create a composer.lock file if it doesn't already exist | ||
| logger.info( | ||
| f"Generating composer.lock for {path.replace(root_path, '')} (including dev dependencies: {include_dev}" |
Collaborator
There was a problem hiding this comment.
(minor) Missing end paren at the end of the log message.
ZoogieZork
reviewed
May 20, 2025
| docker_client = docker.from_env() | ||
|
|
||
|
|
||
| def install_package_files(include_dev: bool, path: str, root_path: str): |
Collaborator
There was a problem hiding this comment.
Since this function doesn't report errors up, we should document the fact that this is "best effort", i.e. if the composer.lock couldn't be generated then we will continue anyway.
ZoogieZork
reviewed
May 20, 2025
| {"success": not bool(results), "details": results, "errors": lock_file_errors, "alerts": lock_file_alerts} | ||
| ) | ||
| ) | ||
| print(json.dumps({"success": not bool(results), "details": results, "errors": errors, "alerts": alerts})) |
Collaborator
There was a problem hiding this comment.
(minor) Since our JSON results can be quite large, we should switch from using json.dumps (which renders the whole JSON to a string first) to json.dump that renders the output directly to the output, e.g.:
json.dump({ ... }, sys.stdout)
ZoogieZork
reviewed
May 20, 2025
|
|
||
| # Run Composer in a container | ||
| COMPOSER_IMG = "composer:latest" | ||
| container_name = "composer_runner" |
Collaborator
There was a problem hiding this comment.
Container names must be unique, so we should append a UUID.
catching up with main
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Currently, when a directory has a composer.json file and does not have a composer.lock file, we can not use our trivy SCA scanner. Now with this change, a composer.lock file will be auto generated when a directory contains a composer.json file.
Motivation and Context
To extend our SCA language coverage
How Has This Been Tested?
in a development environment
Types of changes
Checklist