file: Fix incorrect handling of non-existent files in llbsolver's rmPath #4051
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
The os.RemoveAll() call returns nil if the path doesn't exist. When the rmPath function is called with allowNotFound set to false, it doesn't change the behaviour of the function. Change the code so if allowNotFound is set to false, we first check whether the file exists. If it doesn't exist, return an error. Add tests for three relevant cases. Signed-off-by: Jakub Ciolek <jakub@ciolek.dev>
908b89d to
ce43956
Compare
|
To clarify further, I have stumbled upon this while tinkering with a LLB client. Reproducer: func main() {
bk := llb.Scratch().File(llb.Rm("/not_found", llb.WithAllowNotFound(false)))
dt, _ := bk.Marshal(context.TODO(), llb.LinuxAmd64)
llb.WriteTo(dt, os.Stdout)
}As of 8656037, passing a WithAllowNotFound option doesn't seem to have an effect on the build. |
tonistiigi
approved these changes
Aug 24, 2023
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.
The os.RemoveAll() call returns nil if the path doesn't exist. When the rmPath function is called with allowNotFound set to false, it doesn't change the behaviour of the function.
Change the code so if allowNotFound is set to false, we first check whether the file exists. If it doesn't exist, return an error.
Add tests for three relevant cases.