Merge branch 'main' into conroy/cm

aws · Feb 15, 2025 · 5ddfefd · 5ddfefd
2 parents 54e46b8 + 59470c5
commit 5ddfefd
Show file tree

Hide file tree

Showing 24 changed files with 2,630 additions and 7 deletions.
diff --git a/...aws-logs/test/integ.metricfilter.lit.js.snapshot/aws-cdk-metricfilter-integ.template.json b/...aws-logs/test/integ.metricfilter.lit.js.snapshot/aws-cdk-metricfilter-integ.template.json
@@ -11,7 +11,7 @@
   "MetricFilter1B93B6E5": {
    "Type": "AWS::Logs::MetricFilter",
    "Properties": {
-    "FilterPattern": "{ $.latency = \"*\" }",
+    "FilterPattern": "{ ($.latency = \"*\") && ($.message = %bind: address already in use%) }",
     "LogGroupName": {
      "Ref": "LogGroupF5B46931"
     },

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.metricfilter.lit.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-logs/test/integ.metricfilter.lit.ts
@@ -15,7 +15,10 @@ class MetricFilterIntegStack extends Stack {
       metricNamespace: 'MyApp',
       metricName: 'Latency',
       filterName: 'MyFilterName',
-      filterPattern: FilterPattern.exists('$.latency'),
+      filterPattern: FilterPattern.all(
+        FilterPattern.exists('$.latency'),
+        FilterPattern.regexValue('$.message', '=', 'bind: address already in use'),
+      ),
       metricValue: '$.latency',
     });
     /// !hide

diff --git a/...ateway/integ.call-rest-api-cross-region.js.snapshot/CallRestApiInteg-ApiStack.assets.json b/...ateway/integ.call-rest-api-cross-region.js.snapshot/CallRestApiInteg-ApiStack.assets.json