Handle relative paths #740
Merged
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
Signed-off-by: Szymon Gibała <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #740 +/- ##
==========================================
+ Coverage 71.87% 72.16% +0.28%
==========================================
Files 87 87
Lines 11854 11912 +58
==========================================
+ Hits 8520 8596 +76
+ Misses 3334 3316 -18 |
Signed-off-by: Szymon Gibała <[email protected]>
Signed-off-by: Szymon Gibała <[email protected]>
Furisto
reviewed
Feb 26, 2022
| self.root_path = path | ||
| .into() | ||
| .canonicalize() | ||
| .context("failed to canonicalize root path")?; |
There was a problem hiding this comment.
Suggested change
| .context("failed to canonicalize root path")?; | |
| .with_context(||format!("failed to canonicalize root path {:?}", path))?; |
There was a problem hiding this comment.
Needed to adjust it slightly as Into<PathBuf> is not Debug.
| Some( | ||
| p.into() | ||
| .canonicalize() | ||
| .context("failed canonicalize pid file path")?, |
There was a problem hiding this comment.
Suggested change
| .context("failed canonicalize pid file path")?, | |
| .with_context(|| format!("failed canonicalize pid file path"))?, |
There was a problem hiding this comment.
Did you mean to add the path here too? Adjusted it similarly to the other one.
Comment on lines
+42
to
+49
| let spec = self.load_spec().context("failed to load spec")?; | ||
| let container_dir = self | ||
| .create_container_dir() | ||
| .context("failed to create container dir")?; | ||
|
|
||
| let mut container = self | ||
| .create_container_state(&container_dir) | ||
| .context("failed to create container state")?; |
Signed-off-by: Szymon Gibała <[email protected]>
Szymongib
force-pushed
the
fix/handle-relative-paths
branch
from
a738f40 to
58fdcb4
Compare
Furisto
approved these changes
Feb 27, 2022
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 improves the handling of relative paths for
root_pathandpid_file. I decided to create the specified directory early indetermine_root_pathif it does not exist, as this seems to be the only way tocanonicalizepath prior to creating container dir (path needs to exist otherwisecanonicalizewill fail). This results in the directory being created for other commands likelistordeletealso which might not be ideal, butruncseems to work this way either so decided to stick with it.Also not sure about canonicalizing those paths in
ContainerBuilderas it disrupts the interface slightly by introducingResult<Self>as a return type to some methods, however, I did not find a better place for that so if anyone has some suggestions please let me know.Additionally, I have added context to a few errors that made it easier to initially troubleshoot.
Fixes #720