fix(cloudwatch): update regex expression that prevents CloudWatch:Mat…

…h:UnknownIdentifier warnings (aws#33591) Signed-off-by: Sergio García Prado <[email protected]>
garciparedes · Feb 26, 2025 · b3628d0 · b3628d0
1 parent 6df9bfe
commit b3628d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts
@@ -707,7 +707,7 @@ export class MathExpression implements IMetric {
     // we can add warnings.
     const missingIdentifiers = allIdentifiersInExpression(this.expression).filter(i => !this.usingMetrics[i]);
 
-    if (!this.expression.toUpperCase().match('\\s*INSIGHT_RULE_METRIC|SELECT|SEARCH|METRICS\\s.*') && missingIdentifiers.length > 0) {
+    if (!this.expression.toUpperCase().match('.*\\b(INSIGHT_RULE_METRIC|SELECT|SEARCH|METRICS)\\b.*') && missingIdentifiers.length > 0) {
       warnings['CloudWatch:Math:UnknownIdentifier'] = `Math expression '${this.expression}' references unknown identifiers: ${missingIdentifiers.join(', ')}. Please add them to the 'usingMetrics' map.`;
     }
 

diff --git a/packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts b/packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts
@@ -80,6 +80,15 @@ describe('Metric Math', () => {
     expect(m.warningsV2).toBeUndefined();
   });
 
+  test('metrics METRICS expression with parameters does not produce warning for unknown identifier', () => {
+    const m = new MathExpression({
+      expression: 'SUM(METRICS("partial"))',
+      usingMetrics: {},
+    });
+
+    expect(m.warningsV2).toBeUndefined();
+  });
+
   test('metrics search expression does not produce warning for unknown identifier', () => {
     const m = new MathExpression({
       expression: "SEARCH('{dimension_one, dimension_two} my_metric', 'Average', 300)",