fix(codepipeline): allow both pullRequestFilter and pushFilter (#34267)

### Issue # (if applicable)

Closes #34253

### Reason for this change
Validation too strict

### Description of changes
- Allow both `pullRequestFilter` and `pushFilter`
- Refactor integ for readability

### Description of how you validated changes
Unit + Integ

### 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*

Author: phuhung273

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-pipeline-triggers.js.snapshot/aws-cdk-codepipeline-with-pipeline-triggers.assets.json

@@ -1987,6 +1987,34 @@
     "Triggers": [
      {
       "GitConfiguration": {
+       "PullRequest": [
+        {
+         "Branches": {
+          "Excludes": [
+           "excludePR1",
+           "excludePR2"
+          ],
+          "Includes": [
+           "includePR1",
+           "includePR2"
+          ]
+         },
+         "Events": [
+          "OPEN",
+          "UPDATED"
+         ],
+         "FilePaths": {
+          "Excludes": [
+           "/path/to/excludePR1",
+           "/path/to/excludePR2"
+          ],
+          "Includes": [
+           "/path/to/includePR1",
+           "/path/to/includePR2"
+          ]
+         }
+        }
+       ],
        "Push": [
         {
          "Branches": {

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-pipeline-triggers.js.snapshot/aws-cdk-codepipeline-with-pipeline-triggers.template.json

@@ -156,6 +156,13 @@ new codepipeline.Pipeline(stack, 'codepipeline-integ-trigger-test', {
         filePathsExcludes: ['/path/to/exclude1', '/path/to/exclude2'],
         filePathsIncludes: ['/path/to/include1', '/path/to/include2'],
       }],
+      pullRequestFilter: [{
+        branchesExcludes: ['excludePR1', 'excludePR2'],
+        branchesIncludes: ['includePR1', 'includePR2'],
+        filePathsExcludes: ['/path/to/excludePR1', '/path/to/excludePR2'],
+        filePathsIncludes: ['/path/to/includePR1', '/path/to/includePR2'],
+        events: [codepipeline.GitPullRequestEvent.OPEN, codepipeline.GitPullRequestEvent.UPDATED],
+      }],
     },
   }],
 });
@@ -171,35 +178,40 @@ awsApiCall1.assertAtPath('pipeline.name', ExpectedResult.stringLikeRegexp('my-pi
 const awsApiCall2 = integrationTest.assertions.awsApiCall('CodePipeline', 'getPipeline', { name: 'my-pipeline2' });
 awsApiCall2.assertAtPath('pipeline.name', ExpectedResult.stringLikeRegexp('my-pipeline2'));
 
-const awsApiCall3 = integrationTest.assertions.awsApiCall('CodePipeline', 'getPipeline', { name: 'codepipeline-integ-trigger-test' });
-awsApiCall3.assertAtPath('pipeline.name',
-  ExpectedResult.stringLikeRegexp('codepipeline-integ-trigger-test'));
-awsApiCall3.assertAtPath('pipeline.stages.0.name',
-  ExpectedResult.stringLikeRegexp('Source'));
-awsApiCall3.assertAtPath('pipeline.stages.1.name',
-  ExpectedResult.stringLikeRegexp('Build'));
-awsApiCall3.assertAtPath('pipeline.triggers.0.providerType',
-  ExpectedResult.stringLikeRegexp(codepipeline.ProviderType.CODE_STAR_SOURCE_CONNECTION));
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.sourceActionName',
-  ExpectedResult.stringLikeRegexp('integ-action-name'));
-// Assert branch includes
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.branches.includes.0',
-  ExpectedResult.stringLikeRegexp('include1'));
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.branches.includes.1',
-  ExpectedResult.stringLikeRegexp('include2'));
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.branches.excludes.0',
-  ExpectedResult.stringLikeRegexp('exclude1'));
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.branches.excludes.1',
-  ExpectedResult.stringLikeRegexp('exclude2'));
-// Assert file path includes
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.filePaths.includes.0',
-  ExpectedResult.stringLikeRegexp('/path/to/include1'));
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.filePaths.includes.1',
-  ExpectedResult.stringLikeRegexp('/path/to/include2'));
-// Assert file path excludes
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.filePaths.excludes.0',
-  ExpectedResult.stringLikeRegexp('/path/to/exclude1'));
-awsApiCall3.assertAtPath('pipeline.triggers.0.gitConfiguration.push.0.filePaths.excludes.1',
-  ExpectedResult.stringLikeRegexp('/path/to/exclude2'));
-
-app.synth();
+integrationTest.assertions.awsApiCall('CodePipeline', 'getPipeline', {
+  name: 'codepipeline-integ-trigger-test',
+}).expect(ExpectedResult.objectLike({
+  pipeline: {
+    name: 'codepipeline-integ-trigger-test',
+    stages: [
+      { name: 'Source' },
+      { name: 'Build' },
+    ],
+    triggers: [{
+      providerType: codepipeline.ProviderType.CODE_STAR_SOURCE_CONNECTION,
+      gitConfiguration: {
+        sourceActionName: 'integ-action-name',
+        push: [{
+          branches: {
+            includes: ['include1', 'include2'],
+            excludes: ['exclude1', 'exclude2'],
+          },
+          filePaths: {
+            includes: ['/path/to/include1', '/path/to/include2'],
+            excludes: ['/path/to/exclude1', '/path/to/exclude2'],
+          },
+        }],
+        pullRequest: [{
+          branches: {
+            includes: ['includePR1', 'includePR2'],
+            excludes: ['excludePR1', 'excludePR2'],
+          },
+          filePaths: {
+            includes: ['/path/to/includePR1', '/path/to/includePR2'],
+            excludes: ['/path/to/excludePR1', '/path/to/excludePR2'],
+          },
+        }],
+      },
+    }],
+  },
+}));

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-pipeline-triggers.js.snapshot/cdk.out

