Skip to content

fix(cloudwatch): update regex expression that prevents CloudWatch:Mah:UnknownIdentifier warnings (#33591) #33592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 3, 2025
Merged

fix(cloudwatch): update regex expression that prevents CloudWatch:Mah:UnknownIdentifier warnings (#33591) #33592

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4b93e7
fix(cloudwatch): update regex expression that prevents CloudWatch:Mat…
garciparedes Feb 26, 2025
1c285aa
Merge branch 'main' into fix-cloudwatch-expression-warning
mergify[bot] Mar 1, 2025
7c986b1
Merge branch 'main' into fix-cloudwatch-expression-warning
garciparedes Mar 3, 2025
6f9c2de
Merge branch 'main' into fix-cloudwatch-expression-warning
GavinZZ Mar 3, 2025
1d11712
Merge branch 'main' into fix-cloudwatch-expression-warning
mergify[bot] Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.`;
}

Expand Down
9 changes: 9 additions & 0 deletions packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ describe('Metric Math', () => {
expect(m.warningsV2).toBeUndefined();
});

test('metrics METRICS expression with parameter does not produce warning for unknown identifier', () => {
const m = new MathExpression({
expression: 'SUM(METRICS("parameter"))',
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)",
Expand Down