fix: sanitized cluster name when using existing (#160)

due to #159 , a bug was introduced for the usage of existing ecs_cluster
name.
renamed field to `sanitized_cluster_name` for clarity, and protected it
to fit both use-cases.

more in depth explanation

- input-variable format is `foo`
- while data format for the cluster_name is
`arn:aws:ecs:eu-west-3:425287181461:cluster/foo`. for the ECS autoscale,
we just need `foo`.

not sure about why data is so non-useful  ¯\_(ツ)_/¯
```
$ terraform state show module.aws_cloudvision_single_account.module.cloud_connector.data.aws_ecs_cluster.this

data "aws_ecs_cluster" "this" {
  arn                      = "arn:aws:ecs:eu-west-3:425287181461:cluster/foo"
  cluster_name    = "arn:aws:ecs:eu-west-3:425287181461:cluster/foo"
  id                         = "arn:aws:ecs:eu-west-3:425287181461:cluster/foo"
...
}
```

Author: iru

modules/services/cloud-connector-ecs/ecs-service-autoscaling.tf

@@ -3,7 +3,7 @@ resource "aws_appautoscaling_target" "ecs_target" {
 
   max_capacity       = var.autoscaling_config.max_replicas
   min_capacity       = var.autoscaling_config.min_replicas
-  resource_id        = "service/${local.cluster_name}/${var.name}"
+  resource_id        = "service/${local.sanitized_cluster_name}/${var.name}"
   scalable_dimension = "ecs:service:DesiredCount"
   service_namespace  = "ecs"
 
@@ -36,7 +36,7 @@ resource "aws_appautoscaling_policy" "ecs_memory_above" {
 resource "aws_cloudwatch_metric_alarm" "ecs_memory_above" {
   count = var.enable_autoscaling ? 1 : 0
 
-  alarm_name        = "Step-Scaling-Alarm-Upscale-ECS:service/${local.cluster_name}/${aws_ecs_service.service.name}"
+  alarm_name        = "Step-Scaling-Alarm-Upscale-ECS:service/${local.sanitized_cluster_name}/${aws_ecs_service.service.name}"
   alarm_description = "ECS cloud-connector service is above memory utilization threshold"
 
   metric_name = "MemoryUtilization"
@@ -51,7 +51,7 @@ resource "aws_cloudwatch_metric_alarm" "ecs_memory_above" {
   alarm_actions       = [aws_appautoscaling_policy.ecs_memory_above[0].arn]
 
   dimensions = {
-    ClusterName = local.cluster_name,
+    ClusterName = local.sanitized_cluster_name,
     ServiceName = aws_ecs_service.service.name
   }
 
@@ -91,7 +91,7 @@ resource "aws_appautoscaling_policy" "ecs_memory_below" {
 resource "aws_cloudwatch_metric_alarm" "ecs_memory_below" {
   count = var.enable_autoscaling ? 1 : 0
 
-  alarm_name        = "Step-Scaling-Alarm-Dowscale-ECS:service/${local.cluster_name}/${aws_ecs_service.service.name}"
+  alarm_name        = "Step-Scaling-Alarm-Dowscale-ECS:service/${local.sanitized_cluster_name}/${aws_ecs_service.service.name}"
   alarm_description = "ECS cloud-connector service is below memory utilization threshold"
 
   metric_name = "MemoryUtilization"
@@ -106,7 +106,7 @@ resource "aws_cloudwatch_metric_alarm" "ecs_memory_below" {
   alarm_actions       = [aws_appautoscaling_policy.ecs_memory_below[0].arn]
 
   dimensions = {
-    ClusterName = local.cluster_name,
+    ClusterName = local.sanitized_cluster_name,
     ServiceName = aws_ecs_service.service.name
   }
 

modules/services/cloud-connector-ecs/locals.tf

@@ -1,4 +1,11 @@
 locals {
   deploy_image_scanning                = var.deploy_image_scanning_ecs || var.deploy_image_scanning_ecr || var.deploy_beta_image_scanning_ecr
   deploy_image_scanning_with_codebuild = (var.deploy_image_scanning_ecs || var.deploy_image_scanning_ecr) && !var.deploy_beta_image_scanning_ecr
+
+  verify_ssl = var.verify_ssl == "auto" ? length(regexall("https://.*?\\.sysdig(cloud)?.com/?", data.sysdig_secure_connection.current.secure_url)) == 1 : var.verify_ssl == "true"
+
+  # this must satisfy input provided existing cluster ARNs and just created cluster format
+  # ex. input var: 'foo'
+  # ex. just created cluster name, gathered through tf data : 'arn:aws:ecs:eu-west-3:425287181461:cluster/foo'
+  sanitized_cluster_name = coalesce(split("/", join("/", [var.ecs_cluster_name, ""]))[1], var.ecs_cluster_name)
 }

modules/services/cloud-connector-ecs/main.tf

@@ -1,6 +1 @@
 data "aws_region" "current" {}
-
-locals {
-  verify_ssl   = var.verify_ssl == "auto" ? length(regexall("https://.*?\\.sysdig(cloud)?.com/?", data.sysdig_secure_connection.current.secure_url)) == 1 : var.verify_ssl == "true"
-  cluster_name = coalesce(split("/", var.ecs_cluster_name)[1], var.ecs_cluster_name)
-}

test/trigger-events/README.md

@@ -49,7 +49,7 @@ $ terraform apply
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.38.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
 
 ## Modules