feat(codepipeline): `GitPushFilter` with branches and file paths for trigger #29127

go-to-k · 2024-02-16T05:16:31Z

Issue # (if applicable)

Closes #29124

Related PR: #29128
Perhaps if one merges, the other will cause a conflict.

Reason for this change

We would be good to trigger pipelines by GitPushFilter with branches and file paths.

CFn docs

Description of changes

Add props:

branchesExcludes
branchesIncludes
filePathsExcludes
filePathsIncludes

Description of how you validated changes

Both unit and integ tests.

Checklist

My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

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

…igger

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.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

fix unit tests fix unit tests

go-to-k · 2024-02-17T17:50:14Z

packages/aws-cdk-lib/aws-codepipeline/README.md

 The triggers can only be used with pipeline type V2.

+### Push filter


Not separated here by the chapters "Tags" and "Branches" to add pull request filters in the PR.

This reverts commit 2ebda40.

refactor Revert "refactor" This reverts commit 2ebda40. refactor integ test change

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

packages/aws-cdk-lib/aws-codepipeline/lib/trigger.ts

go-to-k · 2024-02-25T12:25:46Z

packages/aws-cdk-lib/aws-codepipeline/lib/trigger.ts

+        if (!filter.branchesExcludes && !filter.branchesIncludes && (filter.filePathsExcludes || filter.filePathsIncludes)) {
+          throw new Error(`cannot specify filePaths without branches in pushFilter for sourceAction with name '${sourceAction.actionProperties.actionName}'`);
+        }


If there is no this validation, the error occurred in CFn: The trigger configuration for the source action is not valid. Make sure to choose valid filter combinations..

In addition, the file paths in the Branch is optional in the AWS console.

go-to-k · 2024-02-25T12:26:36Z

packages/aws-cdk-lib/aws-codepipeline/lib/trigger.ts

+        if ((filter.tagsExcludes || filter.tagsIncludes) && (filter.branchesExcludes || filter.branchesIncludes)) {
+          throw new Error(`cannot specify both tags and branches in pushFilter for sourceAction with name '${sourceAction.actionProperties.actionName}'`);
+        }


If there is no this validation, the error occurred in CFn: The trigger configuration for the source action is not valid. Make sure to choose valid filter combinations..

In addition, we can only choose tags or branches (with file paths) in the AWS console.

go-to-k · 2024-02-25T12:26:51Z

packages/aws-cdk-lib/aws-codepipeline/lib/trigger.ts

+        if (!filter.tagsExcludes && !filter.tagsIncludes && !filter.branchesExcludes && !filter.branchesIncludes) {
+          throw new Error(`must specify either tags or branches in pushFilter for sourceAction with name '${sourceAction.actionProperties.actionName}'`);
+        }


If there is no this validation, the error occurred in CFn: The trigger configuration for the source action is not valid. Make sure to choose valid filter combinations..

add unit test change unit test order

go-to-k · 2024-05-14T05:57:59Z

@comcalvi

I fixed the conflicts caused by the other PR that was merged.

The other PR had been attached the do-not-merge label as well as this PR, but @GavinZZ detached the label and merged the PR (see: #29128 (review)). So could you please detach the label from this PR and merge it?

amine-mf · 2024-05-27T13:41:49Z

Been here for a while, looks ready, this PR needs some love :) ! Any ETA please?

go-to-k · 2024-05-27T15:02:18Z

@comcalvi

Could you please take a look at this?

I fixed the conflicts caused by the other PR that was merged.

The other PR had been attached the do-not-merge label as well as this PR, but @GavinZZdetached the label and merged the PR (see: #29128 (review)). So could you please detach the label from this PR and merge it?

GavinZZ

LGTM, thanks for this great work and sorry for the wait!

go-to-k · 2024-05-28T01:44:10Z

@GavinZZ

Thanks for your approval. Could you please detach the 'do-not-merge' label, and merge the PR?

mergify · 2024-05-28T01:48:02Z

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).

go-to-k · 2024-06-02T14:33:23Z

@GavinZZ

The merge seems to have failed. Could you please retry?

Pull request has been modified.

mergify · 2024-06-03T21:01:35Z

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).

aws-cdk-automation · 2024-06-03T21:41:18Z

AWS CodeBuild CI Report

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

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

mergify · 2024-06-03T21:41:39Z

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).

…aths for trigger" (#30462) Reverts #29127

eriktisme · 2024-06-07T09:21:04Z

Why was it reverted?

moltar · 2024-06-07T09:35:10Z

I was really looking forward to this PR being released in the next version. 😭

go-to-k · 2024-06-07T11:01:27Z

That is really unfortunate. I'm in the process of asking the maintainer.

#30462 (comment)

feat(codepipeline): GitPushFilter with branches and file paths for tr…

945d0c0

…igger

aws-cdk-automation requested a review from a team February 16, 2024 05:16

github-actions bot added feature-request A feature should be added or improved. p2 distinguished-contributor [Pilot] contributed 50+ PRs to the CDK labels Feb 16, 2024

aws-cdk-automation previously requested changes Feb 16, 2024

View reviewed changes

doc

06d2fc9

github-actions bot added the effort/medium Medium work item – several days of effort label Feb 17, 2024

add unit tests

55fa3ec

go-to-k force-pushed the pipeline-trigger-branch branch from a0b62b9 to 7007369 Compare February 17, 2024 17:17

add validations

8ebad4e

fix unit tests fix unit tests

