Use fixed fileutils matching functions #2319
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
aaronlehmann
force-pushed
the
use-fixed-matching-functions
branch
from
3c9e31b to
9872d46
Compare
coryb
reviewed
Aug 21, 2021
There was a problem hiding this comment.
The changes look good to me. It looks like there were tests added to the upstream PR, but I wonder if we should replicate some of those tests here in checksum_test.go? Minimally it looks like we can add something like this to the end of TestChecksumIncludeDoubleStar:
dgst, err = cc.Checksum(context.TODO(), ref, "prefix/a", ChecksumOpts{IncludePatterns: []string{"**/foo", "**/report"}}, nil)
require.NoError(t, err)
// Now there is a file included
require.Equal(t, dgstDoubleStar, dgst)
// Same, with Wildcard = true
dgst, err = cc.Checksum(context.TODO(), ref, "prefix/a", ChecksumOpts{IncludePatterns: []string{"**/foo", "**/report"}, Wildcard: true}, nil)
require.NoError(t, err)
require.Equal(t, dgstDoubleStar, dgst)
where previously we only looked for **/foo/**?
This is important for two reasons: 1) Keeps caching logic consistent with recent fsutil changes to use these functions (also vendored here). 2) Allows us to move forward with removal of the original buggy Matches implementation in moby/moby. Signed-off-by: Aaron Lehmann <[email protected]>
aaronlehmann
force-pushed
the
use-fixed-matching-functions
branch
from
9872d46 to
8021a3e
Compare
Done. |
|
@tonistiigi: Is this okay to merge? |
tonistiigi
approved these changes
Aug 23, 2021
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 is important for two reasons:
Keeps caching logic consistent with recent fsutil changes to use
these functions (also vendored here).
Allows us to move forward with removal of the original buggy Matches
implementation in moby/moby.