Merge branch 'main' into writeForwarding

CHANGELOG.v2.alpha.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https:/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.160.0-alpha.0](https:/aws/aws-cdk/compare/v2.159.1-alpha.0...v2.160.0-alpha.0) (2024-09-24)
+
+
+### Features
+
+* **kinesisanalytics-flink:** support Apache Flink 1.20 ([#31349](https:/aws/aws-cdk/issues/31349)) ([b3b9aa8](https:/aws/aws-cdk/commit/b3b9aa8a4584e178808f5babe0583749d1a87da5))
+
+
+### Bug Fixes
+
+* **cognito-identitypool-alpha:** cannot configure roleMappings with imported userPool and client ([#30421](https:/aws/aws-cdk/issues/30421)) ([0fdd6a9](https:/aws/aws-cdk/commit/0fdd6a92ac7196e5498969be2743019f825b9262)), closes [#30304](https:/aws/aws-cdk/issues/30304) [/github.com/aws/aws-cdk/blob/c3003ab41f0efc763f39eb2cab490c8a005e146b/packages/aws-cdk-lib/aws-cognito/lib/user-pool.ts#L902](https:/aws/aws/aws-cdk/blob/c3003ab41f0efc763f39eb2cab490c8a005e146b/packages/aws-cdk-lib/aws-cognito/lib/user-pool.ts/issues/L902)
+* **ec2:** instance resourceSignalTimeout overwrites initOptions.timeout ([#31446](https:/aws/aws-cdk/issues/31446)) ([a29bf19](https:/aws/aws-cdk/commit/a29bf19be1e17c13b85f6edd45c382c1f0d89702)), closes [#30052](https:/aws/aws-cdk/issues/30052)
+
 ## [2.159.1-alpha.0](https:/aws/aws-cdk/compare/v2.159.0-alpha.0...v2.159.1-alpha.0) (2024-09-19)
 
 ## [2.159.0-alpha.0](https:/aws/aws-cdk/compare/v2.158.0-alpha.0...v2.159.0-alpha.0) (2024-09-18)

CHANGELOG.v2.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https:/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.160.0](https:/aws/aws-cdk/compare/v2.159.1...v2.160.0) (2024-09-24)
+
+
+### Features
+
+* allow all `sts` options for roles assumed by the cli ([#31089](https:/aws/aws-cdk/issues/31089)) ([5e95ba2](https:/aws/aws-cdk/commit/5e95ba2b7a24b2598cf00890e1e7d569914f27c9)), closes [#26157](https:/aws/aws-cdk/issues/26157) [#22535](https:/aws/aws-cdk/issues/22535)
+* update L1 CloudFormation resource definitions ([#31534](https:/aws/aws-cdk/issues/31534)) ([cd17fed](https:/aws/aws-cdk/commit/cd17fed31d5476be06de85ff942ccb4ce2c827d2))
+* **core:** configure Stack SNS notification ARNs on the Stack construct ([#31107](https:/aws/aws-cdk/issues/31107)) ([1593500](https:/aws/aws-cdk/commit/1593500735e6ddbcc087f005c5124f5ec57aec20)), closes [#8581](https:/aws/aws-cdk/issues/8581)
+* **stepfunctions:** add support for EncryptionConfiguration ([#30959](https:/aws/aws-cdk/issues/30959)) ([b49032b](https:/aws/aws-cdk/commit/b49032b3a6e549783b45492ffc76880fbcd58e68))
+
 ## [2.159.1](https:/aws/aws-cdk/compare/v2.159.0...v2.159.1) (2024-09-19)
 
 

packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts

@@ -13,7 +13,7 @@ import { shell, ShellOptions, ShellHelper, rimraf } from './shell';
 import { AwsContext, withAws } from './with-aws';
 import { withTimeout } from './with-timeout';
 
-export const DEFAULT_TEST_TIMEOUT_S = 10 * 60;
+export const DEFAULT_TEST_TIMEOUT_S = 20 * 60;
 export const EXTENDED_TEST_TIMEOUT_S = 30 * 60;
 
 /**

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.160.0/skip-tests.txt

@@ -0,0 +1,2 @@
+# This test asserts too much about the output of the CLI.
+security related changes without a CLI are expected to fail when approval is required

packages/@aws-cdk-testing/cli-integ/skip-tests.txt

@@ -1,7 +1,7 @@
 # This file is empty on purpose. Leave it here as documentation
 # and an example.
 #
-# Copy this file to cli-regression-patches/vX.Y.Z/skip-tests.txt
+# Copy this file to resources/cli-regression-patches/vX.Y.Z/skip-tests.txt
 # and edit it there if you want to exclude certain tests from running
 # when performing a certain version's regression tests.
 #

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-lib.integtest.ts

@@ -75,7 +75,7 @@ integTest(
  'This deployment will make potentially sensitive changes according to your current security approval level',
  );
  expect(stdErr).toContain(
- 'Deployment failed: Error: "--require-approval" is enabled and stack includes security-sensitive updates',
+ '"--require-approval" is enabled and stack includes security-sensitive updates',
  );
 
  // Ensure stack was not deployed

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -19,7 +19,6 @@ import {
 import { InvokeCommand } from '@aws-sdk/client-lambda';
 import { CreateTopicCommand, DeleteTopicCommand } from '@aws-sdk/client-sns';
 import { AssumeRoleCommand, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
-import * as chalk from 'chalk';
 import {
  integTest,
  cloneDirectory,
@@ -2185,7 +2184,7 @@ integTest(
 
 integTest(
  'hotswap deployment for ecs service detects failed deployment and errors',
- withDefaultFixture(async (fixture) => {
+ withExtendedTimeoutFixture(async (fixture) => {
  // GIVEN
  await fixture.cdkDeploy('ecs-hotswap');
 
@@ -2198,8 +2197,7 @@ integTest(
  allowErrExit: true,
  });
 
- const stackName = `${fixture.stackNamePrefix}-ecs-hotswap`;
- const expectedSubstring = `❌ ${chalk.bold(stackName)} failed: ResourceNotReady: Resource is not in the state deploymentCompleted`;
+ const expectedSubstring = 'Resource is not in the state deploymentCompleted';
 
  expect(deployOutput).toContain(expectedSubstring);
  expect(deployOutput).not.toContain('hotswapped!');

packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.log-retention.js.snapshot/aws-cdk-lambda-log-retention.template.json

@@ -146,7 +146,7 @@
  "S3Bucket": {
  "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
  },
- "S3Key": "e4afb15788ec44ed9ff3377e1d131ba2768d7b2e2931bc000d1f2005879b3035.zip"
+ "S3Key": "c9e084a249774d97a978bed2e1976874a70517128a904136b8737f0792322c1f.zip"
  },
  "Role": {
  "Fn::GetAtt": [

packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.log-group-metrics.js.snapshot/aws-cdk-log-group-metrics.template.json

@@ -0,0 +1,71 @@
+{
+ "Resources": {
+ "MyLogGroup5C0DAD85": {
+ "Type": "AWS::Logs::LogGroup",
+ "Properties": {
+ "LogGroupName": "my-log-group",
+ "RetentionInDays": 731
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
+ },
+ "IncomingBytesPerInstanceAlarmFA8EEFDB": {
+ "Type": "AWS::CloudWatch::Alarm",
+ "Properties": {
+ "ComparisonOperator": "GreaterThanOrEqualToThreshold",
+ "EvaluationPeriods": 1,
+ "MetricName": "IncomingBytes",
+ "Namespace": "AWS/Logs",
+ "Period": 300,
+ "Statistic": "Sum",
+ "Threshold": 1
+ }
+ },
+ "IncomingEventsPerInstanceAlarmA9670D55": {
+ "Type": "AWS::CloudWatch::Alarm",
+ "Properties": {
+ "ComparisonOperator": "GreaterThanOrEqualToThreshold",
+ "EvaluationPeriods": 1,
+ "MetricName": "IncomingLogs",
+ "Namespace": "AWS/Logs",
+ "Period": 300,
+ "Statistic": "Sum",
+ "Threshold": 1
+ }
+ }
+ },
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}