Skip to content

Commit d22a45d

Browse files
committed
Cleaning up commented out overrides.
1 parent 0247a79 commit d22a45d

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

terraform/modules/service/main.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
locals {
2-
# awslogs_group = var.awslogs_group_override != null ? var.awslogs_group_override : local.service_name
3-
# container_name = var.container_name_override != null ? var.container_name_override : local.service_name
42
service_name = var.service_name_override != null ? var.service_name_override : var.platform.service
53
service_name_full = "${var.platform.app}-${var.platform.env}-${local.service_name}"
64
}
@@ -15,7 +13,6 @@ resource "aws_ecs_task_definition" "this" {
1513
memory = var.memory
1614
container_definitions = nonsensitive(jsonencode([
1715
{
18-
# name = local.container_name
1916
name = local.service_name
2017
image = var.image
2118
readonlyRootFilesystem = true
@@ -26,7 +23,6 @@ resource "aws_ecs_task_definition" "this" {
2623
logConfiguration = {
2724
logDriver = "awslogs"
2825
options = {
29-
# awslogs-group = "/aws/ecs/fargate/${var.platform.app}-${var.platform.env}/${local.awslogs_group}"
3026
awslogs-group = "/aws/ecs/fargate/${var.platform.app}-${var.platform.env}/${local.service_name}"
3127
awslogs-create-group = "true"
3228
awslogs-region = var.platform.primary_region.name

terraform/modules/service/variables.tf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# variable "awslogs_group_override" {
2-
# default = null
3-
# description = "Override to allow to non-standard log group names that do not match the service name."
4-
# type = string
5-
# }
6-
71
variable "cluster_arn" {
82
description = "The ecs cluster ARN hosting the service and task."
93
type = string
@@ -18,12 +12,6 @@ variable "container_environment" {
1812
default = null
1913
}
2014

21-
# variable "container_name_override" {
22-
# default = null
23-
# description = "Override to allow for non-standard container names that do not match the service name."
24-
# type = string
25-
# }
26-
2715
variable "container_secrets" {
2816
description = "The secrets to pass to the container. For more information, see [Specifying Sensitive Data](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data.html) in the Amazon Elastic Container Service Developer Guide"
2917
type = list(object({

0 commit comments

Comments
 (0)