Merge branch 'master' into wip/v6

bryantbiggs · web-flow · commit deda673cc810 · 2024-09-03T15:37:39.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.11.4](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v5.11.3...v5.11.4) (2024-08-07)
+
+
+### Bug Fixes
+
+* Local `cluster_name` error when `var.cluster_arn` is empty ([#218](https://github.com/terraform-aws-modules/terraform-aws-ecs/issues/218)) ([42f11fe](https://github.com/terraform-aws-modules/terraform-aws-ecs/commit/42f11fe46b1f2a00125af0ee98813bff25d0bc46))
+
 ## [5.11.3](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v5.11.2...v5.11.3) (2024-07-05)
 
 
diff --git a/modules/service/main.tf b/modules/service/main.tf
@@ -1308,7 +1308,7 @@ resource "aws_ecs_task_set" "ignore_task_definition" {
 locals {
   enable_autoscaling = local.create_service && var.enable_autoscaling && !local.is_daemon
 
-  cluster_name = element(split("/", var.cluster_arn), 1)
+  cluster_name = try(element(split("/", var.cluster_arn), 1), "")
 }
 
 resource "aws_appautoscaling_target" "this" {

Original file line number	Diff line number	Diff line change
`@@ -1308,7 +1308,7 @@ resource "aws_ecs_task_set" "ignore_task_definition" {`
`1308`	`1308`	`locals {`
`1309`	`1309`	`enable_autoscaling = local.create_service && var.enable_autoscaling && !local.is_daemon`
`1310`	`1310`
`1311`		`- cluster_name = element(split("/", var.cluster_arn), 1)`
	`1311`	`+ cluster_name = try(element(split("/", var.cluster_arn), 1), "")`
`1312`	`1312`	`}`
`1313`	`1313`
`1314`	`1314`	`resource "aws_appautoscaling_target" "this" {`