-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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
fix(codebuild): fails on using PR Events together with FILE_PATH filters in a FilterGroup #9725
Merged
Merged
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
26c7a76
fix(codebuild): remove blocking validation on github webhook file pat…
c5ebf58
fix(codebuild): remove unit test for PR event plus file path validati…
633079d
Merge branch 'master' into JaseKirby/fix-issue-8867
JaseKirby a20f132
fix(codebuild): remove blocking validation on github webhook, fix mis…
69ab484
Merge branch 'JaseKirby/fix-issue-8867' of https://github.com/JaseKir…
3a15949
fix(codebuild): reinstate push,pr_created,file_path filter test to pass
6bb8d77
Remove the redundant positive test case
skinny85 2af57c4
Merge branch 'master' into JaseKirby/fix-issue-8867
mergify[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -582,6 +582,36 @@ export = { | |||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
test.done(); | ||||||||||||||||||||||||||||||||||||||
}, | ||||||||||||||||||||||||||||||||||||||
'with GitHub source including PULL_REQUEST_CREATED Event and FILE_PATH filter'(test: Test) { | ||||||||||||||||||||||||||||||||||||||
const stack = new cdk.Stack(); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
new codebuild.Project(stack, 'Project', { | ||||||||||||||||||||||||||||||||||||||
source: codebuild.Source.gitHub({ | ||||||||||||||||||||||||||||||||||||||
owner: 'testowner', | ||||||||||||||||||||||||||||||||||||||
repo: 'testrepo', | ||||||||||||||||||||||||||||||||||||||
cloneDepth: 3, | ||||||||||||||||||||||||||||||||||||||
webhook: true, | ||||||||||||||||||||||||||||||||||||||
reportBuildStatus: false, | ||||||||||||||||||||||||||||||||||||||
webhookFilters: [ | ||||||||||||||||||||||||||||||||||||||
codebuild.FilterGroup.inEventOf(codebuild.EventAction.PULL_REQUEST_CREATED).andFilePathIs('ReadMe.md'), | ||||||||||||||||||||||||||||||||||||||
], | ||||||||||||||||||||||||||||||||||||||
}), | ||||||||||||||||||||||||||||||||||||||
}); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
expect(stack).to(haveResourceLike('AWS::CodeBuild::Project', { | ||||||||||||||||||||||||||||||||||||||
Triggers: { | ||||||||||||||||||||||||||||||||||||||
Webhook: true, | ||||||||||||||||||||||||||||||||||||||
FilterGroups: [ | ||||||||||||||||||||||||||||||||||||||
[ | ||||||||||||||||||||||||||||||||||||||
{ Type: 'EVENT', Pattern: 'PULL_REQUEST_CREATED' }, | ||||||||||||||||||||||||||||||||||||||
{ Type: 'FILE_PATH', Pattern: 'ReadMe.md' }, | ||||||||||||||||||||||||||||||||||||||
], | ||||||||||||||||||||||||||||||||||||||
], | ||||||||||||||||||||||||||||||||||||||
}, | ||||||||||||||||||||||||||||||||||||||
})); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
test.done(); | ||||||||||||||||||||||||||||||||||||||
}, | ||||||||||||||||||||||||||||||||||||||
'with GitHubEnterprise source'(test: Test) { | ||||||||||||||||||||||||||||||||||||||
const stack = new cdk.Stack(); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
|
@@ -1631,17 +1661,6 @@ export = { | |||||||||||||||||||||||||||||||||||||
test.done(); | ||||||||||||||||||||||||||||||||||||||
}, | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
'cannot have file path conditions if the Group contains any action other than PUSH'(test: Test) { | ||||||||||||||||||||||||||||||||||||||
const filterGroup = codebuild.FilterGroup.inEventOf(codebuild.EventAction.PULL_REQUEST_CREATED, | ||||||||||||||||||||||||||||||||||||||
codebuild.EventAction.PUSH); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
test.throws(() => { | ||||||||||||||||||||||||||||||||||||||
filterGroup.andFilePathIsNot('.*\\.java'); | ||||||||||||||||||||||||||||||||||||||
}, /A file path condition cannot be added if a Group contains any event action other than PUSH/); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
test.done(); | ||||||||||||||||||||||||||||||||||||||
}, | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||||||||||
'BitBucket sources do not support the PULL_REQUEST_REOPENED event action'(test: Test) { | ||||||||||||||||||||||||||||||||||||||
const stack = new cdk.Stack(); | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
|
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.
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.
Can you change the below test instead? To show that it works now.