Allow to use git executable for fetching advisory database #420
Conversation
This file contains 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
Jake-Shadle
requested changes
May 6, 2022
src/advisories/helpers.rs
Outdated
Comment on lines
11
to
13
| Allow, | ||
| /// If this is true, then cargo deny will use the git executable to fetch advisory database. | ||
| /// If this is false, then it uses a built-in git library. | ||
| Allow(bool), |
There was a problem hiding this comment.
I'd prefer if this was split into distinct variants, the reason the Fetch is an enum is because I avoid bool since it loses too much information, as shown by the need to comment what the bool means in this case.
src/advisories/helpers.rs
Outdated
| fs::create_dir_all(parent)?; | ||
| } | ||
| } else { | ||
| return Err(anyhow!("invalid directory: {}", db_path.display())); |
There was a problem hiding this comment.
Suggested change
| return Err(anyhow!("invalid directory: {}", db_path.display())); | |
| anyhow::bail!("invalid directory: {}", db_path.display()); |
src/advisories/helpers.rs
Outdated
|
|
||
| if let Some(parent) = db_path.parent() { | ||
| if !parent.is_dir() { | ||
| fs::create_dir_all(parent)?; |
There was a problem hiding this comment.
Suggested change
| fs::create_dir_all(parent)?; | |
| fs::create_dir_all(parent).with_context(|| format!("failed to create advisory database directory {}", parent.display())?; |
Jake-Shadle
approved these changes
May 16, 2022
This was referenced May 16, 2022
abernix
added a commit
to apollographql/router
that referenced
this pull request
Jan 19, 2023
It uses its own escape hatch to force use of the CLI, much in the same way that Cargo does. This is critical for Windows. Ref: EmbarkStudios/cargo-deny#420
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR allows the use of the git executable directly instead of using git2 (fetching advisory database only!). This is similar to what cargo does and solves #419 for me.
The option can be selected from deny.toml's advisories section