Merge branch 'main' into fix-27864

.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,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,ashishdhingra,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,aws-cdk-automation,dependabot[bot],mergify[bot]]'
+ ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,ashishdhingra,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,michelle-wangg,aws-cdk-automation,dependabot[bot],mergify[bot]]'

.github/workflows/spec-update.yml

@@ -143,7 +143,7 @@ jobs:
  path: ${{ runner.temp }}
 
  - name: Make Pull Request
- uses: peter-evans/create-pull-request@v6
+ uses: peter-evans/create-pull-request@v7
  with:
  # Git commit details
  branch: automation/spec-update

.github/workflows/update-contributors.yml

@@ -18,7 +18,7 @@ jobs:
  CONTRIB_OUTPUT_FILE: 'CONTRIBUTORS.md'
  CONTRIB_IGNORE: 'github-actions[bot],mergify[bot],dependabot[bot],dependabot-preview[bot],aws-cdk-automation'
  - name: Create a PR
- uses: peter-evans/create-pull-request@v6
+ uses: peter-evans/create-pull-request@v7
  with:
  # Git commit details
  branch: automation/update-contributors

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

@@ -59,7 +59,7 @@ jobs:
  run: '[ -s ${{ runner.temp }}/update-spec.patch ] && git apply ${{ runner.temp }}/update-spec.patch || echo "Empty patch. Skipping."'
 
  - name: Make Pull Request
- uses: peter-evans/create-pull-request@v6
+ uses: peter-evans/create-pull-request@v7
  with:
  # Git commit details
  branch: automation/region-update

.github/workflows/yarn-upgrade.yml

@@ -116,7 +116,7 @@ jobs:
  }}/upgrade.patch || echo "Empty patch. Skipping."'
 
  - name: Make Pull Request
- uses: peter-evans/create-pull-request@v6
+ uses: peter-evans/create-pull-request@v7
  with:
  # Git commit details
  branch: automation/yarn-upgrade

.mergify.yml

@@ -11,7 +11,7 @@ pull_request_rules:
  label:
  add: [ contribution/core ]
  conditions:
- - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|ashishdhingra|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore|shikha372|kirtishrinkhala|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere)$
+ - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|ashishdhingra|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore|shikha372|kirtishrinkhala|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|michelle-wangg)$
  - -label~="contribution/core"
  - name: automatic merge
  actions:

