Skip to content

Improve workspacing #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Improve workspacing #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfb891c
Update main.tf
sloops77 Jul 13, 2020
7cf955b
scope logs to workspace
sloops77 Aug 6, 2020
06b3d48
add task_vars support
Aug 11, 2020
2f7fd25
add ecr_repository_name override support
Aug 11, 2020
5a65660
fix: broken bits
Aug 11, 2020
c7247d0
update .gitignore
Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ terraform.tfvars
.netbeans
nbproject
.idea
*.iml
.node_history
*.sublime-*
*.atom-*
Expand Down
20 changes: 12 additions & 8 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,17 @@ data "template_file" "tasks" {

template = file("${path.cwd}/${local.services[count.index].task_definition}")

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" {
Expand Down Expand Up @@ -196,7 +200,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)
}
Expand Down