Merge pull request #17 from aodn/fix_alb_target_group

tg/tf: generalise the application name
aodn · Dec 9, 2023 · 2f8b366 · 2f8b366
2 parents 941880a + f16de6a
commit 2f8b366
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/deploy/tf/ecs/alb.tf b/deploy/tf/ecs/alb.tf
@@ -1,5 +1,5 @@
 resource "aws_lb_target_group" "app" {
-  name        = "sample-django-app"
+  name        = "${var.app_name}-${var.environment}"
   port        = 80
   protocol    = "HTTP"
   target_type = "ip"

diff --git a/deploy/tf/ecs/ecs.tf b/deploy/tf/ecs/ecs.tf
@@ -19,7 +19,7 @@ module "ecs" {
   version = "~> 5.7.0"
 
   # Cluster Configuration
-  cluster_name = "sample-django-app-${var.environment}"
+  cluster_name = "${var.app_name}-${var.environment}"
   cluster_configuration = {
     name  = "containerInsights"
     value = "enabled"
@@ -41,7 +41,7 @@ module "ecs" {
   # Service Configuration
   services = {
 
-    "sample-django-app-${var.environment}" = {
+    "${var.app_name}-${var.environment}" = {
       capacity_provider_strategy = {
         dedicated = {
           base              = 0

diff --git a/deploy/tf/ecs/variables.tf b/deploy/tf/ecs/variables.tf
@@ -13,6 +13,11 @@ variable "alb_zone_id" {
   type        = string
 }
 
+variable "app_name" {
+  description = "The name of the application e.g. sample-django-app"
+  type        = string
+}
+
 variable "app_hostnames" {
   description = "Hostnames to associate with the application"
   type        = list(string)

diff --git a/deploy/tg/ecs/terragrunt.hcl b/deploy/tg/ecs/terragrunt.hcl
@@ -17,6 +17,7 @@ include "global" {
 }
 
 inputs = {
+  app_name    = get_env("APP_NAME")
   environment = local.global.environment
 
   # DNS hostnames to associate with the container