Merge branch 'main' into insight_rule_metric

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,30 @@
-> REPLACE THIS TEXT BLOCK
->
-> Describe the reason for this change, what the solution is, and any
-> important design decisions you made. 
->
-> Remember to follow the [CONTRIBUTING GUIDE] and [DESIGN GUIDELINES] for any
-> code you submit.
->
-> [CONTRIBUTING GUIDE]: https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md
-> [DESIGN GUIDELINES]: https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md
+### Issue # (if applicable)
 
 Closes #<issue number here>.
 
+### Reason for this change
+
+<!--What is the bug or use case behind this change?-->
+
+### Description of changes
+
+<!--What code changes did you make? Have you made any important design decisions?-->
+
+### Description of how you validated changes
+
+<!--Have you added any unit tests and/or integration tests?-->
+
+### Checklist
+- [ ] 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)
+
+<!--Does this PR includes breaking changes? If it does, list them here in the following format (notice how multiple breaking changes should be formatted):
+
+  ```
+  BREAKING CHANGE: Description of the breaking change, the previous behaviour, and the new behaviour. 
+  * **module-name:** Another breaking change
+  * **module-name:** Yet another breaking change
+  ```
+-->
 ----
 
 *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

.github/workflows/auto-approve.yml

@@ -12,6 +12,6 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-    - uses: hmarr/auto-approve-action@v3.2.1
+    - uses: hmarr/auto-approve-action@v4.0.0
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/repo-metrics.yml

@@ -36,7 +36,7 @@ jobs:
         SEARCH_QUERY: 'repo:aws/aws-cdk is:issue created:${{ env.last_month }} -reason:"not planned"'
 
     - name: Create report for issues
-      uses: peter-evans/create-issue-from-file@v4
+      uses: peter-evans/create-issue-from-file@v5
       with:
         title: Monthly issue metrics report
         token: ${{ secrets.GITHUB_TOKEN }}
@@ -50,7 +50,7 @@ jobs:
         SEARCH_QUERY: 'repo:aws/aws-cdk is:pr created:${{ env.last_month }} -is:draft'
 
     - name: Create report for PRs
-      uses: peter-evans/create-issue-from-file@v4
+      uses: peter-evans/create-issue-from-file@v5
       with:
         title: Monthly PR metrics report
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/request-cli-integ-test.yml

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@ae82ed4ae04587b665efad2f206578aa6f0e8539
+        uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

.github/workflows/spec-update.yml

@@ -143,7 +143,7 @@ jobs:
           path: ${{ runner.temp }}
 
       - name: Make Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           # Git commit details
           branch: automation/spec-update

.github/workflows/update-contributors.yml

@@ -18,7 +18,7 @@ jobs:
           CONTRIB_OUTPUT_FILE: 'CONTRIBUTORS.md'
           CONTRIB_IGNORE: 'github-actions[bot],mergify[bot],dependabot[bot],dependabot-preview[bot],aws-cdk-automation'
       - name: Create a PR
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           # Git commit details
           branch: automation/update-contributors

.github/workflows/update-metadata-regions.yml

@@ -59,7 +59,7 @@ jobs:
         run: '[ -s ${{ runner.temp }}/update-spec.patch ] && git apply ${{ runner.temp }}/update-spec.patch || echo "Empty patch. Skipping."'
 
       - name: Make Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           # Git commit details
           branch: automation/region-update

.github/workflows/yarn-upgrade.yml

@@ -116,7 +116,7 @@ jobs:
           }}/upgrade.patch || echo "Empty patch. Skipping."'
 
       - name: Make Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           # Git commit details
           branch: automation/yarn-upgrade

.gitignore

@@ -51,3 +51,7 @@ RELEASE_NOTES.md
 
 # Produced by integ tests
 read*lock
+
+# VSCode jest plugin
+.test-output
+

CHANGELOG.v2.alpha.md

@@ -2,6 +2,29 @@
 
 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.126.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.125.0-alpha.0...v2.126.0-alpha.0) (2024-02-02)
