Merge branch 'main' into bedrock-llama3

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -5,6 +5,14 @@ title: "(module name): (short issue description)"
 labels: [bug, needs-triage]
 assignees: []
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        **⚠️ Please read this before filling out the form below:**  
+        If the bug you are reporting is a security-related issue or a security vulnerability,
+        please report it via [Report a security vulnerability](https://github.com/aws/aws-cdk/security/advisories/new) instead of this template.
   - type: textarea
     id: description
     attributes:

.github/workflows/lock-issue-pr-with-message.yml

@@ -0,0 +1,46 @@
+name: Lock Closed Issues and PRs with message
+
+on:
+  pull_request_target:
+    types: [closed]
+  issues:
+    types: [closed]
+
+jobs:
+  auto_comment:
+    permissions:
+      pull-requests: write
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: aws-actions/closed-issue-message@v1
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          message: |
+            Comments on closed issues and PRs are hard for our team to see. 
+            If you need help, please open a new issue that references this one.
+  lock:
+    permissions:
+      pull-requests: write
+      issues: write
+    runs-on: ubuntu-latest
+    needs: auto_comment # only run after comment is complete
+    steps:
+      - name: Lock closed issue or PR
+        run: |
+          if [ "${{ github.event_name }}" == "issues" ]; then
+            ISSUE_NUMBER=${{ github.event.issue.number }}
+            ISSUE_URL=https://api.github.com/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}/lock
+          else
+            ISSUE_NUMBER=${{ github.event.pull_request.number }}
+            ISSUE_URL=https://api.github.com/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}/lock
+          fi
+
+          curl -s -X PUT -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          ${ISSUE_URL} \
+          -d @- <<EOF
+          {
+            "lock_reason": "resolved"
+          }
+          EOF

packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.launch-template.js.snapshot/aws-cdk-ec2-lt-metadata-1.template.json

@@ -211,7 +211,8 @@
        }
       ]
      }
-    ]
+    ],
+    "VersionDescription": "test template v1"
    }
   },
   "sg2860DD91F": {

packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.launch-template.ts

@@ -16,6 +16,7 @@ const sg1 = new ec2.SecurityGroup(stack, 'sg1', {
 });
 
 const lt = new ec2.LaunchTemplate(stack, 'LT', {
+  versionDescription: 'test template v1',
   httpEndpoint: true,
   httpProtocolIpv6: true,
   httpPutResponseHopLimit: 2,