From bfb891c8da43cf386a336f925931f28d46a5307b Mon Sep 17 00:00:00 2001 From: Thinking Byter Date: Mon, 13 Jul 2020 11:22:52 +0300 Subject: [PATCH 1/6] Update main.tf --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index 118c273..666b082 100644 --- a/main.tf +++ b/main.tf @@ -163,6 +163,7 @@ data "template_file" "tasks" { template = file("${path.cwd}/${local.services[count.index].task_definition}") vars = { + workspace = terraform.workspace container_name = local.services[count.index].name container_port = local.services[count.index].container_port repository_url = aws_ecr_repository.this[count.index].repository_url From 7cf955bcc4950f5f89e604ae43bf193d3f0cf058 Mon Sep 17 00:00:00 2001 From: Thinking Byter Date: Thu, 6 Aug 2020 10:58:38 +0300 Subject: [PATCH 2/6] scope logs to workspace --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 666b082..10f96bf 100644 --- a/main.tf +++ b/main.tf @@ -197,7 +197,7 @@ data "aws_ecs_task_definition" "this" { resource "aws_cloudwatch_log_group" "this" { count = local.services_count > 0 ? local.services_count : 0 - name = "/ecs/${var.name}-${local.services[count.index].name}" + name = "/ecs/${var.name}-${terraform.workspace}-${local.services[count.index].name}" retention_in_days = lookup(local.services[count.index], "logs_retention_days", var.cloudwatch_logs_default_retention_days) } From 06b3d48e29ce1948f7c46728968788c759c377ca Mon Sep 17 00:00:00 2001 From: arolave Date: Tue, 11 Aug 2020 14:35:09 +0300 Subject: [PATCH 3/6] add task_vars support --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index 10f96bf..8ff2064 100644 --- a/main.tf +++ b/main.tf @@ -164,6 +164,7 @@ data "template_file" "tasks" { vars = { workspace = terraform.workspace + task_vars = local.services[count.index].task_vars container_name = local.services[count.index].name container_port = local.services[count.index].container_port repository_url = aws_ecr_repository.this[count.index].repository_url From 2f7fd258b402715f5f2ef4f00d43ae223fa46609 Mon Sep 17 00:00:00 2001 From: arolave Date: Tue, 11 Aug 2020 14:35:29 +0300 Subject: [PATCH 4/6] add ecr_repository_name override support --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 8ff2064..ae43a7f 100644 --- a/main.tf +++ b/main.tf @@ -87,7 +87,7 @@ module "vpc" { resource "aws_ecr_repository" "this" { count = local.services_count > 0 ? local.services_count : 0 - name = "${local.services[count.index].name}-${terraform.workspace}" + name = local.services[count.index].ecr_repository_name != null ? "${local.services[count.index].ecr_repository_name}" : "${local.services[count.index].name}-${terraform.workspace}" } data "template_file" "ecr-lifecycle" { From 5a65660ecb06658b3b1762d285dd09e576224aba Mon Sep 17 00:00:00 2001 From: arolave Date: Tue, 11 Aug 2020 15:56:45 +0300 Subject: [PATCH 5/6] fix: broken bits --- main.tf | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/main.tf b/main.tf index ae43a7f..02702a8 100644 --- a/main.tf +++ b/main.tf @@ -87,7 +87,7 @@ module "vpc" { resource "aws_ecr_repository" "this" { count = local.services_count > 0 ? local.services_count : 0 - name = local.services[count.index].ecr_repository_name != null ? "${local.services[count.index].ecr_repository_name}" : "${local.services[count.index].name}-${terraform.workspace}" + name = "${local.services[count.index].name}-${terraform.workspace}" } data "template_file" "ecr-lifecycle" { @@ -162,15 +162,17 @@ data "template_file" "tasks" { template = file("${path.cwd}/${local.services[count.index].task_definition}") - vars = { - workspace = terraform.workspace - task_vars = local.services[count.index].task_vars - container_name = local.services[count.index].name - container_port = local.services[count.index].container_port - repository_url = aws_ecr_repository.this[count.index].repository_url - log_group = aws_cloudwatch_log_group.this[count.index].name - region = var.region != "" ? var.region : data.aws_region.current.name - } + vars = merge( + { + workspace = terraform.workspace + container_name = local.services[count.index].name + container_port = local.services[count.index].container_port + repository_url = aws_ecr_repository.this[count.index].repository_url + log_group = aws_cloudwatch_log_group.this[count.index].name + region = var.region != "" ? var.region : data.aws_region.current.name + }, + { for k, v in local.services[count.index].task_vars : "task_var_${k}" => v} + ) } resource "aws_ecs_task_definition" "this" { From c7247d06b46491e9ecf9a0b83288fd48373f41c4 Mon Sep 17 00:00:00 2001 From: arolave Date: Wed, 12 Aug 2020 21:16:03 +0300 Subject: [PATCH 6/6] update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6f04c61..c00ac2a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ terraform.tfvars .netbeans nbproject .idea +*.iml .node_history *.sublime-* *.atom-*