Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions modules/aws_ecs/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ locals {
ecs_telemetry_fluentbit_image = var.ecs_telemetry_fluentbit_image != "" ? var.ecs_telemetry_fluentbit_image : format("%s:%s", "tryretool/retool-aws-for-fluent-bit", split(":", var.ecs_retool_image)[1])

environment_variables = concat(
var.additional_env_vars, # add additional environment variables
local.base_environment_variables,
local.temporal_mtls_config,
var.code_executor_enabled ? [
Expand Down Expand Up @@ -109,7 +108,8 @@ locals {
"name" : "WORKFLOW_TEMPORAL_TLS_ENABLED",
"value" : tostring(var.temporal_cluster_config.tls_enabled)
}
]
],
var.additional_env_vars, # add additional environment variables after defaults so they can override when necessary
)

task_log_configuration = (
Expand Down
4 changes: 2 additions & 2 deletions modules/aws_ecs_ec2/locals.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
locals {
environment_variables = concat(
var.additional_env_vars, # add additional environment variables
[
{
name = "NODE_ENV"
Expand Down Expand Up @@ -50,6 +49,7 @@ locals {
"name": "DEPLOYMENT_TEMPLATE_TYPE"
"value": "aws-ecs-ec2-terraform-deprecated"
}
]
],
var.additional_env_vars, # add additional environment variables if provided so they can override defaults
)
}