@@ -89,9 +89,6 @@ export function validateTriggers(gitConfiguration: GitConfiguration) {
   if (sourceAction.actionProperties.provider !== 'CodeStarSourceConnection') {
     throw new UnscopedValidationError(`provider for actionProperties in sourceAction with name '${sourceAction.actionProperties.actionName}' must be 'CodeStarSourceConnection', got '${sourceAction.actionProperties.provider}'`);
   }
-  if (pushFilter?.length && pullRequestFilter?.length) {
-    throw new UnscopedValidationError(`cannot specify both GitPushFilter and GitPullRequestFilter for the trigger with sourceAction with name '${sourceAction.actionProperties.actionName}'`);
-  }
   if (!pushFilter?.length && !pullRequestFilter?.length) {
     throw new UnscopedValidationError(`must specify either GitPushFilter or GitPullRequestFilter for the trigger with sourceAction with name '${sourceAction.actionProperties.actionName}'`);
   }

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-pipeline-triggers.js.snapshot/codepipelinewithpipelinetriggerstestDefaultTestDeployAssertE3F8DDE6.assets.json

@@ -1008,32 +1008,6 @@ describe('triggers', () => {
     }).toThrow(/length of GitPullRequestFilter for sourceAction with name 'CodeStarConnectionsSourceAction' must be less than or equal to 3, got 4/);
   });
 
-  test('throw if both GitPushFilter and GitPullRequestFilter are specified', () => {
-    expect(() => {
-      new codepipeline.Pipeline(stack, 'Pipeline', {
-        pipelineType: codepipeline.PipelineType.V2,
-        triggers: [{
-          providerType: codepipeline.ProviderType.CODE_STAR_SOURCE_CONNECTION,
-          gitConfiguration: {
-            sourceAction,
-            pushFilter: [
-              {
-                tagsExcludes: ['exclude1'],
-                tagsIncludes: ['include1'],
-              },
-            ],
-            pullRequestFilter: [
-              {
-                branchesExcludes: ['exclude1'],
-                branchesIncludes: ['include1'],
-              },
-            ],
-          },
-        }],
-      });
-    }).toThrow(/cannot specify both GitPushFilter and GitPullRequestFilter for the trigger with sourceAction with name 'CodeStarConnectionsSourceAction'/);
-  });
-
   test('throw if neither GitPushFilter nor GitPullRequestFilter are specified', () => {
     expect(() => {
       new codepipeline.Pipeline(stack, 'Pipeline', {