+
+## [2.125.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.124.0-alpha.0...v2.125.0-alpha.0) (2024-01-31)
+
+
+### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES
+
+* **integ-runner:** Parsing of the cli input caused arguments passed after the first instance `--language <language>` to be interpreted as a language as well. This prevented passing a test name after providing cli options. To overcome this limitation, `integ-runner` now requires an explicit `--language` option for each language you want to include: `integ-runner --language javascript --language python`. This was already documented that way and always the intended way to use this feature.
+* **neptune-alpha:** Corrected LogRetention IDs for DatabaseCluster. Previously, regardless of the log type, the string ‘objectObject’ was always included, but after the correction, the log type is now included.
+
+### Features
+
+* **app-staging-synthesizer-alpha:** encryption type for staging bucket ([#28903](https://github.com/aws/aws-cdk/issues/28903)) ([69f4b8d](https://github.com/aws/aws-cdk/commit/69f4b8d6560a293059b9e527be1fac6d1c70c971)), closes [#28815](https://github.com/aws/aws-cdk/issues/28815)
+* **pipes:** EventBridge Pipes alpha module ([#28388](https://github.com/aws/aws-cdk/issues/28388)) ([2d9106b](https://github.com/aws/aws-cdk/commit/2d9106b7bd764a5bca33b7b5e3f3faffde726757)), closes [#23495](https://github.com/aws/aws-cdk/issues/23495)
+
+
+### Bug Fixes
+
+* **integ-runner:** cannot pass test name after `--language` ([#28922](https://github.com/aws/aws-cdk/issues/28922)) ([f9fbbb4](https://github.com/aws/aws-cdk/commit/f9fbbb4bd3a3ff74c3a2b34ffa333ac4fa57de2b))
+* **neptune-alpha:** multiple `cloudwatchLogsExports` cannot be set when configuring log retention ([#28643](https://github.com/aws/aws-cdk/issues/28643)) ([56794fc](https://github.com/aws/aws-cdk/commit/56794fc8a0f1f5d3c1ab29e3ee0a46b138895d32)), closes [#26295](https://github.com/aws/aws-cdk/issues/26295)
+
+## [2.124.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.123.0-alpha.0...v2.124.0-alpha.0) (2024-01-26)
+
 ## [2.123.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.122.0-alpha.0...v2.123.0-alpha.0) (2024-01-24)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,57 @@
 
 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.126.0](https://github.com/aws/aws-cdk/compare/v2.125.0...v2.126.0) (2024-02-02)
+
+
+### Features
+
+* **migrate:** Add CDK Migrate `--from-scan` functionality ([#28962](https://github.com/aws/aws-cdk/issues/28962)) ([bbc14b3](https://github.com/aws/aws-cdk/commit/bbc14b32801f103bc465fd910d507ffa0d06b7fe))
+
+## [2.125.0](https://github.com/aws/aws-cdk/compare/v2.124.0...v2.125.0) (2024-01-31)
+
+
+### Features
+
+* **applicationautoscaling:** validate `evaluationPeriods` and `datapointsToAlarm` for step scaling policy ([#28880](https://github.com/aws/aws-cdk/issues/28880)) ([4034adb](https://github.com/aws/aws-cdk/commit/4034adb5e4453435b959fde5eea16a7824f21e73))
+* **batch:** add fargate Runtime Platform properties to ECS Fargate C… ([#28841](https://github.com/aws/aws-cdk/issues/28841)) ([ac8251f](https://github.com/aws/aws-cdk/commit/ac8251fcdb8b5cc26d917c6d4a95e5eb3ccb2316)), closes [#26484](https://github.com/aws/aws-cdk/issues/26484)
+* **CLI:** Diff Supports Import Change Sets ([#28787](https://github.com/aws/aws-cdk/issues/28787)) ([d973615](https://github.com/aws/aws-cdk/commit/d97361519bfb6a3ebb53939b1e7da4db0a507dee)), closes [#28336](https://github.com/aws/aws-cdk/issues/28336)
+* **cloudfront:** retrieve default distribution metrics ([#28894](https://github.com/aws/aws-cdk/issues/28894)) ([8e115db](https://github.com/aws/aws-cdk/commit/8e115dbca50479b619a3d8f79aad6bbf58f3a8fa)), closes [#28893](https://github.com/aws/aws-cdk/issues/28893)
+* **cognito:** validate oidc provider name ([#28802](https://github.com/aws/aws-cdk/issues/28802)) ([534794c](https://github.com/aws/aws-cdk/commit/534794c900025b174825f82feb00671305555c0a)), closes [#28667](https://github.com/aws/aws-cdk/issues/28667)
+* **sqs:** support for permission settings for dead letter source queues ([#28745](https://github.com/aws/aws-cdk/issues/28745)) ([9e21803](https://github.com/aws/aws-cdk/commit/9e21803b31e5df82f2abc7f6e7c7074a09ad7ed6)), closes [#19766](https://github.com/aws/aws-cdk/issues/19766)
+
+
+### Bug Fixes
+
+* **stepfunctions-tasks:** mediapackagevod service generates wrong action in role policy ([#28775](https://github.com/aws/aws-cdk/issues/28775)) ([305dae0](https://github.com/aws/aws-cdk/commit/305dae0743d7bf283df6a2c54c0f1ed784a56432)), closes [#28774](https://github.com/aws/aws-cdk/issues/28774)
+* revert deprecation of `logRetention` properties ([#28934](https://github.com/aws/aws-cdk/issues/28934)) ([f89a7d2](https://github.com/aws/aws-cdk/commit/f89a7d2256e16d8e508a050706041292c4457e3f)), closes [#28919](https://github.com/aws/aws-cdk/issues/28919)
+* **apigatewayv2:** WebSocketAwsIntegration ignores requestParameters and integrationPassThrough behaviors ([#28921](https://github.com/aws/aws-cdk/issues/28921)) ([990ead3](https://github.com/aws/aws-cdk/commit/990ead35abdb8f4860280a3c75d923b1e5f5b1ba))
+* **eks:** Could not use ec2 instance type and size that their names contains dashes ([#28040](https://github.com/aws/aws-cdk/issues/28040)) ([b32f47c](https://github.com/aws/aws-cdk/commit/b32f47cfd65a5288e7bc2cc5a8a1f8e5f59032f8)), closes [#27587](https://github.com/aws/aws-cdk/issues/27587)
+
+## [2.124.0](https://github.com/aws/aws-cdk/compare/v2.123.0...v2.124.0) (2024-01-26)
+
+
+### Features
+
+* update L1 CloudFormation resource definitions ([#28878](https://github.com/aws/aws-cdk/issues/28878)) ([98cea43](https://github.com/aws/aws-cdk/commit/98cea434e275f855274acbfd9bc24e9d6c9dfe83)), closes [/docs.aws.amazon.com/datasync/latest/userguide/create-s3-location.html#create-s3](https://github.com/aws//docs.aws.amazon.com/datasync/latest/userguide/create-s3-location.html/issues/create-s3)
+* update L1 CloudFormation resource definitions ([#28886](https://github.com/aws/aws-cdk/issues/28886)) ([6a7a24a](https://github.com/aws/aws-cdk/commit/6a7a24afcc1ebebf71c267b890732a455e865cc8))
+* **cloudfront:** additional cloudfront distribution metrics ([#28777](https://github.com/aws/aws-cdk/issues/28777)) ([95d187e](https://github.com/aws/aws-cdk/commit/95d187e4aabf69b7210ffdf53e53eda077b46d6e)), closes [#22922](https://github.com/aws/aws-cdk/issues/22922)
+* **cloudfront:** associate key value stores to functions ([#28571](https://github.com/aws/aws-cdk/issues/28571)) ([5ede456](https://github.com/aws/aws-cdk/commit/5ede4564ce77478a5e1340862f7fa9a686ff10dd)), closes [#28377](https://github.com/aws/aws-cdk/issues/28377)
+* **route53:** latency based routing ([#28723](https://github.com/aws/aws-cdk/issues/28723)) ([169fd91](https://github.com/aws/aws-cdk/commit/169fd91e135556b8efb59d631acaf9a3426eaa53)), closes [#28722](https://github.com/aws/aws-cdk/issues/28722)
+* **s3:** date-based partitioning for log objects ([#28790](https://github.com/aws/aws-cdk/issues/28790)) ([2952408](https://github.com/aws/aws-cdk/commit/29524089854d6f65805aca8ec78181ff39c5723f)), closes [/docs.aws.amazon.com/ja_jp/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfiguration.html#cfn-s3](https://github.com/aws//docs.aws.amazon.com/ja_jp/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfiguration.html/issues/cfn-s3) [#28141](https://github.com/aws/aws-cdk/issues/28141)
+* **sns:** suffix matching to sub filter ([#28795](https://github.com/aws/aws-cdk/issues/28795)) ([2bf6d82](https://github.com/aws/aws-cdk/commit/2bf6d82b37779e3ab8700253323060925bfd7efb)), closes [#28765](https://github.com/aws/aws-cdk/issues/28765)
+
+
+### Bug Fixes
+
+* **cloudwatch-actions:** multiple alarms with LambdaAction for the same Lambda fail (under feature flag) ([#28712](https://github.com/aws/aws-cdk/issues/28712)) ([b1e3dfd](https://github.com/aws/aws-cdk/commit/b1e3dfd9d69770d59d711fc133eefd2ce99eaf31))
+* **cognito:** allow custom email msg placeholder ([#28832](https://github.com/aws/aws-cdk/issues/28832)) ([1dbfa14](https://github.com/aws/aws-cdk/commit/1dbfa14b650e08a0b91ab2c367e37e54d81298c1))
+* **eks:** helm uninstall in custom resource handler does not respect `Wait` ([#28830](https://github.com/aws/aws-cdk/issues/28830)) ([7a30f5d](https://github.com/aws/aws-cdk/commit/7a30f5db9f84f9bf8a62b35dd54ae987806eeb7e)), closes [#28831](https://github.com/aws/aws-cdk/issues/28831)
+* **iam:** allow intrinsic functions in deletion policy ([#28834](https://github.com/aws/aws-cdk/issues/28834)) ([2801355](https://github.com/aws/aws-cdk/commit/280135567956b78fedd6a528cff0adda6171ec33))
+* **iam:** SamlConsolePrincipal returns incorrect url in GovCloud and ISO regions ([#28704](https://github.com/aws/aws-cdk/issues/28704)) ([c1f2abb](https://github.com/aws/aws-cdk/commit/c1f2abb153789f0496e5194e65cfeacfafc65a32)), closes [#25723](https://github.com/aws/aws-cdk/issues/25723)
+* **opensearch:** always create CloudWatch Logs resource policy when logging is enabled ([#28707](https://github.com/aws/aws-cdk/issues/28707)) ([a5a8855](https://github.com/aws/aws-cdk/commit/a5a8855e116dd0da9ebd35a3f40659df1ac562c3)), closes [#23637](https://github.com/aws/aws-cdk/issues/23637)
+* **rds:** proxy target is missing KMS permissions ([#28858](https://github.com/aws/aws-cdk/issues/28858)) ([c17dbde](https://github.com/aws/aws-cdk/commit/c17dbdef15bf145b96366ceb6ae8c96343304af5)), closes [#28850](https://github.com/aws/aws-cdk/issues/28850)
+
 ## [2.123.0](https://github.com/aws/aws-cdk/compare/v2.122.0...v2.123.0) (2024-01-24)
 
 

CONTRIBUTORS.md

@@ -11,22 +11,22 @@ Shout out to our top contributors!
 - [corymhall](https://github.com/corymhall)
 - [shivlaks](https://github.com/shivlaks)
 - [otaviomacedo](https://github.com/otaviomacedo)
-- [madeline-k](https://github.com/madeline-k)
 - [mrgrain](https://github.com/mrgrain)
+- [madeline-k](https://github.com/madeline-k)
 - [NetaNir](https://github.com/NetaNir)
 - [comcalvi](https://github.com/comcalvi)
 - [robertd](https://github.com/robertd)
-- [pahud](https://github.com/pahud)
 - [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
-- [peterwoodworth](https://github.com/peterwoodworth)
+- [pahud](https://github.com/pahud)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
+- [peterwoodworth](https://github.com/peterwoodworth)
 - [lpizzinidev](https://github.com/lpizzinidev)
-- [colifran](https://github.com/colifran)
 - [go-to-k](https://github.com/go-to-k)
+- [colifran](https://github.com/colifran)
 - [nija-at](https://github.com/nija-at)
 - [hoegertn](https://github.com/hoegertn)
 - [watany-dev](https://github.com/watany-dev)
 - [jumic](https://github.com/jumic)
 
 
-_Last updated: Mon, 01 Jan 24 00:09:50 +0000_
+_Last updated: Thu, 01 Feb 24 00:09:34 +0000_

package.json

@@ -28,7 +28,7 @@
     "jsii-diff": "1.94.0",
     "jsii-pacmak": "1.94.0",
     "jsii-reflect": "1.94.0",
-    "jsii-rosetta": "~5.3.8",
+    "jsii-rosetta": "~5.3.9",
     "lerna": "^7.4.2",
     "nx": "^16.10.0",
     "patch-package": "^6.5.1",

packages/@aws-cdk-testing/cli-integ/bin/stage-distribution.ts

@@ -154,7 +154,7 @@ async function main() {
 }
 
 async function validateDirectory(args: {
-  DIRECTORY: string,
+  DIRECTORY: string;
 }) {
   if (!await fs.pathExists(path.join(args.DIRECTORY, 'build.json'))) {
     throw new Error(`${args.DIRECTORY} does not look like a CDK dist directory (build.json missing)`);
@@ -191,7 +191,7 @@ async function doLogin(repo: TestRepository, usageDir: UsageDir, args: {
 }
 
 async function publish(repo: TestRepository, usageDir: UsageDir, args: {
-  DIRECTORY: string,
+  DIRECTORY: string;
   npm?: boolean;
   python?: boolean;
   java?: boolean;

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

@@ -2,8 +2,8 @@ import { Octokit } from '@octokit/rest';
 import * as semver from 'semver';
 
 export async function fetchPreviousVersion(token: string, options?: {
-  priorTo?: string,
-  majorVersion?: string,
+  priorTo?: string;
+  majorVersion?: string;
 }) {
   const github = new Octokit({ auth: token });
   const releases = await github.repos.listReleases({

packages/@aws-cdk-testing/cli-integ/lib/staging/codeartifact.ts

@@ -170,10 +170,10 @@ export class TestRepository {
   }
 
   private async ensureRepository(name: string, options?: {
-    readonly description?: string,
-    readonly external?: string,
-    readonly upstreams?: string[],
-    readonly tags?: Record<string, string>,
+    readonly description?: string;
+    readonly external?: string;
+    readonly upstreams?: string[];
+    readonly tags?: Record<string, string>;
   }) {
     if (await this.repositoryExists(name)) { return; }
 

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

@@ -12,6 +12,7 @@ import { AwsContext, withAws } from './with-aws';
 import { withTimeout } from './with-timeout';
 
 export const DEFAULT_TEST_TIMEOUT_S = 10 * 60;
+export const EXTENDED_TEST_TIMEOUT_S = 30 * 60;
 
 /**
  * Higher order function to execute a block with a CDK app fixture
@@ -185,6 +186,10 @@ export function withDefaultFixture(block: (context: TestFixture) => Promise<void
   return withAws(withTimeout(DEFAULT_TEST_TIMEOUT_S, withCdkApp(block)));
 }
 
+export function withExtendedTimeoutFixture(block: (context: TestFixture) => Promise<void>) {
+  return withAws(withTimeout(EXTENDED_TEST_TIMEOUT_S, withCdkApp(block)));
+}
+
 export function withCDKMigrateFixture(language: string, block: (content: TestFixture) => Promise<void>) {
   return withAws(withTimeout(DEFAULT_TEST_TIMEOUT_S, withCdkMigrateApp(language, block)));
 }

packages/@aws-cdk-testing/cli-integ/package.json

@@ -39,8 +39,8 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1542.0",
-    "axios": "^1.6.5",
+    "aws-sdk": "^2.1548.0",
+    "axios": "^1.6.7",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",
     "jest": "^29.7.0",

packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js

@@ -86,7 +86,35 @@ class MigrateStack extends cdk.Stack {
         value: queue.node.defaultChild.logicalId,
       });
     }
+    if (process.env.SAMPLE_RESOURCES) {
+      const myTopic = new sns.Topic(this, 'migratetopic1', {
+        removalPolicy: cdk.RemovalPolicy.DESTROY,
+      });
+      cdk.Tags.of(myTopic).add('tag1', 'value1');
+      const myTopic2 = new sns.Topic(this, 'migratetopic2', {
+        removalPolicy: cdk.RemovalPolicy.DESTROY,
+      });
+      cdk.Tags.of(myTopic2).add('tag2', 'value2');
+      const myQueue = new sqs.Queue(this, 'migratequeue1', {
+        removalPolicy: cdk.RemovalPolicy.DESTROY,
+      });
+      cdk.Tags.of(myQueue).add('tag3', 'value3');
+    }
+    if (process.env.LAMBDA_RESOURCES) {
+      const myFunction = new lambda.Function(this, 'migratefunction1', {
+        code: lambda.Code.fromInline('console.log("hello world")'),
+        handler: 'index.handler',
+        runtime: lambda.Runtime.NODEJS_18_X,
+      });
+      cdk.Tags.of(myFunction).add('lambda-tag', 'lambda-value');
 
+      const myFunction2 = new lambda.Function(this, 'migratefunction2', {
+        code: lambda.Code.fromInline('console.log("hello world2")'),
+        handler: 'index.handler',
+        runtime: lambda.Runtime.NODEJS_18_X,
+      });
+      cdk.Tags.of(myFunction2).add('lambda-tag', 'lambda-value');
+    }
   }
 }