fix(core): ignore strategies do not match directories #22002

danilobuerger · 2022-09-12T12:14:19Z

ignore strategies like git, expect directories to be passed in with a trailing slash in order to properly match.

consider a source tree:

├── hello
│   └── index.html
├── index.html

now we want to exclude everything except all html files (including all subdirectories).

this can be done with a gitignore of:

*
!*/
!*.html

in order for the git ignore strategy to properly match this, it needs to know that hello is a directory.

this patch just does that by appending a trailing slash for the ignore strategies.

Fixes #9146

All Submissions:

Have you followed the guidelines in our Contributing guide?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

gitpod-io · 2022-09-12T12:14:27Z

danilobuerger · 2022-09-12T13:18:59Z

The build failure seems unrelated. At least I can't find the cause from the logs thats related to my code change.

TheRealAmazonKendra · 2022-09-12T14:48:00Z

packages/@aws-cdk/core/lib/fs/copy.ts

+    const sourceFilePath = path.join(srcDir, file.name);

-    if (ignoreStrategy.ignores(sourceFilePath)) {
+    const ignorePath = sourceFilePath + (file.name && file.isDirectory() ? path.sep : "");


Build failure message:

@aws-cdk/core: /codebuild/output/src689345531/src/github.com/aws/aws-cdk/packages/@aws-cdk/core/lib/fs/copy.ts @aws-cdk/core: 22:87 error Strings must use singlequote quotes

TheRealAmazonKendra · 2022-09-12T14:48:19Z

packages/@aws-cdk/core/lib/fs/ignore.ts


    let relativePath = path.relative(this.absoluteRootPath, absoluteFilePath);
+    if (relativePath) {
+      relativePath += absoluteFilePath.endsWith(path.sep) ? path.sep : "";


Build failure message:

@aws-cdk/core: /codebuild/output/src689345531/src/github.com/aws/aws-cdk/packages/@aws-cdk/core/lib/fs/ignore.ts @aws-cdk/core: 121:72 error Strings must use singlequote quotes @aws-cdk/core: 181:72 error Strings must use singlequote quotes @aws-cdk/core: 227:72 error Strings must use singlequote quotes

Pull request has been modified.

TheRealAmazonKendra

Please make sure that your PR title confirms to the conventional commit standard (fix, feat, chore) and that it is written in a style that will reflect correctly in the change log (See Contributing Guide, Pull Requests)

PRs with changes that are not statically guaranteed by the type system must have tests to make sure that (a) the new behavior works as intended and (b) it is not accidentally undone by future changes (See Contributing Guide, Work Your Magic (https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md#step-3-work-your-magic)).

Pull request has been modified.

danilobuerger · 2022-09-12T14:56:31Z

Hi @TheRealAmazonKendra, thanks for your helpful feedback! I really appreciate it. Sorry I didn't see the failures in the build log. I will try to get some meaningful tests in.

danilobuerger · 2022-09-12T18:25:02Z

@TheRealAmazonKendra it looks like its all green now. Thanks again for all your help on getting me there!

…ing slash ignore strategies like git, expect directories to be passed in with a trailing slash in order to properly match. consider a source tree: ├── hello │ └── index.html ├── index.html now we want to exclude everything except all html files (including all subdirectories). this can be done with a gitignore of: * !*/ !*.html in order for the git ignore strategy to properly match this, it needs to know that hello is a directory. this patch just does that by appending a trailing slash for the ignore strategies.

TheRealAmazonKendra · 2022-10-31T04:55:18Z

@Mergifyio update

mergify · 2022-10-31T04:55:55Z

update

✅ Branch has been successfully updated

aws-cdk-automation

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

aws-cdk-automation · 2022-10-31T05:34:48Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
Commit ID: 891b5bb
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

aws-cdk-automation · 2022-11-22T00:09:58Z

This PR has been in the CHANGES REQUESTED state for 3 weeks, and looks abandoned. To keep this PR from being closed, please continue work on it. If not, it will automatically be closed in a week.

aws-cdk-automation · 2022-11-30T00:09:28Z

This PR has been deemed to be abandoned, and will be automatically closed. Please create a new PR for these changes if you think this decision has been made in error.

aws-cdk-automation · 2022-11-30T00:11:15Z

The pull request linter fails with the following errors:

❌ Fixes must contain a change to an integration test file and the resulting snapshot.

PRs must pass status checks before we can provide a meaningful review.

…ncluding matched files (#35511) ### 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: ``` - index.html - app/ - component.js - index.html - home.html ``` If we use a `exclude` pattern of `['*', '!*.html', '!*/']`, the `index.html` in the root and both HTML files from the `app` folder should be included - the `app` folder shouldn't be excluded, due to the `!*/` pattern. Right now, only the `index.html` file in the root folder is included. ### Description of changes Similar to #22002, I've updated the `completelyIgnores` logic 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 `fingerprint` to check if we're ignoring directories or files, and call `completelyIgnores` or `ignores` accordingly. ### Describe any new or updated permissions being added None. ### Description of how you validated changes Added unit tests covering the described scenarios. ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

aws-cdk-automation requested a review from a team September 12, 2022 12:14

github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p2 labels Sep 12, 2022

TheRealAmazonKendra previously requested changes Sep 12, 2022

View reviewed changes

danilobuerger force-pushed the ignoredirs branch from 1434938 to fd1621a Compare September 12, 2022 14:52

danilobuerger changed the title ~~Make sure ignore strategies receive directories with trailing slash~~ fix(core): make sure ignore strategies receive directories with trailing slash Sep 12, 2022

TheRealAmazonKendra previously requested changes Sep 12, 2022

View reviewed changes

danilobuerger force-pushed the ignoredirs branch from fd1621a to fecdf81 Compare September 12, 2022 14:54

danilobuerger force-pushed the ignoredirs branch 2 times, most recently from e1395cd to 36326dd Compare September 12, 2022 15:32

danilobuerger force-pushed the ignoredirs branch from 36326dd to fdc3b36 Compare September 14, 2022 13:17

Merge branch 'main' into ignoredirs

891b5bb

TheRealAmazonKendra changed the title ~~fix(core): make sure ignore strategies receive directories with trailing slash~~ fix(core): ignore strategies do not match directories Oct 31, 2022

aws-cdk-automation requested changes Oct 31, 2022

View reviewed changes

aws-cdk-automation added the closed-for-staleness This issue was automatically closed because it hadn't received any attention in a while. label Nov 30, 2022

aws-cdk-automation closed this Nov 30, 2022

ekisu mentioned this pull request Sep 17, 2025

fix(core): negated gitignore patterns inside subdirectories are not including matched files #35511

Merged

1 task

This was referenced Oct 1, 2025

Bump Amazon.CDK.Lib from 2.213.0 to 2.218.0 DataDog/serverless-sample-app#499

Merged

Bump Amazon.CDK.Lib from 2.213.0 to 2.218.0 LayeredCraft/cdk-constructs#34

Closed

dependabot bot mentioned this pull request Oct 8, 2025

Bump Amazon.CDK.Lib from 2.213.0 to 2.219.0 LayeredCraft/cdk-constructs#36

Closed

dependabot bot mentioned this pull request Oct 24, 2025

Bump Amazon.CDK.Lib from 2.201.0 to 2.220.0 bervProject/MergePDFOnline#1165

Closed

fix(core): ignore strategies do not match directories #22002

fix(core): ignore strategies do not match directories #22002

Uh oh!

Conversation

danilobuerger commented Sep 12, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

All Submissions:

Uh oh!

gitpod-io bot commented Sep 12, 2022

Uh oh!

danilobuerger commented Sep 12, 2022

Uh oh!

TheRealAmazonKendra Sep 12, 2022

Choose a reason for hiding this comment

Uh oh!

TheRealAmazonKendra Sep 12, 2022

Choose a reason for hiding this comment

Uh oh!

TheRealAmazonKendra left a comment

Choose a reason for hiding this comment

Uh oh!

danilobuerger commented Sep 12, 2022

Uh oh!

danilobuerger commented Sep 12, 2022

Uh oh!

TheRealAmazonKendra commented Oct 31, 2022

Uh oh!

mergify bot commented Oct 31, 2022

✅ Branch has been successfully updated

Uh oh!

aws-cdk-automation left a comment

Choose a reason for hiding this comment

Uh oh!

aws-cdk-automation commented Oct 31, 2022

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Nov 22, 2022

Uh oh!

aws-cdk-automation commented Nov 30, 2022

Uh oh!

aws-cdk-automation commented Nov 30, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

danilobuerger commented Sep 12, 2022 •

edited

Loading