go-to-k force-pushed the pipeline-trigger-branch branch from 7007369 to 8ebad4e Compare February 17, 2024 17:17

README

5d40f6c

go-to-k commented Feb 17, 2024

View reviewed changes

go-to-k mentioned this pull request Feb 17, 2024

feat(codepipeline): GitPullRequestFilter for pipeline trigger #29128

Merged

1 task

go-to-k added 6 commits February 18, 2024 16:55

change unit tests

3293f4d

README

ad1487a

Merge branch 'main' into pipeline-trigger-branch

8cd7ef1

refactor

2ebda40

Revert "refactor"

4ef0486

This reverts commit 2ebda40.

integ test

74820d8

refactor Revert "refactor" This reverts commit 2ebda40. refactor integ test change

go-to-k force-pushed the pipeline-trigger-branch branch from 26c0606 to 74820d8 Compare February 22, 2024 16:17

go-to-k changed the title ~~feat(codepipeline): GitPushFilter with branches and file paths for trigger~~ feat(codepipeline): GitPushFilter with branches and file paths for trigger Feb 22, 2024

go-to-k commented Feb 25, 2024

View reviewed changes

packages/aws-cdk-lib/aws-codepipeline/lib/trigger.ts Outdated Show resolved Hide resolved

go-to-k commented Feb 25, 2024

View reviewed changes

go-to-k force-pushed the pipeline-trigger-branch branch from 8f0d1ce to dd62773 Compare February 25, 2024 12:28

change unit tests

750dc08

add unit test change unit test order

rm trailing spaces in triggers.test.ts

c2bb84a

go-to-k requested a review from comcalvi May 14, 2024 05:56

Merge branch 'main' into pipeline-trigger-branch

bf846d6

github-actions bot added p1 and removed p2 labels May 19, 2024

aws-cdk-automation added pr/needs-maintainer-review This PR needs a review from a Core Team Member and removed pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. labels May 19, 2024

GavinZZ previously approved these changes May 27, 2024

View reviewed changes

aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label May 27, 2024

GavinZZ removed the pr/do-not-merge This PR should not be merged at this time. label May 28, 2024

Merge branch 'main' into pipeline-trigger-branch

669be8b

GavinZZ approved these changes Jun 3, 2024

View reviewed changes

Merge branch 'main' into pipeline-trigger-branch

e22a8f2

mergify bot merged commit ddbbd00 into aws:main Jun 3, 2024
9 checks passed

go-to-k deleted the pipeline-trigger-branch branch June 4, 2024 01:44

gracelu0 mentioned this pull request Jun 5, 2024

revert: "feat(codepipeline): GitPushFilter with branches and file paths for trigger" #30462

Merged

mergify bot pushed a commit that referenced this pull request Jun 6, 2024

revert: "feat(codepipeline): GitPushFilter with branches and file p…

0fa3b1e

…aths for trigger" (#30462) Reverts #29127

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(codepipeline): `GitPushFilter` with branches and file paths for trigger #29127

feat(codepipeline): `GitPushFilter` with branches and file paths for trigger #29127

go-to-k commented Feb 16, 2024 •

edited

aws-cdk-automation left a comment

go-to-k Feb 17, 2024

go-to-k Feb 25, 2024

go-to-k Feb 25, 2024

go-to-k Feb 25, 2024

go-to-k commented May 14, 2024 •

edited

amine-mf commented May 27, 2024

go-to-k commented May 27, 2024

GavinZZ left a comment

go-to-k commented May 28, 2024 •

edited

mergify bot commented May 28, 2024

go-to-k commented Jun 2, 2024

mergify bot commented Jun 3, 2024

aws-cdk-automation commented Jun 3, 2024

mergify bot commented Jun 3, 2024

eriktisme commented Jun 7, 2024

moltar commented Jun 7, 2024

go-to-k commented Jun 7, 2024

		The triggers can only be used with pipeline type V2.

		### Push filter

feat(codepipeline): GitPushFilter with branches and file paths for trigger #29127

feat(codepipeline): GitPushFilter with branches and file paths for trigger #29127

Conversation

go-to-k commented Feb 16, 2024 • edited

Issue # (if applicable)

Reason for this change

Description of changes

Description of how you validated changes

Checklist

aws-cdk-automation left a comment

Choose a reason for hiding this comment

go-to-k Feb 17, 2024

Choose a reason for hiding this comment

go-to-k Feb 25, 2024

Choose a reason for hiding this comment

go-to-k Feb 25, 2024

Choose a reason for hiding this comment

go-to-k Feb 25, 2024

Choose a reason for hiding this comment

go-to-k commented May 14, 2024 • edited

amine-mf commented May 27, 2024

go-to-k commented May 27, 2024

GavinZZ left a comment

Choose a reason for hiding this comment

go-to-k commented May 28, 2024 • edited

mergify bot commented May 28, 2024

go-to-k commented Jun 2, 2024

mergify bot commented Jun 3, 2024

aws-cdk-automation commented Jun 3, 2024

AWS CodeBuild CI Report

mergify bot commented Jun 3, 2024

eriktisme commented Jun 7, 2024

moltar commented Jun 7, 2024

go-to-k commented Jun 7, 2024

feat(codepipeline): `GitPushFilter` with branches and file paths for trigger #29127

feat(codepipeline): `GitPushFilter` with branches and file paths for trigger #29127

go-to-k commented Feb 16, 2024 •

edited

go-to-k commented May 14, 2024 •

edited

go-to-k commented May 28, 2024 •

edited