Merge branch 'main' into codepipeline-both-push-pr

Author: mergify[bot]

.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/workflows/enum-auto-updater.yml

@@ -1,8 +1,8 @@
 name: CDK Enums Auto Updater
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 1'
+  schedule: # Runs every Monday at 1pm PT
+    - cron: '0 13 * * 1'
 
 jobs:
   update-l2-enums:
@@ -25,44 +25,6 @@ jobs:
       - name: Install dependencies
         run: cd tools/@aws-cdk/enum-updater && yarn install --frozen-lockfile && yarn build
 
-      - name: Update enum static mapping
-        run: |
-          cd tools/@aws-cdk/enum-updater
-          ./bin/update-static-enum-mapping
-
-      - name: Check for changes
-        id: static-mapping-check
-        run: |
-          cd tools/@aws-cdk/enum-updater
-          if [[ -n "$(git status --porcelain ./lib/static-enum-mapping.json)" ]]; then
-            echo "changes=true" >> $GITHUB_OUTPUT
-          else
-            echo "changes=false" >> $GITHUB_OUTPUT
-          fi
-      
-      - name: Create PR for static mapping changes
-        if: steps.static-mapping-check.outputs.changes == 'true'
-        run: |
-          cd tools/@aws-cdk/enum-updater
-          git config --global user.name 'aws-cdk-automation'
-          git config --global user.email '[email protected]'
-
-          # Create a new branch for the module
-          branchName="enum-update/static-mapping-update"
-          git checkout -b "$branchName"
-
-          git add .  # Add all files changed
-          git commit -m "chore: update enum static mapping"
-          git push origin "$branchName"
-
-          gh pr create --title "chore: update enum static mapping" \
-           --body "This PR updates the CDK enum mapping file." \
-           --base main \
-           --head "$branchName" \
-           --label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Identify Missing Values and Apply Code Changes
         run: |
           cd tools/@aws-cdk/enum-updater
@@ -80,46 +42,99 @@ jobs:
       - name: Commit & Push changes
         if: steps.git-check.outputs.changes == 'true'
         run: |
+          # Enable command logging
+          set -x
+  
+          echo "=== Starting PR creation process ==="
+  
           # Iterate through each module directory that has changes
+          echo "Storing original branch name..."
           git config --global user.name 'aws-cdk-automation'
           git config --global user.email '[email protected]'
+  
+          # Store the original branch name
+          echo "Storing original branch name..."
+          original_branch=$(git rev-parse --abbrev-ref HEAD)
+          echo "Original branch: $original_branch"
+  
           for module in $(git diff --name-only | grep -E '^packages/(@aws-cdk|aws-cdk-lib)/.*' | sed -E 's|^packages/(@aws-cdk\|aws-cdk-lib)/([^/]+).*|\2|' | sort -u); do
+            echo "=== Processing module: $module ==="
             moduleName=$(basename $module)
-                        
+            echo "Module name: $moduleName"
+  
+            # Reset to clean state
+            echo "Resetting to clean state..."
+            git reset --hard HEAD
+            git clean -fd
+                          
             # Determine the correct path for the module
+            echo "Determining module path..."
             if [[ -d "packages/aws-cdk-lib/$module" ]]; then
               modulePath="packages/aws-cdk-lib/$module"
+              echo "Found module in aws-cdk-lib: $modulePath"
             elif [[ -d "packages/@aws-cdk/$module" ]]; then
               modulePath="packages/@aws-cdk/$module"
+              echo "Found module in @aws-cdk: $modulePath"
             else
-              echo "Cannot find module directory for $module"
+              echo "ERROR: Cannot find module directory for $module"
               continue
             fi
-          
+            
             # Check for existing PR with the same name
-            prExists=$(gh pr list --state open --search "feat(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" --json number,title -q '.[].number')
-          
-            # If a PR exists, close it and continue
+            prExists=$(gh pr list --state open --search "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" --json number,title -q '.[].number')
+            
+            # If a PR exists, close it
             if [[ -n "$prExists" ]]; then
-              echo "PR already exists for module ${moduleName#aws-}, closing the existing PR."
-              gh pr close "$prExists" --confirm  # Close the PR by its number
+              echo "Found existing PR #$prExists for module ${moduleName#aws-}, closing it..."
+              gh pr close "$prExists" --confirm
+            else
+              echo "No existing PR found for ${moduleName#aws-}"
             fi
