fix(ecs): Cloudwatch alarms cleanup on destroy ecs group

spinnaker · Dec 12, 2024 · 2487e0d · 2487e0d
1 parent 7ce44a3
commit 2487e0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...s/src/main/java/com/netflix/spinnaker/clouddriver/ecs/services/EcsCloudMetricService.java b/...s/src/main/java/com/netflix/spinnaker/clouddriver/ecs/services/EcsCloudMetricService.java
@@ -46,7 +46,7 @@ public class EcsCloudMetricService {
   public void deleteMetrics(
       String serviceName, String account, String region, String ecsClusterName) {
     List<EcsMetricAlarm> metricAlarms =
-        metricAlarmCacheClient.getMetricAlarms(ecsClusterName, serviceName, account, region);
+        metricAlarmCacheClient.getMetricAlarms(serviceName, account, region, ecsClusterName);
 
     if (metricAlarms.isEmpty()) {
       return;

diff --git a/...st/groovy/com/netflix/spinnaker/clouddriver/ecs/services/EcsCloudMetricServiceSpec.groovy b/...st/groovy/com/netflix/spinnaker/clouddriver/ecs/services/EcsCloudMetricServiceSpec.groovy
@@ -19,6 +19,7 @@ package com.netflix.spinnaker.clouddriver.ecs.services
 import com.amazonaws.services.applicationautoscaling.AWSApplicationAutoScaling
 import com.amazonaws.services.applicationautoscaling.model.*
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch
+import com.amazonaws.services.cloudwatch.model.DeleteAlarmsRequest
 import com.amazonaws.services.cloudwatch.model.DescribeAlarmsResult
 import com.amazonaws.services.cloudwatch.model.Dimension
 import com.amazonaws.services.cloudwatch.model.MetricAlarm
@@ -409,17 +410,20 @@ class EcsCloudMetricServiceSpec extends Specification {
     5.times {
       metricAlarms << new EcsMetricAlarm(
         accountName: targetAccountName,
-        region: targetRegion
+        region: targetRegion,
+        alarmName: "alarm-name-${it}"
       )
     }
 
-    metricAlarmCacheClient.getMetricAlarms(_, _,_ ,_) >> metricAlarms
+    metricAlarmCacheClient.getMetricAlarms(targetServiceName,targetAccountName,targetRegion,clusterName) >> metricAlarms
 
     when:
     service.deleteMetrics(targetServiceName, targetAccountName, targetRegion, clusterName)
 
     then:
-    1 * targetCloudWatch.deleteAlarms(_)
+    1 * targetCloudWatch.deleteAlarms({ DeleteAlarmsRequest request ->
+      request.alarmNames.sort() == metricAlarms*.alarmName.sort()
+    })
   }