Merge branch 'main' into merge-back/2.110.1

.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,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,aws-cdk-automation,dependabot[bot],mergify[bot]]'
+ ignore-usernames: '[rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,aws-cdk-automation,dependabot[bot],mergify[bot]]'

.github/workflows/pr-linter.yml

@@ -28,7 +28,7 @@ jobs:
  steps:
  - name: 'Download artifact'
  if: github.event_name == 'workflow_run'
- uses: actions/github-script@v6
+ uses: actions/github-script@v7
  with:
  script: |
  let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({

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

@@ -19,7 +19,7 @@ jobs:
  
  status=$(curl -s -o /dev/null -w "%{http_code}" $URL)
  echo "STATUS=${status}" >> "$GITHUB_OUTPUT"
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - uses: actions/github-script@v7
  if: ${{ steps.download.outputs.STATUS == 200 }}
  env:

.mergify.yml

@@ -11,7 +11,7 @@ pull_request_rules:
  label:
  add: [ contribution/core ]
  conditions:
- - author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|corymhall|peterwoodworth|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton)$
+ - author~=^(rix0rrr|MrArnoldPalmer|iliapolo|otaviomacedo|madeline-k|kaizencc|comcalvi|corymhall|peterwoodworth|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar)$
  - -label~="contribution/core"
  - name: automatic merge
  actions:

CONTRIBUTING.md

@@ -48,7 +48,47 @@ let us know if it's not up-to-date (even better, submit a PR with your correcti
 - [Related Repositories](#related-repositories)
 
 ## Contribution Workflow Diagram
-![A workflow diagram for contributing code to the aws-cdk ecosytem](./docs/contribution_flow.png)
+```mermaid
+flowchart TD
+ A(Identify Desired Functionality) --> B(Search For Existing Artifacts)
+ B --> C[External Packages]
+ B --> D[Relevant Issues And PRs]
+ C --> E{"Does A High Quality
+ Solution Exist?"}
+ D --> F{"Is There A PR In Progress"}
+ E --> |Yes| G(("Ask How You
+ Can Help"))
+ F --> |Yes| G
+ E --> |No| H(Evaluate Where To Contribute)
+ F --> |No| H
+ H --> I{"Is There Clear Evidence
+ For Inclusion In AWS-CDK"}
+ I --> |Yes| subEvidence
+ I --> |No| J{"Do You Want To Pursue Eventual
+ Inclusion In AWS-CDK"}
+ J --> |No| L(("Create Private
+ Implementation"))
+ J --> |Yes| K((Publish A Package))
+ subEvidence --> M(Make Pull Request)
+ M --> N{"Passes CI Checks, Linters,
+ And Follows Design Guidelines"}
+ N --> O(Review)
+ O --> |Accepted| R(Hooray!)
+ O --> P(Changes Requested)
+ P --> Q(Make Changes)
+ Q --> O
+ O --> |Refused| K
+
+subgraph subEvidence[Gather Evidence]
+ direction LR
+ engagement[Engagement from Multiple users]
+ core[Intersects With Core Framework Concerns]
+ quality["Clear, Well Defined, Solution With
+ Limited Scope And Clear Boundaries"]
+ external[External Packages]
+ issues[Relevant Issues And PRs]
+end
+```
 
 ## Where to Contribute
 
@@ -106,7 +146,7 @@ The following tools need to be installed on your system prior to installing the
  - We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
 - [Yarn >= 1.19.1, < 2](https://yarnpkg.com/lang/en/docs/install)
 - [.NET SDK >= 6.0.x](https://www.microsoft.com/net/download)
-- [Python >= 3.6.5, < 4.0](https://www.python.org/downloads/release/python-365/)
+- [Python >= 3.8.0, < 4.0](https://www.python.org/downloads/release/python-380/)
 - [Docker >= 19.03](https://docs.docker.com/get-docker/)
  - the Docker daemon must also be running
 

README.md

@@ -23,7 +23,7 @@ The CDK is available in the following languages:
 
 * JavaScript, TypeScript ([Node.js ≥ 14.15.0](https://nodejs.org/download/release/latest-v14.x/))
  * We recommend using a version in [Active LTS](https://nodejs.org/en/about/previous-releases)
-* Python ([Python ≥ 3.6](https://www.python.org/downloads/))
+* Python ([Python ≥ 3.8](https://www.python.org/downloads/))
 * Java ([Java ≥ 8](https://www.oracle.com/technetwork/java/javase/downloads/index.html) and [Maven ≥ 3.5.4](https://maven.apache.org/download.cgi))
 * .NET ([.NET ≥ 6.0](https://dotnet.microsoft.com/download))
 * Go ([Go ≥ 1.16.4](https://golang.org/))

package.json

@@ -19,15 +19,15 @@
  "@types/node": "18.11.19",
  "@types/prettier": "2.6.0",
  "@yarnpkg/lockfile": "^1.1.0",
- "aws-sdk-js-codemod": "^0.26.2",
- "cdk-generate-synthetic-examples": "^0.1.295",
+ "aws-sdk-js-codemod": "^0.28.2",
+ "cdk-generate-synthetic-examples": "^0.1.297",
  "conventional-changelog-cli": "^2.2.2",
  "fs-extra": "^9.1.0",
  "graceful-fs": "^4.2.11",
  "jest-junit": "^13.2.0",
- "jsii-diff": "1.91.0",
- "jsii-pacmak": "1.91.0",
- "jsii-reflect": "1.91.0",
+ "jsii-diff": "1.92.0",
+ "jsii-pacmak": "1.92.0",
+ "jsii-reflect": "1.92.0",
  "jsii-rosetta": "~5.2.2",
  "lerna": "^7.4.2",
  "nx": "^16.10.0",

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

@@ -39,8 +39,8 @@
  },
  "dependencies": {
  "@octokit/rest": "^18.12.0",
- "aws-sdk": "^2.1492.0",
- "axios": "^1.6.0",
+ "aws-sdk": "^2.1498.0",
+ "axios": "^1.6.2",
  "fs-extra": "^9.1.0",
  "glob": "^7.2.3",
  "jest": "^29.7.0",

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.request-authorizer.lit.js.snapshot/RequestAuthorizerInteg.template.json

@@ -188,7 +188,7 @@
  "UpdateReplacePolicy": "Retain",
  "DeletionPolicy": "Retain"
  },
- "MyRestApiDeploymentB555B582d83364d66d67f510f848797cd89349d5": {
+ "MyRestApiDeploymentB555B58276a4103e7ef38befb395a9ace5fdce44": {
  "Type": "AWS::ApiGateway::Deployment",
  "Properties": {
  "Description": "Automatically created by the RestApi construct",
@@ -208,7 +208,7 @@
  "Type": "AWS::ApiGateway::Stage",
  "Properties": {
  "DeploymentId": {
- "Ref": "MyRestApiDeploymentB555B582d83364d66d67f510f848797cd89349d5"
+ "Ref": "MyRestApiDeploymentB555B58276a4103e7ef38befb395a9ace5fdce44"
  },
  "RestApiId": {
  "Ref": "MyRestApi2D1F47A9"
@@ -306,6 +306,7 @@
  "MyAuthorizer6575980E": {
  "Type": "AWS::ApiGateway::Authorizer",
  "Properties": {
+ "AuthorizerResultTtlInSeconds": 300,
  "AuthorizerUri": {
  "Fn::Join": [
  "",
@@ -366,6 +367,7 @@
  "MySecondAuthorizer25A69B96": {
  "Type": "AWS::ApiGateway::Authorizer",
  "Properties": {
+ "AuthorizerResultTtlInSeconds": 300,
  "AuthorizerUri": {
  "Fn::Join": [
  "",

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer-iam-role.js.snapshot/TokenAuthorizerIAMRoleInteg.template.json

@@ -79,6 +79,7 @@
  "Arn"
  ]
  },
+ "AuthorizerResultTtlInSeconds": 300,
  "AuthorizerUri": {
  "Fn::Join": [
  "",
@@ -233,7 +234,7 @@
  "UpdateReplacePolicy": "Retain",
  "DeletionPolicy": "Retain"
  },
- "MyRestApiDeploymentB555B582694e8eb3fdb7b5f988ba347d35601979": {
+ "MyRestApiDeploymentB555B58259401a546b13c99de2d05e5e255a9ede": {
  "Type": "AWS::ApiGateway::Deployment",
  "Properties": {
  "Description": "Automatically created by the RestApi construct",
@@ -251,7 +252,7 @@
  "Type": "AWS::ApiGateway::Stage",
  "Properties": {
  "DeploymentId": {
- "Ref": "MyRestApiDeploymentB555B582694e8eb3fdb7b5f988ba347d35601979"
+ "Ref": "MyRestApiDeploymentB555B58259401a546b13c99de2d05e5e255a9ede"
  },
  "RestApiId": {
  "Ref": "MyRestApi2D1F47A9"

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer.js.snapshot/TokenAuthorizerInteg.template.json

@@ -96,6 +96,7 @@
  "MyAuthorizer6575980E": {
  "Type": "AWS::ApiGateway::Authorizer",
  "Properties": {
+ "AuthorizerResultTtlInSeconds": 600,
  "AuthorizerUri": {
  "Fn::Join": [
  "",
@@ -208,7 +209,7 @@
  "UpdateReplacePolicy": "Retain",
  "DeletionPolicy": "Retain"
  },
- "MyRestApiDeploymentB555B582e0e53f2547b469b538202de55968eaf0": {
+ "MyRestApiDeploymentB555B5827a9cde8f137f97e5aa74fca164d09d74": {
  "Type": "AWS::ApiGateway::Deployment",
  "Properties": {
  "Description": "Automatically created by the RestApi construct",
@@ -226,7 +227,7 @@
  "Type": "AWS::ApiGateway::Stage",
  "Properties": {
  "DeploymentId": {
- "Ref": "MyRestApiDeploymentB555B582e0e53f2547b469b538202de55968eaf0"
+ "Ref": "MyRestApiDeploymentB555B5827a9cde8f137f97e5aa74fca164d09d74"
  },
  "RestApiId": {
  "Ref": "MyRestApi2D1F47A9"

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer.ts

@@ -16,6 +16,7 @@ const authorizerFn = new lambda.Function(stack, 'MyAuthorizerFunction', {
 
 const authorizer = new TokenAuthorizer(stack, 'MyAuthorizer', {
  handler: authorizerFn,
+ resultsCacheTtl: Duration.minutes(10),
 });
 
 const restapi = new RestApi(stack, 'MyRestApi', {