Merge branch 'main' into user/ashdhin/userDataCausesReplacement-Basti…

…onHostLinuxProps
aws · Sep 12, 2024 · 923e919 · 923e919
2 parents d6bf834 + 4d12833
commit 923e919
Show file tree

Hide file tree

Showing 27 changed files with 6,333 additions and 1,462 deletions.
diff --git a/.github/workflows/github-merit-badger.yml b/.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]]'
diff --git a/.mergify.yml b/.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:

diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.158.0-alpha.0](https://github.com/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://github.com/aws/aws-cdk/issues/31381)) ([b7bd041](https://github.com/aws/aws-cdk/commit/b7bd0416dc1f809eac22b9dbc49a1947e1cfc262))
+* **iot:** configure IoT Logging ([#31352](https://github.com/aws/aws-cdk/issues/31352)) ([6348717](https://github.com/aws/aws-cdk/commit/63487174736236e329488f4d06b29110d910a031)), closes [#31357](https://github.com/aws/aws-cdk/issues/31357)
+
 ## [2.157.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.156.0-alpha.0...v2.157.0-alpha.0) (2024-09-09)
 
 ## [2.156.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.155.0-alpha.0...v2.156.0-alpha.0) (2024-09-05)

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.158.0](https://github.com/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://github.com/aws/aws-cdk/issues/30515)) ([af9e6ba](https://github.com/aws/aws-cdk/commit/af9e6bae94c0c303364c2c4f2033eb3823fb59c9)), closes [#27594](https://github.com/aws/aws-cdk/issues/27594)
+
 ## [2.157.0](https://github.com/aws/aws-cdk/compare/v2.156.0...v2.157.0) (2024-09-09)
 
 

diff --git a/...pshot/asset.46fb886516825167db3571f1ed91110fc6163ce20ee26fdb097c2c983f25fcd6/framework.js b/...pshot/asset.46fb886516825167db3571f1ed91110fc6163ce20ee26fdb097c2c983f25fcd6/framework.js
diff --git a/...aa869a607e97fab6cd231fe6ef503aec/index.js → ...8bf828540847d3d87b5dabccd17c2578/index.js b/...aa869a607e97fab6cd231fe6ef503aec/index.js → ...8bf828540847d3d87b5dabccd17c2578/index.js
diff --git a/...a9b843b111cd3b6d5fae9c954c006640c4064.zip → ...7cb775e24d61c895ad89e4ca6e9a7fc90b0f0.zip b/...a9b843b111cd3b6d5fae9c954c006640c4064.zip → ...7cb775e24d61c895ad89e4ca6e9a7fc90b0f0.zip
diff --git a/...20ee26fdb097c2c983f25fcd6/cfn-response.js → ...aab690c5105572555dc445fd4/cfn-response.js b/...20ee26fdb097c2c983f25fcd6/cfn-response.js → ...aab690c5105572555dc445fd4/cfn-response.js
diff --git a/...6163ce20ee26fdb097c2c983f25fcd6/consts.js → ...e6efc0aab690c5105572555dc445fd4/consts.js b/...6163ce20ee26fdb097c2c983f25fcd6/consts.js → ...e6efc0aab690c5105572555dc445fd4/consts.js
diff --git a/...pshot/asset.d320874294f5d626406d5f86087c2a2c8e6efc0aab690c5105572555dc445fd4/framework.js b/...pshot/asset.d320874294f5d626406d5f86087c2a2c8e6efc0aab690c5105572555dc445fd4/framework.js
diff --git a/...63ce20ee26fdb097c2c983f25fcd6/outbound.js → ...efc0aab690c5105572555dc445fd4/outbound.js b/...63ce20ee26fdb097c2c983f25fcd6/outbound.js → ...efc0aab690c5105572555dc445fd4/outbound.js
diff --git a/...fc6163ce20ee26fdb097c2c983f25fcd6/util.js → ...c8e6efc0aab690c5105572555dc445fd4/util.js b/...fc6163ce20ee26fdb097c2c983f25fcd6/util.js → ...c8e6efc0aab690c5105572555dc445fd4/util.js
diff --git a/...-cdk-eks-fargate-cluster-test.assets.json → ...s-fargate-cluster-test-stack1.assets.json b/...-cdk-eks-fargate-cluster-test.assets.json → ...s-fargate-cluster-test-stack1.assets.json