Fix bug in copy command by refactoring whitelist checks #231
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
priyawadhwa
changed the title
priyawadhwa
changed the title
dlorenc
approved these changes
Jul 10, 2018
bobcatfish
added a commit
to bobcatfish/kaniko
that referenced
this pull request
Aug 24, 2018
This test had previously (before GoogleContainerTools#231) been making a change to a file in the kaniko dir, then checking that it isn't being snapshotted. This was to test the whitelisting logic, which makes sure that changes to /kaniko aren't included in images. However the test creates a temporary dir, so the kaniko dir is actually in /tmp/<some temp dir>/kaniko, and in GoogleContainerTools#231 the logic was simplified to no longer have a special case for tests. The test continued to pass because `MaybeAdd` noticed that the kaniko file wasn't changing, and didn't add it. After changing this to always add the files, it revealed that this was left behind by accident. I also opened GoogleContainerTools#307 to add integration test coverage for this logic. I also marked `CheckErrorAndDeepEqual` as a helper function so that when it fails, the line number reported is where that was called.
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.
Should fix #221
The bug was coming from an incorrect whitelist check in RelativeFiles -- I noticed that we had two functions for checking the whitelist in
fs_util.goso I removed the one that was broken and replaced all instances of it withCheckWhitelistwhich is more straightforward.