Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(cloudwatch): return empty CompositeAlarms and LogAlarms from DescribeAlarms (#6363)

Stuart Lang42f5019231b4
diff --git a/compatibility-tests/sdk-test-python/tests/test_cloudwatch.py b/compatibility-tests/sdk-test-python/tests/test_cloudwatch.py
index 9a674cf1ed..6baa1736ab 100644
--- a/compatibility-tests/sdk-test-python/tests/test_cloudwatch.py
+++ b/compatibility-tests/sdk-test-python/tests/test_cloudwatch.py
@@ -203,6 +203,8 @@ class TestCloudWatchAlarms:
alarm = next(a for a in alarms if a["AlarmName"] == alarm_name)
assert alarm["StateValue"] == "INSUFFICIENT_DATA"
+ assert response["CompositeAlarms"] == []
+ assert response["LogAlarms"] == []
finally:
cloudwatch_client.delete_alarms(AlarmNames=[alarm_name])
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.java
index 83a439947e..7b1df65695 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandler.java
@@ -264,6 +264,8 @@ public class CloudWatchMetricsJsonHandler {
if (a.getStateReasonData() != null) node.put("StateReasonData", a.getStateReasonData());
node.put("StateUpdatedTimestamp", a.getStateUpdatedTimestamp());
}
+ response.putArray("CompositeAlarms");
+ response.putArray("LogAlarms");
return Response.ok(response).build();
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.java
index a48bdc067e..054be6be22 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandler.java
@@ -260,6 +260,8 @@ public class CloudWatchMetricsQueryHandler {
toAlarmXml(xml, a);
}
xml.end("MetricAlarms");
+ xml.start("CompositeAlarms").end("CompositeAlarms");
+ xml.start("LogAlarms").end("LogAlarms");
return Response.ok(AwsQueryResponse.envelope("DescribeAlarms", null, xml.build())).build();
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.java
index c8bc6a6c23..b2565d226b 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsJsonHandlerTest.java
@@ -347,6 +347,22 @@ class CloudWatchMetricsJsonHandlerTest {
assertEquals("Count", alarm.get("Unit").asText());
}
+ // AWS sends every alarm collection even when it is empty. The CLI's text output writes a
+ // None line for each paginator result key missing from the page (floci-io/floci#6362).
+ @Test
+ void describeAlarms_returnsEmptyCompositeAndLogAlarmCollections() {
+ handler.handle("PutMetricAlarm", alarmRequest("MetricOnly"), REGION);
+
+ ObjectNode response = (ObjectNode) handler.handle("DescribeAlarms", MAPPER.createObjectNode(), REGION)
+ .getEntity();
+
+ assertEquals(1, response.get("MetricAlarms").size());
+ assertTrue(response.get("CompositeAlarms").isArray());
+ assertTrue(response.get("CompositeAlarms").isEmpty());
+ assertTrue(response.get("LogAlarms").isArray());
+ assertTrue(response.get("LogAlarms").isEmpty());
+ }
+
// An alarm the caller never gave an M for reports no DatapointsToAlarm at all. AWS omits the
// member in that case, and echoing EvaluationPeriods instead reads as a change to any client
// that re-plans against its own configuration, which is what floci-io/floci#3660 hit.
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.java
index efd6edc65b..103ff3d3db 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/metrics/CloudWatchMetricsQueryHandlerTest.java
@@ -241,4 +241,15 @@ class CloudWatchMetricsQueryHandlerTest {
verify(metricsService).putMetricData(eq("NS"), captor.capture(), eq(REGION));
assertEquals(List.of(" "), captor.getValue().stream().map(MetricDatum::getMetricName).toList());
}
+
+ @Test
+ void describeAlarmsReturnsEmptyCompositeAndLogAlarmCollections() {
+ when(metricsService.describeAlarms(any(), any(), eq(REGION))).thenReturn(List.of());
+
+ String xml = (String) handler.handle("DescribeAlarms", new MultivaluedHashMap<>(), REGION).getEntity();
+
+ assertTrue(xml.contains("<MetricAlarms></MetricAlarms>"), xml);
+ assertTrue(xml.contains("<CompositeAlarms></CompositeAlarms>"), xml);
+ assertTrue(xml.contains("<LogAlarms></LogAlarms>"), xml);
+ }
}