From 278029f25b41d956091835364e5a8de91429712c Mon Sep 17 00:00:00 2001
From: Benura Abeywardena <43112139+BLasan@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:34:56 +0530
Subject: [PATCH] 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*
---
 packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts                 | 3 +--
 .../aws-cloudwatch/test/integ.alarm-with-label.expected.json  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts
index d8c93f66aa910..ef97dc3d79c7f 100644
--- 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
index 9ab6e14f29a6e..6ac734ed6e534 100644
--- 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": {