-          
-            # Create a new branch for the module
-            branchName="enum-update/${moduleName#aws-}"
-            git checkout -b "$branchName"
 
+            # Create/switch to branch for the module
+            branchName="enum-update/${moduleName#aws-}"
+            echo "Creating/switching to branch: $branchName"
+            git checkout -B "$branchName" $original_branch  # -B forces branch creation/reset
+  
+            # Re-run the update script for this specific module
+            echo "Re-running update script..."
+            echo "Current directory: $(pwd)"
+            cd tools/@aws-cdk/enum-updater
+            echo "Running update-missing-enums script..."
+            ./bin/update-missing-enums
+            cd ../../..
+            echo "Returned to: $(pwd)"
+              
+            echo "Checking for changes after update..."
+            git status
+              
             # Stage, commit, and push changes for the module
-            git add "$modulePath"  # Using the correct path
+            echo "Staging changes for $modulePath"
+            git add "$modulePath"
+              
+            echo "Committing changes..."
             git commit -m "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}"
-            git push origin "$branchName"
-          
-          # Create a new pull request
-          gh pr create --title "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" \
-           --body "This PR updates the enum values for ${moduleName#aws-}." \
-           --base main \
-           --head "$branchName" \
-           --label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
+              
+            # Force push to overwrite any existing branch
+            echo "Force pushing to remote..."
+            git push -f origin "$branchName"
+            
+            # Create a new pull request
+            echo "Creating pull request..."
+            gh pr create --title "chore(${moduleName#aws-}): add new enum values for ${moduleName#aws-}" \
+              --body "This PR updates the enum values for ${moduleName#aws-}." \
+              --base main \
+              --head "$branchName" \
+              --label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
+              
+            # Return to original branch
+            echo "Returning to original branch: $original_branch"
+            git checkout $original_branch
+              
+            echo "=== Completed processing for module: $module ==="
           done
+  
+          # Disable command logging
+          set +x
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/enum-static-mapping-updater.yml

@@ -0,0 +1,64 @@
+name: CDK Enums Static Mapping Updater
+on:
+  workflow_dispatch:
+  schedule: # Runs every Monday at 12am PT
+    - cron: '0 0 * * 1'
+
+jobs:
+  update-l2-enums:
+    if: github.repository == 'aws/aws-cdk'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Check Out
+        uses: actions/checkout@v4
+        
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "*"
+        env:
+          NODE_OPTIONS: "--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
+
+      - name: Install dependencies
+        run: cd tools/@aws-cdk/enum-updater && yarn install --frozen-lockfile && yarn build
+
+      - name: Update enum static mapping
+        run: |
+          cd tools/@aws-cdk/enum-updater
+          ./bin/update-static-enum-mapping
+
+      - name: Check for changes
+        id: static-mapping-check
+        run: |
+          cd tools/@aws-cdk/enum-updater
+          if [[ -n "$(git status --porcelain ./lib/static-enum-mapping.json)" ]]; then
+            echo "changes=true" >> $GITHUB_OUTPUT
+          else
+            echo "changes=false" >> $GITHUB_OUTPUT
+          fi
+      
+      - name: Create PR for static mapping changes
+        if: steps.static-mapping-check.outputs.changes == 'true'
+        run: |
+          cd tools/@aws-cdk/enum-updater
+          git config --global user.name 'aws-cdk-automation'
+          git config --global user.email '[email protected]'
+
+          # Create a new branch for the module
+          branchName="enum-update/static-mapping-update"
+          git checkout -b "$branchName"
+
+          git add .  # Add all files changed
+          git commit -m "chore: update enum static mapping"
+          git push -f origin "$branchName"
+
+          gh pr create --title "chore: update enum static mapping" \
+           --body "This PR updates the CDK enum mapping file." \
+           --base main \
+           --head "$branchName" \
+           --label "contribution/core,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/github-merit-badger.yml

@@ -17,4 +17,4 @@ jobs:
           badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
           thresholds: '[0,3,6,13,25,50]'
           badge-type: 'achievement'
-          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,aws-cdk-automation,dependabot[bot],mergify[bot]]'
+          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,aws-cdk-automation,dependabot[bot],mergify[bot]]'