CHANGELOG.v2.alpha.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https:/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.158.0-alpha.0](https:/aws/aws-cdk/compare/v2.157.0-alpha.0...v2.158.0-alpha.0) (2024-09-11)
+
+
+### Features
+
+* **amplify:** support cache configuration for app ([#31381](https:/aws/aws-cdk/issues/31381)) ([b7bd041](https:/aws/aws-cdk/commit/b7bd0416dc1f809eac22b9dbc49a1947e1cfc262))
+* **iot:** configure IoT Logging ([#31352](https:/aws/aws-cdk/issues/31352)) ([6348717](https:/aws/aws-cdk/commit/63487174736236e329488f4d06b29110d910a031)), closes [#31357](https:/aws/aws-cdk/issues/31357)
+
 ## [2.157.0-alpha.0](https:/aws/aws-cdk/compare/v2.156.0-alpha.0...v2.157.0-alpha.0) (2024-09-09)
 
 ## [2.156.0-alpha.0](https:/aws/aws-cdk/compare/v2.155.0-alpha.0...v2.156.0-alpha.0) (2024-09-05)

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.158.0](https:/aws/aws-cdk/compare/v2.157.0...v2.158.0) (2024-09-11)
+
+
+### Bug Fixes
+
+* **cloudformation-include:** can't use CFN intrinsics in Tags ([#30515](https:/aws/aws-cdk/issues/30515)) ([af9e6ba](https:/aws/aws-cdk/commit/af9e6bae94c0c303364c2c4f2033eb3823fb59c9)), closes [#27594](https:/aws/aws-cdk/issues/27594)
+
 ## [2.157.0](https:/aws/aws-cdk/compare/v2.156.0...v2.157.0) (2024-09-09)
 
 

package.json

@@ -15,25 +15,25 @@
  "build-all": "tsc -b"
  },
  "devDependencies": {
- "@nx/workspace": "^19.4.0",
+ "@nx/workspace": "^19.7.2",
  "@types/node": "18.11.19",
  "@types/prettier": "2.6.0",
  "@yarnpkg/lockfile": "^1.1.0",
  "aws-sdk-js-codemod": "^0.28.2",
- "cdk-generate-synthetic-examples": "^0.2.9",
+ "cdk-generate-synthetic-examples": "^0.2.14",
  "conventional-changelog-cli": "^2.2.2",
  "fs-extra": "^9.1.0",
  "graceful-fs": "^4.2.11",
  "jest-junit": "^13.2.0",
- "jsii-diff": "1.102.0",
- "jsii-pacmak": "1.102.0",
- "jsii-reflect": "1.102.0",
- "lerna": "^8.1.5",
- "nx": "^19.4.0",
+ "jsii-diff": "1.103.1",
+ "jsii-pacmak": "1.103.1",
+ "jsii-reflect": "1.103.1",
+ "lerna": "^8.1.8",
+ "nx": "^19.7.2",
  "patch-package": "^6.5.1",
- "semver": "^7.6.2",
+ "semver": "^7.6.3",
  "standard-version": "^9.5.0",
- "ts-jest": "^29.1.5",
+ "ts-jest": "^29.2.5",
  "ts-node": "^10.9.2",
  "typescript": "~5.4.5"
  },

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

@@ -50,9 +50,9 @@
  "@aws-sdk/client-sso": "3.637.0",
  "@aws-sdk/client-sts": "3.637.0",
  "@aws-sdk/credential-providers": "3.637.0",
- "@smithy/util-retry": "3.0.3",
- "@smithy/types": "3.3.0",
- "axios": "^1.7.2",
+ "@smithy/util-retry": "3.0.4",
+ "@smithy/types": "3.4.0",
+ "axios": "^1.7.7",
  "chalk": "^4",
  "fs-extra": "^9.1.0",
  "glob": "^7.2.3",
@@ -61,7 +61,7 @@
  "make-runnable": "^1.4.1",
  "npm": "^8.19.4",
  "p-queue": "^6.6.2",
- "semver": "^7.6.2",
+ "semver": "^7.6.3",
  "sinon": "^9.2.4",
  "ts-mock-imports": "^1.3.16",
  "yaml": "1.10.2",

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

@@ -41,10 +41,10 @@
  "@aws-cdk/integ-tests-alpha": "0.0.0",
  "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
  "@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
- "@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
+ "@aws-cdk/lambda-layer-kubectl-v30": "^2.0.1",
  "aws-cdk-lib": "0.0.0",
  "aws-sdk-mock": "5.6.0",
- "cdk8s": "2.68.85",
+ "cdk8s": "2.69.0",
  "cdk8s-plus-27": "2.9.5",
  "constructs": "^10.0.0"
  },

packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.js.snapshot/aws-cdk-aws-apigatewayv2.template.json

@@ -4,7 +4,8 @@
  "Type": "AWS::ApiGatewayV2::Api",
  "Properties": {
  "Name": "HttpApi",
- "ProtocolType": "HTTP"
+ "ProtocolType": "HTTP",
+ "RouteSelectionExpression": "${request.method} ${request.path}"
  }
  },
  "HttpApiDefaultStage3EEB07D6": {

packages/@aws-cdk-testing/framework-integ/test/aws-apigatewayv2/test/http/integ.api.ts

@@ -6,7 +6,9 @@ import * as apigw from 'aws-cdk-lib/aws-apigatewayv2';
 const app = new cdk.App();
 const stack = new cdk.Stack(app, 'aws-cdk-aws-apigatewayv2');
 
-new apigw.HttpApi(stack, 'HttpApi');
+new apigw.HttpApi(stack, 'HttpApi', {
+ routeSelectionExpression: true,
+});
 
 new IntegTest(app, 'http-api', {
  testCases: [stack],