From 97238d5138359fe9eb26fde9aed16af0abe481ce Mon Sep 17 00:00:00 2001
From: Gavin Zhang <yuanhaoz@amazon.com>
Date: Tue, 5 Mar 2024 16:47:01 -0800
Subject: [PATCH] fix(cloudwatch): cloudwatch ec2 alarm action with multiple
 dimension results in error

---
 .../aws-cdk-lib/aws-cloudwatch/lib/alarm.ts   |  2 +-
 .../aws-cloudwatch/test/alarm.test.ts         | 63 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts
index 2c470512a2e81..e25bf8cfe1aef 100644
--- a/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts
+++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/alarm.ts
@@ -267,7 +267,7 @@ export class Alarm extends AlarmBase {
     if (ec2ActionsRegexp.test(actionArn)) {
       // Check per-instance metric
       const metricConfig = this.metric.toMetricConfig();
-      if (metricConfig.metricStat?.dimensions?.length != 1 || metricConfig.metricStat?.dimensions![0].name != 'InstanceId') {
+      if (metricConfig.metricStat?.dimensions?.length != 1 || !metricConfig.metricStat?.dimensions?.some(dimension => dimension.name === 'InstanceId')) {
         throw new Error(`EC2 alarm actions requires an EC2 Per-Instance Metric. (${JSON.stringify(metricConfig)} does not have an 'InstanceId' dimension)`);
       }
     }
diff --git a/packages/aws-cdk-lib/aws-cloudwatch/test/alarm.test.ts b/packages/aws-cdk-lib/aws-cloudwatch/test/alarm.test.ts
index ffc79405b1fe8..85feb315eda91 100644
--- a/packages/aws-cdk-lib/aws-cloudwatch/test/alarm.test.ts
+++ b/packages/aws-cdk-lib/aws-cloudwatch/test/alarm.test.ts
@@ -1,6 +1,8 @@
 import { Construct } from 'constructs';
 import { Match, Template, Annotations } from '../../assertions';
-import { Duration, Stack } from '../../core';
+import { Ec2Action, Ec2InstanceAction } from '../../aws-cloudwatch-actions/lib';
+import { Duration, Stack, App } from '../../core';
+import { ENABLE_PARTITION_LITERALS } from '../../cx-api';
 import { Alarm, IAlarm, IAlarmAction, Metric, MathExpression, IMetric, Stats } from '../lib';
 
 const testMetric = new Metric({
@@ -232,6 +234,65 @@ describe('Alarm', () => {
     });
   });
 
+  test('EC2 alarm actions with InstanceId dimension', () => {
+    // GIVEN
+    const app = new App({ context: { [ ENABLE_PARTITION_LITERALS]: true } });
+    const stack = new Stack(app, 'EC2AlarmStack', { env: { region: 'us-west-2', account: '123456789012' } });
+
+    // WHEN
+    const metric = new Metric({
+      namespace: 'CWAgent',
+      metricName: 'disk_used_percent',
+      dimensionsMap: {
+        InstanceId: 'instance-id',
+      },
+      period: Duration.minutes(5),
+      statistic: 'Average',
+    });
+
+    const sev3Alarm = new Alarm(stack, 'DISK_USED_PERCENT_SEV3', {
+      alarmName: 'DISK_USED_PERCENT_SEV3',
+      actionsEnabled: true,
+      metric: metric,
+      threshold: 1,
+      evaluationPeriods: 1,
+    });
+
+    expect(() => {
+      sev3Alarm.addAlarmAction(new Ec2Action(Ec2InstanceAction.REBOOT));
+    }).not.toThrow();
+  });
+
+  test('EC2 alarm actions without InstanceId dimension', () => {
+    // GIVEN
+    const app = new App({ context: { [ ENABLE_PARTITION_LITERALS]: true } });
+    const stack = new Stack(app, 'EC2AlarmStack', { env: { region: 'us-west-2', account: '123456789012' } });
+
+    // WHEN
+    const metric = new Metric({
+      namespace: 'CWAgent',
+      metricName: 'disk_used_percent',
+      dimensionsMap: {
+        ImageId: 'image-id',
+        InstanceType: 't2.micro',
+      },
+      period: Duration.minutes(5),
+      statistic: 'Average',
+    });
+
+    const sev3Alarm = new Alarm(stack, 'DISK_USED_PERCENT_SEV3', {
+      alarmName: 'DISK_USED_PERCENT_SEV3',
+      actionsEnabled: true,
+      metric: metric,
+      threshold: 1,
+      evaluationPeriods: 1,
+    });
+
+    expect(() => {
+      sev3Alarm.addAlarmAction(new Ec2Action(Ec2InstanceAction.REBOOT));
+    }).toThrow(/EC2 alarm actions requires an EC2 Per-Instance Metric/);
+  });
+
   test('can use percentile string to make alarm', () => {
     // GIVEN
     const stack = new Stack();