Merge branch 'main' into codepipeline-pipeline-type-default-v2

.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

.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@800a2825992141ddde1a8bca8ad394cec34d3188
+ uses: tj-actions/changed-files@aa08304bd477b800d468db44fe10f6c61f7f7b11
  with:
  base_sha: ${{ github.event.pull_request.base.sha }}
  files_yaml: |

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https:/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.132.1-alpha.0](https:/aws/aws-cdk/compare/v2.132.0-alpha.0...v2.132.1-alpha.0) (2024-03-12)
+
 ## [2.132.0-alpha.0](https:/aws/aws-cdk/compare/v2.131.0-alpha.0...v2.132.0-alpha.0) (2024-03-08)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https:/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.132.1](https:/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:/aws/aws-cdk/issues/29447)) ([effad1c](https:/aws/aws-cdk/commit/effad1cf8a854789070e963691b30fadf1597afb)), closes [#29420](https:/aws/aws-cdk/issues/29420)
+
 ## [2.132.0](https:/aws/aws-cdk/compare/v2.131.0...v2.132.0) (2024-03-08)
 
 

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.132.0/NOTES.md

@@ -0,0 +1 @@
+This patch brings the [fix](https:/aws/aws-cdk/issues/29420) into the regression suite.

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:/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

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: [],
  },
  ],