-
Notifications
You must be signed in to change notification settings - Fork 4.3k
fix(core): negated gitignore patterns inside subdirectories are not including matched files #35511
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(This review is outdated)
|
@aws-cdk-automation Clarification Request How would I go about writing an integration test for functionality in the |
✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
|
Comments on closed issues and PRs are hard for our team to see. |
Issue # (if applicable)
Closes #9146
Reason for this change
When bundling assets with
IgnoreMode.GIT, files that should be included via negation patterns (like!*.html) are incorrectly excluded if they're inside directories that are also re-included by negation patterns. Here's an example - consider the following tree:If we use a
excludepattern of['*', '!*.html', '!*/'], theindex.htmlin the root and both HTML files from theappfolder should be included - theappfolder shouldn't be excluded, due to the!*/pattern. Right now, only theindex.htmlfile in the root folder is included.Description of changes
Similar to #22002, I've updated the
completelyIgnoreslogic that's used to check if we need to skip a directory tree to include a trailing slash before verifying whether it's an ignored pattern. This makes it properly match directory-specific negation patterns like!*/by ensuring we're checking directory paths (with trailing slashes) against directory patterns.I've also updated the logic in
fingerprintto check if we're ignoring directories or files, and callcompletelyIgnoresorignoresaccordingly.Describe any new or updated permissions being added
None.
Description of how you validated changes
Added unit tests covering the described scenarios.
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license