Merge remote-tracking branch 'upstream/main' into scope-local-context-cache

Author: luxaritas

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -31,8 +31,8 @@ body:
   - type: input
     id: working-version
     attributes:
-      label: Last Known Working CDK Version
-      description: Specify the last known CDK version where this code was functioning as expected (if applicable).
+      label: Last Known Working CDK Library Version
+      description: Specify the last known CDK Library version where this code was functioning as expected (if applicable).
     validations:
       required: false
   - type: textarea
@@ -84,19 +84,20 @@ body:
       required: false
 
   - type: input
-    id: cdk-version
+    id: cdk-lib-version
     attributes:
-      label: CDK CLI Version
-      description: Output of `cdk version`
+      label: AWS CDK Library version (aws-cdk-lib)
+      description: Run `npm ls aws-cdk-lib` at the root of your CDK project
     validations:
       required: true
 
   - type: input
-    id: framework-version
+    id: cdk-cli-version
     attributes:
-      label: Framework Version
+      label: AWS CDK CLI version
+      description: Run `cdk --version` for global installation or `npx cdk --version` at the root of your CDK project
     validations:
-      required: false
+      required: true
 
   - type: input
     id: node-version

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -46,9 +46,17 @@ body:
         - label: This feature might incur a breaking change
           required: false
   - type: input
-    id: sdk-version
+    id: cdk-lib-version
     attributes:
-      label: CDK version used
+      label: AWS CDK Library version (aws-cdk-lib)
+      description: Run `npm ls aws-cdk-lib` at the root of your CDK project
+    validations:
+      required: true
+  - type: input
+    id: cdk-cli-version
+    attributes:
+      label: AWS CDK CLI version
+      description: Run `cdk --version` for global installation or `npx cdk --version` at the root of your CDK project
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/region.yml

@@ -69,19 +69,17 @@ body:
 
         🚀 Checklist:
 
-        * [ ] Add region in [AWS_CDK_METADATA](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L1) (commented out).
-        * [ ] Add region and zone id in [ROUTE_53_BUCKET_WEBSITE_ZONE_IDS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L40).
-        * [ ] Add region and zone id in [EBS_ENV_ENDPOINT_HOSTED_ZONE_IDS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L77).
-        * [ ] Add region and account in [ELBV2_ACCOUNTS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L116).
-        * [ ] Add region and account in [DLC_REPOSITORY_ACCOUNTS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L149).
-        * [ ] Add region and account in [APPMESH_ECR_ACCOUNTS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L174).
-        * [ ] Add region and ARN in [CLOUDWATCH_LAMBDA_INSIGHTS_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L202) for `1.0.178.0`.
-        * [ ] Add region and CIDR block address in [FIREHOSE_CIDR_BLOCKS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L498).
-        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L529) for most recent version in `x86_64` and `arm64`.
-        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L608) for most recent version in `x86_64` and `arm64`.
-        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L689) for most recent version in `x86_64` and `arm64`.
-        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L768) for most recent version in `x86_64` and `arm64`.
-        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_GENERIC_ARNS](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/build-tools/fact-tables.ts#L847) for most recent version in `x86_64` and `arm64`.
-        * [ ] Add region in [AWS_REGIONS_AND_RULES](https://github.com/aws/aws-cdk/blob/v2.65.0/packages/@aws-cdk/region-info/lib/aws-entities.ts).
-        * [ ] Add partition info if the region is also a new partition in [PARTITION_MAP](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L88)
+        * [ ] Add region and zone id in [ROUTE_53_BUCKET_WEBSITE_ZONE_IDS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L7).
+        * [ ] Add region and zone id in [EBS_ENV_ENDPOINT_HOSTED_ZONE_IDS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L48).
+        * [ ] Add region and account in [ELBV2_ACCOUNTS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L124).
+        * [ ] Add region and account in [DLC_REPOSITORY_ACCOUNTS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L158).
+        * [ ] Add region and account in [APPMESH_ECR_ACCOUNTS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L190).
+        * [ ] Add region and ARN in [CLOUDWATCH_LAMBDA_INSIGHTS_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L485).
+        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_SDK_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L1245) for most recent version in `x86_64` and `arm64`.
+        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVA_AUTO_INSTRUMENTATION_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L1804) for most recent version in `x86_64` and `arm64`.
+        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_JAVASCRIPT_SDK_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L2364) for most recent version in `x86_64` and `arm64`.
+        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_PYTHON_SDK_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L2885) for most recent version in `x86_64` and `arm64`.
+        * [ ] Add region and ARN in [ADOT_LAMBDA_LAYER_GENERIC_ARNS](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L3482) for most recent version in `x86_64` and `arm64`.
+        * [ ] Add region in [AWS_REGIONS_AND_RULES](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/lib/aws-entities.ts#L27).
+        * [ ] Add partition info if the region is also a new partition in [PARTITION_MAP](https://github.com/aws/aws-cdk/blob/05968247399ab79a086a37cf665f4d0c3ed051a7/packages/aws-cdk-lib/region-info/build-tools/fact-tables.ts#L88)
         * [ ] Run integ tests and update snapshots

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,18 +10,19 @@ Closes #<issue number here>.
 
 <!--
 What code changes did you make? 
-Have you made any important design decisions?
-What AWS use cases does this change enable? To enable the use cases, which AWS service features are utilized?
+Why do these changes address the issue?
+What alternatives did you consider and reject?
+What design decisions have you made?
 -->
 
 ### Describe any new or updated permissions being added
 
-<!-- What new or updated IAM permissions are needed to support the changes being introduced ? -->
+<!-- What new or updated IAM permissions are needed to support the changes being introduced? -->
 
 
 ### Description of how you validated changes
 
-<!--Have you added any unit tests and/or integration tests?-->
+<!-- Have you added any unit tests and/or integration tests? Did you test by hand? -->
 
 ### 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)

.github/workflows/README.md

@@ -92,6 +92,12 @@ Owner: CDK support team
 patch file for downloading.
 Owner: Core CDK team
 
+### Yarn Upgrader for deps needing manual work
+
+[yarn-upgrade-need-manual-work.yml](yarn-upgrade-need-manual-work.yml): Upgrades specific dependencies that require manual intervention and creates a PR for review.
+For example, some dependency upgrades require manual updates to the integ test snapshots.
+Owner: Core CDK team
+
 ### AWS Service Spec Update
 
 [spec-update.yml](spec-update.yml): Updates AWS Service Spec and related packages to their latest versions

.github/workflows/codecov-collect.yml

@@ -0,0 +1,35 @@
+name: Codecov Collect
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  collect:
+    name: Collect Coverage
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Build Library
+        run: npx lerna run build --scope=aws-cdk-lib
+
+      - name: Run Core tests
+        run: cd packages/aws-cdk-lib && yarn test core
+
+      - name: Upload Coverage and PR Info
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-artifacts
+          path: |
+            packages/aws-cdk-lib/coverage/cobertura-coverage.xml

.github/workflows/codecov-upload.yml

@@ -0,0 +1,38 @@
+name: Codecov Upload
+
+on:
+  workflow_run:
+    workflows: ["Codecov Collect"]
+    types:
+      - completed
+
+permissions:
+  contents: write
+  id-token: write
+  actions: read
+
+jobs:
+  upload:
+    name: Upload to Codecov
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: coverage-artifacts
+          path: ./coverage
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          run-id: ${{ github.event.workflow_run.id }}
+
+      - name: Upload to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          files: ./coverage/packages/aws-cdk-lib/coverage/cobertura-coverage.xml
+          fail_ci_if_error: true
+          flags: suite.unit
+          use_oidc: true