Merge branch 'main' into 29437

aws · Mar 18, 2024 · 94b21c7 · 94b21c7
2 parents 6c65e80 + 28c4be3
commit 94b21c7
Show file tree

Hide file tree

Showing 212 changed files with 11,187 additions and 35,664 deletions.
diff --git a/.github/workflows/repo-metrics.yml → .github/workflows/repo-metrics-monthly.yml b/.github/workflows/repo-metrics.yml → .github/workflows/repo-metrics-monthly.yml
diff --git a/.github/workflows/repo-metrics-weekly.yml b/.github/workflows/repo-metrics-weekly.yml
@@ -0,0 +1,58 @@
+name: Weekly repo metrics
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 9 * * MON'
+
+permissions:
+  issues: write
+  pull-requests: read
+
+jobs:
+  build:
+    # this workflow will always fail in forks; bail if this isn't running in the upstream
+    if: github.repository == 'aws/aws-cdk'
+    name: metrics
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Get dates for last week
+      shell: bash
+      run: |
+        # Calculate the date of the previous Monday
+        PREVIOUS_MONDAY=$(date -d "7 days ago" "+%Y-%m-%d")
+
+        # Calculate the date of the current Sunday
+        CURRENT_SUNDAY=$(date -d "1 day ago" "+%Y-%m-%d")
+
+        # Set an environment variable with the date range
+        echo "$PREVIOUS_MONDAY..$CURRENT_SUNDAY"
+        echo "last_week=$PREVIOUS_MONDAY..$CURRENT_SUNDAY" >> "$GITHUB_ENV"
+
+    - name: Report on issues
+      uses: github/issue-metrics@v2
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SEARCH_QUERY: 'repo:aws/aws-cdk is:issue created:${{ env.last_week }} -reason:"not planned"'
+
+    - name: Create report for issues
+      uses: peter-evans/create-issue-from-file@v5
+      with:
+        title: Weekly issue metrics report
+        token: ${{ secrets.GITHUB_TOKEN }}
+        content-filepath: ./issue_metrics.md
+        assignees: paulhcsun
+
+    - name: Report on PRs
+      uses: github/issue-metrics@v2
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SEARCH_QUERY: 'repo:aws/aws-cdk is:pr created:${{ env.last_week }} -is:draft'
+
+    - name: Create report for PRs
+      uses: peter-evans/create-issue-from-file@v5
+      with:
+        title: Weekly PR metrics report
+        token: ${{ secrets.GITHUB_TOKEN }}
+        content-filepath: ./issue_metrics.md
+        assignees: paulhcsun
diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.133.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.132.1-alpha.0...v2.133.0-alpha.0) (2024-03-14)
+
+## [2.132.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.132.0-alpha.0...v2.132.1-alpha.0) (2024-03-12)
+
 ## [2.132.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.131.0-alpha.0...v2.132.0-alpha.0) (2024-03-08)
 
 

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,6 +2,39 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.133.0](https://github.com/aws/aws-cdk/compare/v2.132.1...v2.133.0) (2024-03-14)
+
+
+### Features
+
+* **CLI:** improved nested stack diff ([#29172](https://github.com/aws/aws-cdk/issues/29172)) ([135b520](https://github.com/aws/aws-cdk/commit/135b5208dce849f49b6f540f7199ece057a7ef22))
+* **codepipeline:** change default pipeline type to V2 (under feature flag) ([#29096](https://github.com/aws/aws-cdk/issues/29096)) ([e85231c](https://github.com/aws/aws-cdk/commit/e85231c092892879479cf12b89756e8f2b70a094)), closes [/github.com/aws/aws-cdk/pull/28538#discussion_r1471761574](https://github.com/aws//github.com/aws/aws-cdk/pull/28538/issues/discussion_r1471761574) [/github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/aws-codepipeline/lib/pipeline.ts#L492](https://github.com/aws//github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/aws-codepipeline/lib/pipeline.ts/issues/L492)
+* **ec2:** add APPCONFIG and APPCONFIGDATA to InterfaceVpcEndpointAwsService ([#29408](https://github.com/aws/aws-cdk/issues/29408)) ([baaa50c](https://github.com/aws/aws-cdk/commit/baaa50c73ae3a88d606b62349736ef1180dcf1ad))
+* **ecs-patterns:** support `securityGroups` in `NetworkLoadBalancedFargateService` ([#29431](https://github.com/aws/aws-cdk/issues/29431)) ([00e8a7b](https://github.com/aws/aws-cdk/commit/00e8a7b877a732b4236227f6462bf3914ce7a214)), closes [#29430](https://github.com/aws/aws-cdk/issues/29430) [/github.com/aws/aws-cdk/pull/29186#issuecomment-1959231406](https://github.com/aws//github.com/aws/aws-cdk/pull/29186/issues/issuecomment-1959231406)
+* **opensearchservice:** cold storage option ([#29387](https://github.com/aws/aws-cdk/issues/29387)) ([ce52c7e](https://github.com/aws/aws-cdk/commit/ce52c7e1ac939dc2f9f08cb29fad0f2dc9714445)), closes [#29366](https://github.com/aws/aws-cdk/issues/29366)
+* **rds:** proxy for mariadb ([#29412](https://github.com/aws/aws-cdk/issues/29412)) ([6fef789](https://github.com/aws/aws-cdk/commit/6fef789e14a0f53317da9ca4f319950d33f86ed1)), closes [#29402](https://github.com/aws/aws-cdk/issues/29402)
+* **stepfunctions-tasks:** start glue crawler ([#29016](https://github.com/aws/aws-cdk/issues/29016)) ([5592553](https://github.com/aws/aws-cdk/commit/5592553ac5edc6b2c29a786031b8bec139b2aef7)), closes [#24188](https://github.com/aws/aws-cdk/issues/24188)
+* update L1 CloudFormation resource definitions ([#29438](https://github.com/aws/aws-cdk/issues/29438)) ([5b910f0](https://github.com/aws/aws-cdk/commit/5b910f0d61d4adae38788f7f16ccdae6cb214057))
+
+
+### Bug Fixes
+
+* **cli:** `cdk ls` returns stack id instead of stack display name ([#29447](https://github.com/aws/aws-cdk/issues/29447)) ([77189be](https://github.com/aws/aws-cdk/commit/77189be16b4ab007450176010f71f1558ced6430)), closes [#29420](https://github.com/aws/aws-cdk/issues/29420)
+* **lambda-nodejs:** fixing esbuildArgs to take in account re-specified keys ([#29167](https://github.com/aws/aws-cdk/issues/29167)) ([919d16f](https://github.com/aws/aws-cdk/commit/919d16ff611ee01495ae2cb4c646c4e27378b3e3)), closes [#25385](https://github.com/aws/aws-cdk/issues/25385)
+* **stepfunctions:** the retry field in CustomState is not iterable ([#29403](https://github.com/aws/aws-cdk/issues/29403)) ([a1fbd51](https://github.com/aws/aws-cdk/commit/a1fbd51d7fa6791b6a55004a938ec157194b89ba)), closes [#29274](https://github.com/aws/aws-cdk/issues/29274)
+
+
+### Reverts
+
+* prevent changeset diff for non-deployed stacks ([#29485](https://github.com/aws/aws-cdk/issues/29485)) ([fac4a9c](https://github.com/aws/aws-cdk/commit/fac4a9c23f8e9090b3dc7e26a8306d3a8034b4c9)), closes [#29394](https://github.com/aws/aws-cdk/issues/29394) [#29172](https://github.com/aws/aws-cdk/issues/29172)
+
+## [2.132.1](https://github.com/aws/aws-cdk/compare/v2.132.0...v2.132.1) (2024-03-12)
+
+
+### Bug Fixes
+
+* **cli:** `cdk ls` returns stack id instead of stack display name ([#29447](https://github.com/aws/aws-cdk/issues/29447)) ([effad1c](https://github.com/aws/aws-cdk/commit/effad1cf8a854789070e963691b30fadf1597afb)), closes [#29420](https://github.com/aws/aws-cdk/issues/29420)
+
 ## [2.132.0](https://github.com/aws/aws-cdk/compare/v2.131.0...v2.132.0) (2024-03-08)
 
 

diff --git a/package.json b/package.json
@@ -20,15 +20,15 @@
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "aws-sdk-js-codemod": "^0.28.2",
-    "cdk-generate-synthetic-examples": "^0.1.304",
+    "cdk-generate-synthetic-examples": "^0.1.307",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.94.0",
-    "jsii-pacmak": "1.94.0",
-    "jsii-reflect": "1.94.0",
-    "jsii-rosetta": "~5.3.18",
+    "jsii-diff": "1.95.0",
+    "jsii-pacmak": "1.95.0",
+    "jsii-reflect": "1.95.0",
+    "jsii-rosetta": "~5.3.27",
     "lerna": "^7.4.2",
     "nx": "^16.10.0",
     "patch-package": "^6.5.1",

diff --git a/packages/@aws-cdk-testing/cli-integ/package.json b/packages/@aws-cdk-testing/cli-integ/package.json
@@ -30,7 +30,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/cdk-build-tools": "0.0.0",
-    "@types/semver": "^7.5.7",
+    "@types/semver": "^7.5.8",
     "@types/yargs": "^15.0.19",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1562.0",
+    "aws-sdk": "^2.1576.0",
     "axios": "^1.6.7",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",

diff --git a/...s/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.132.0/NOTES.md b/...s/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.132.0/NOTES.md
@@ -0,0 +1 @@
+This patch brings the [fix](https://github.com/aws/aws-cdk/issues/29420) into the regression suite.
diff --git a/packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.132.0/skip-tests.txt b/packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.132.0/skip-tests.txt
@@ -0,0 +1,4 @@
+# Skipping the test to fix issue https://github.com/aws/aws-cdk/issues/29420. 
+# cli-integ tests failing for the old tests with the new cli changes for list stacks.
+
+cdk ls --show-dependencies --json
diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts
@@ -886,10 +886,10 @@ integTest('cdk ls --show-dependencies --json', withDefaultFixture(async (fixture
       id: 'list-stacks',
       dependencies: [
         {
-          id: 'liststacksDependentStack',
+          id: 'list-stacks/DependentStack',
           dependencies: [
             {
-              id: 'liststacksDependentStackInnerDependentStack',
+              id: 'list-stacks/DependentStack/InnerDependentStack',
               dependencies: [],
             },
           ],
@@ -900,11 +900,11 @@ integTest('cdk ls --show-dependencies --json', withDefaultFixture(async (fixture
       id: 'list-multiple-dependent-stacks',
       dependencies: [
         {
-          id: 'listmultipledependentstacksDependentStack1',
+          id: 'list-multiple-dependent-stacks/DependentStack1',
           dependencies: [],
         },
         {
-          id: 'listmultipledependentstacksDependentStack2',
+          id: 'list-multiple-dependent-stacks/DependentStack2',
           dependencies: [],
         },
       ],

diff --git a/packages/@aws-cdk-testing/framework-integ/package.json b/packages/@aws-cdk-testing/framework-integ/package.json
@@ -41,10 +41,10 @@
     "@aws-cdk/integ-tests-alpha": "0.0.0",
     "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk": "^2.1562.0",
+    "aws-sdk": "^2.1576.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "2.68.40",
-    "cdk8s-plus-27": "2.7.80",
+    "cdk8s": "2.68.46",
+    "cdk8s-plus-27": "2.7.84",
     "constructs": "^10.0.0"
   },
   "repository": {

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration.ts
@@ -32,7 +32,11 @@ def handler(event, context):
   print('This is my dummy validator')
 `;
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new Stack(app, 'aws-appconfig-configuration');
 

diff --git a/...ting/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.ts b/...ting/framework-integ/test/aws-codepipeline-actions/test/cloudformation/integ.stacksets.ts
@@ -76,7 +76,11 @@ export class StackSetPipelineStack extends Stack {
   }
 }
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 const stack = new StackSetPipelineStack(app, 'StackSetPipelineStack');
 new IntegTest(app, 'StackSetPipelineStackInteg', {
   testCases: [stack],

diff --git a/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts b/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.cfn-template-from-repo.lit.ts
@@ -3,7 +3,11 @@ import * as codepipeline from 'aws-cdk-lib/aws-codepipeline';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-cloudformation');
 
 /// !show

diff --git a/...nteg/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts b/...nteg/test/aws-codepipeline-actions/test/integ.lambda-deployed-through-codepipeline.lit.ts
@@ -7,7 +7,11 @@ import * as cdk from 'aws-cdk-lib';
 import * as codepipeline_actions from 'aws-cdk-lib/aws-codepipeline-actions';
 import { STANDARD_NODEJS_RUNTIME } from '../../config';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 /// !show
 const lambdaStack = new cdk.Stack(app, 'LambdaStack');

diff --git a/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.ts b/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.lambda-pipeline.ts
@@ -6,7 +6,11 @@ import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 import { STANDARD_NODEJS_RUNTIME } from '../../config';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-lambda');
 

diff --git a/...testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts b/...testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts
@@ -3,8 +3,11 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import { App, RemovalPolicy, SecretValue, Stack } from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
-const app = new App();
-
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 const stack = new Stack(app, 'aws-cdk-codepipeline-alexa-deploy');
 
 const bucket = new s3.Bucket(stack, 'PipelineBucket', {

diff --git a/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.ts b/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-cross-region.ts
@@ -3,7 +3,11 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const region = 'us-west-2'; // hardcode the region
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-cloudformation-cross-region', {

diff --git a/...framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.ts b/...framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn-with-action-role.ts
@@ -4,7 +4,11 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-cloudformation-cross-region-with-action-role', {});
 

diff --git a/...@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.ts b/...@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-cfn.ts
@@ -4,7 +4,11 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-cloudformation');
 

diff --git a/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.ts b/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.ts
@@ -5,7 +5,11 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-codebuild-batch');
 

diff --git a/...g/test/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.ts b/...g/test/aws-codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.ts
@@ -5,7 +5,11 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-codebuild-multiple-inputs-outputs');
 

diff --git a/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts b/...ng/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-build.ts
@@ -6,7 +6,11 @@ import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 
 /* eslint-disable quote-props */
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-codecommit-codebuild');
 

diff --git a/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-custom-event.ts b/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-custom-event.ts
@@ -2,15 +2,18 @@ import * as codecommit from 'aws-cdk-lib/aws-codecommit';
 import * as codepipeline from 'aws-cdk-lib/aws-codepipeline';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
-import { CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME } from 'aws-cdk-lib/cx-api';
+import { CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME, CODEPIPELINE_DEFAULT_PIPELINE_TYPE_TO_V2 } from 'aws-cdk-lib/cx-api';
 import { ExpectedResult, IntegTest } from '@aws-cdk/integ-tests-alpha';
 import { LambdaFunction } from 'aws-cdk-lib/aws-events-targets';
 import { Code, Runtime, Function } from 'aws-cdk-lib/aws-lambda';
 import { PolicyStatement } from 'aws-cdk-lib/aws-iam';
 import * as path from 'path';
 
-const defaultBranchFeatureFlag = { [CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME]: true };
-const app = new cdk.App({ postCliContext: defaultBranchFeatureFlag });
+const defaultFeatureFlag = {
+  [CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME]: true,
+  [CODEPIPELINE_DEFAULT_PIPELINE_TYPE_TO_V2]: false,
+};
+const app = new cdk.App({ postCliContext: defaultFeatureFlag });
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-codecommit-custom-event');
 const branch = 'test-branch';

diff --git a/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-main.ts b/...ing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit-main.ts
@@ -2,11 +2,14 @@ import * as codecommit from 'aws-cdk-lib/aws-codecommit';
 import * as codepipeline from 'aws-cdk-lib/aws-codepipeline';
 import * as cdk from 'aws-cdk-lib';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
-import { CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME } from 'aws-cdk-lib/cx-api';
+import { CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME, CODEPIPELINE_DEFAULT_PIPELINE_TYPE_TO_V2 } from 'aws-cdk-lib/cx-api';
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 
-const defaultBranchFeatureFlag = { [CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME]: true };
-const app = new cdk.App({ postCliContext: defaultBranchFeatureFlag });
+const defaultFeatureFlag = {
+  [CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME]: true,
+  [CODEPIPELINE_DEFAULT_PIPELINE_TYPE_TO_V2]: false,
+};
+const app = new cdk.App({ postCliContext: defaultFeatureFlag });
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-codecommit-main');