Merge branch 'main' into nlb-fargate-sg

aws · Mar 13, 2024 · 457e0b5 · 457e0b5
2 parents c1c1cfe + e85231c
commit 457e0b5
Show file tree

Hide file tree

Showing 73 changed files with 2,382 additions and 73 deletions.
diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,8 @@
 
 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.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,13 @@
 
 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.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/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');
 

diff --git a/...-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts b/...-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-commit.ts
@@ -2,12 +2,13 @@ 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';
 
-const defaultBranchFeatureFlag = { [CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME]: false };
-const app = new cdk.App({
-  postCliContext: defaultBranchFeatureFlag,
-});
+const defaultFeatureFlag = {
+  [CODECOMMIT_SOURCE_ACTION_DEFAULT_BRANCH_NAME]: false,
+  [CODEPIPELINE_DEFAULT_PIPELINE_TYPE_TO_V2]: false,
+};
+const app = new cdk.App({ postCliContext: defaultFeatureFlag });
 
 const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-codecommit');
 

diff --git a/...ting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.ts b/...ting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy-ecs.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-codedeploy-ecs');
 

diff --git a/...-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy.ts b/...-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-code-deploy.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-codedeploy');
 

diff --git a/...k-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts b/...k-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecr-source.ts
@@ -24,7 +24,11 @@ import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
  * was triggered successfully.
  */
 
-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-ecr-source');
 

diff --git a/...k-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.ts b/...k-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.ts
@@ -9,7 +9,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-ecs-deploy');
 

diff --git a/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.ts b/...ework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.ts
@@ -21,7 +21,11 @@ import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
  * 5. Manually delete the 'aws-cdk-codepipeline-elastic-beanstalk-deploy' stack
  */
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2': false,
+  },
+});
 
 const stack = new Stack(app, 'aws-cdk-codepipeline-elastic-beanstalk-deploy');
 

diff --git a/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.ts b/...s-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-events.ts
@@ -9,7 +9,11 @@ import * as sns from 'aws-cdk-lib/aws-sns';
 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-pipeline-event-target');
 

diff --git a/...-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-jenkins.ts b/...-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-jenkins.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 stack = new cdk.Stack(app, 'aws-cdk-codepipeline-jenkins');
 

diff --git a/...ting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-manual-approval.ts b/...ting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-manual-approval.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 stack = new cdk.Stack(app, 'aws-cdk-codepipeline-manual-approval');
 

diff --git a/...dk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.ts b/...dk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.ts
@@ -6,7 +6,11 @@ import { Duration } from 'aws-cdk-lib';
 import { IntegTest, ExpectedResult, Match } from '@aws-cdk/integ-tests-alpha';
 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-s3-deploy');
 

diff --git a/...esting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.ts b/...esting/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-stepfunctions.ts
@@ -4,7 +4,11 @@ import * as stepfunctions from 'aws-cdk-lib/aws-stepfunctions';
 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-stepfunctions');
 

diff --git a/....snapshot/asset.54e6f07bf3aea46d100719f3b21fe0fb45ae789ee372d42d8cdfb97e21aba96c/index.js b/....snapshot/asset.54e6f07bf3aea46d100719f3b21fe0fb45ae789ee372d42d8cdfb97e21aba96c/index.js