Conversation
| return Array.from(matchAll(x, FIND_VARIABLE)).map(m => m[0]); | ||
| // Remove CDK token patterns before extracting identifiers | ||
| // Token format: ${Token[TOKEN.123]} or ${Token[TOKEN.456]} | ||
| const withoutTokens = x.replace(/\$\{Token\[[^\]]+\]\}/g, ''); |
Check failure
Code scanning / CodeQL
Polynomial regular expression used on uncontrolled data High
aws-cdk-automation
requested changes
Feb 4, 2026
Collaborator
aws-cdk-automation
left a comment
There was a problem hiding this comment.
The pull request linter fails with the following errors:
❌ Fixes must contain a change to an integration test file and the resulting snapshot.
If you believe this pull request should receive an exemption, please comment and provide a justification. A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed, add Clarification Request to a comment.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue # (if applicable)
Closes #34977.
Reason for this change
When using CDK tokens (from custom resources or other dynamic values) in CloudWatch MathExpression, users receive a false positive warning message. The
allIdentifiersInExpressionfunction incorrectly parses token strings like${Token[TOKEN.81]}and extracts "oken" as an identifier, triggering a confusing warning that suggests adding "oken" to theusingMetricsmap.This degrades user experience and creates confusion, particularly for users leveraging custom resources or dynamic values in CloudWatch dashboards.
Description of changes
Modified the
allIdentifiersInExpressionfunction inpackages/aws-cdk-lib/aws-cloudwatch/lib/metric.tsto filter out CDK token patterns before extracting metric identifiers:${Token[TOKEN.N]}) from expressions before identifier extraction/\$\{Token\[[^\]]+\]\}/gmatches the standard CDK token formatTechnical Details:
This approach follows the same pattern used for special functions (SEARCH, METRICS, SELECT, INSIGHT_RULE_METRIC) where certain syntax patterns are filtered or handled specially before validation.
No breaking changes - This fix only removes false positive warnings and does not affect CloudFormation template generation, resource behavior, or public APIs.
Describe any new or updated permissions being added
N/A - No IAM permissions or resource access changes. This is a validation-only fix that does not affect CloudFormation templates or runtime behavior.
Description of how you validated changes
Unit tests: Added 4 new unit tests in
packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts:Regression testing: All 40 existing unit tests pass without modification, confirming:
Build validation:
yarn lint --fix)Checklist