Resolve filepaths before scanning for changes #1069
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
cvgw
force-pushed
the
u/cgwippern/implement-filepath-resolver
branch
5 times, most recently
from
ade927b to
92cef5c
Compare
cvgw
force-pushed
the
u/cgwippern/implement-filepath-resolver
branch
from
92cef5c to
a675ad9
Compare
samos123
reviewed
Feb 21, 2020
samos123
reviewed
Feb 21, 2020
samos123
reviewed
Feb 21, 2020
tejal29
reviewed
Feb 21, 2020
|
|
||
| for _, file := range files { | ||
| file = filepath.Clean(file) | ||
| filesSet[file] = true |
There was a problem hiding this comment.
you can skip traversing if fileSet[file] = true
Suggested change
| filesSet[file] = true | |
| if _, ok := fileSet[file] ; !ok { | |
| filesSet[file] = true | |
| for _, dir := range util.ParentDirectories(file) { | |
| dir = filepath.Clean(dir) | |
| filesSet[dir] = true | |
| } | |
| } |
There was a problem hiding this comment.
The function filesWithParentDirs was copy/pasted from the util pkg. If you think it won't clutter the change I'm happy to take this opportunity to make these updates.
tejal29
suggested changes
Feb 21, 2020
| } | ||
| } | ||
|
|
||
| newFiles := []string{} |
There was a problem hiding this comment.
We can optimize this by allocation memory of expected size
newFiles := make([]string, 0, len(filesSet))
| } | ||
|
|
||
| if target != newPath { | ||
| last = filepath.Base(newPath) |
There was a problem hiding this comment.
I don't believe so. We want to return the link, not the target.
cvgw
force-pushed
the
u/cgwippern/implement-filepath-resolver
branch
3 times, most recently
from
012d8cd to
ce8eebb
Compare
cvgw
force-pushed
the
u/cgwippern/implement-filepath-resolver
branch
2 times, most recently
from
b380112 to
2f2914d
Compare
cvgw
force-pushed
the
u/cgwippern/implement-filepath-resolver
branch
from
2f2914d to
965b606
Compare
tejal29
approved these changes
Feb 25, 2020
dinvlad
added a commit
to broadinstitute/dsp-appsec-infrastructure-apps
that referenced
this pull request
Mar 6, 2020
This is needed until 'latest'/'debug' tag is applied to GoogleContainerTools/kaniko#1069
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.
Description
Implement the new filepath resolver described in https://github.com/GoogleContainerTools/kaniko/blob/d31d2bc74c884ff5d7932b1f6e7209c6fc63cc5e/docs/design_proposals/filesystem-resolution-proposal-01.md
One change to note is that ancestor directories will no longer be added regardless of whether they are changed. The ancestor directory logic now occurs before the change checking, so ancestor directories will only be added if they have changed.
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Reviewer Notes