fix(cloudwatch): cannot create Alarms from labeled metrics that start…

… with a digit (#13560) fixes #13434 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Mar 12, 2021 · 278029f · 278029f
1 parent d3f4284
commit 278029f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts
@@ -257,7 +257,6 @@ export class Alarm extends AlarmBase {
     return dispatchMetric(metric, {
       withStat(stat, conf) {
         self.validateMetricStat(stat, metric);
-
         if (conf.renderingProperties?.label == undefined) {
           return dropUndefined({
             dimensions: stat.dimensions,
@@ -283,7 +282,7 @@ export class Alarm extends AlarmBase {
                 stat: stat.statistic,
                 unit: stat.unitFilter,
               },
-              id: stat.metricName,
+              id: 'm1',
               label: conf.renderingProperties?.label,
               returnData: true,
             } as CfnAlarm.MetricDataQueryProperty,

diff --git a/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-with-label.expected.json b/packages/@aws-cdk/aws-cloudwatch/test/integ.alarm-with-label.expected.json
@@ -5,7 +5,7 @@
             "Properties": {
                 "Metrics": [
                     {
-                        "Id": "Metric",
+                        "Id": "m1",
                         "Label": "Metric [AVG: ${AVG}]",
                         "MetricStat": {
                             "Metric": {
@@ -28,7 +28,7 @@
             "Properties": {
                 "Metrics": [
                     {
-                        "Id": "Metric",
+                        "Id": "m1",
                         "Label": "Metric [AVG: ${AVG}]",
                         "MetricStat": {
                             "Metric": {