Skip to content

Commit fbad131

Browse files
committed
more updates
1 parent b33e105 commit fbad131

File tree

1 file changed

+72
-72
lines changed

1 file changed

+72
-72
lines changed

main.tf

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ locals {
190190
containerPath = local.mount_path
191191
sourceVolume = "efs"
192192
readOnly = false
193-
}] : try(var.atlantis.mount_points, [])
193+
}] : try(var.atlantis.mountPoints, [])
194194

195195
# Ref https://github.com/terraform-aws-modules/terraform-aws-atlantis/issues/383
196196
deployment_maximum_percent = var.enable_efs ? 100 : 200
@@ -233,17 +233,17 @@ module "ecs_service" {
233233

234234
# Service
235235
ignore_task_definition_changes = try(var.service.ignore_task_definition_changes, false)
236-
alarms = try(var.service.alarms, { alarm_names = [] })
237-
capacity_provider_strategy = try(var.service.capacity_provider_strategy, {})
236+
alarms = try(var.service.alarms, null)
237+
capacity_provider_strategy = var.service.capacity_provider_strategy
238238
cluster_arn = var.create_cluster && var.create ? module.ecs_cluster.arn : var.cluster_arn
239-
deployment_controller = try(var.service.deployment_controller, {})
239+
deployment_controller = var.service.deployment_controller
240240
deployment_maximum_percent = try(var.service.deployment_maximum_percent, local.deployment_maximum_percent)
241241
deployment_minimum_healthy_percent = try(var.service.deployment_minimum_healthy_percent, local.deployment_minimum_healthy_percent)
242242
desired_count = try(var.service.desired_count, 1)
243243
enable_ecs_managed_tags = try(var.service.enable_ecs_managed_tags, true)
244244
enable_execute_command = try(var.service.enable_execute_command, false)
245245
force_new_deployment = try(var.service.force_new_deployment, true)
246-
health_check_grace_period_seconds = try(var.service.health_check_grace_period_seconds, null)
246+
health_check_grace_period_seconds = var.service.health_check_grace_period_seconds
247247
launch_type = try(var.service.launch_type, "FARGATE")
248248
load_balancer = merge(
249249
{
@@ -259,44 +259,44 @@ module "ecs_service" {
259259
assign_public_ip = try(var.service.assign_public_ip, false)
260260
security_group_ids = try(var.service.security_group_ids, [])
261261
subnet_ids = try(var.service.subnet_ids, var.service_subnets)
262-
ordered_placement_strategy = try(var.service.ordered_placement_strategy, {})
263-
placement_constraints = try(var.service.placement_constraints, {})
264-
platform_version = try(var.service.platform_version, null)
265-
propagate_tags = try(var.service.propagate_tags, null)
266-
scheduling_strategy = try(var.service.scheduling_strategy, null)
267-
service_connect_configuration = lookup(var.service, "service_connect_configuration", {})
268-
service_registries = try(var.service.service_registries, null)
269-
timeouts = try(var.service.timeouts, {})
270-
triggers = try(var.service.triggers, {})
271-
wait_for_steady_state = try(var.service.wait_for_steady_state, null)
262+
ordered_placement_strategy = var.service.ordered_placement_strategy
263+
placement_constraints = var.service.placement_constraints
264+
platform_version = var.service.platform_version
265+
propagate_tags = var.service.propagate_tags
266+
scheduling_strategy = var.service.scheduling_strategy
267+
service_connect_configuration = var.service.service_connect_configuration
268+
service_registries = var.service.service_registries
269+
timeouts = var.service.timeouts
270+
triggers = var.service.triggers
271+
wait_for_steady_state = var.service.wait_for_steady_state
272272

273273
# Service IAM role
274274
create_iam_role = try(var.service.create_iam_role, true)
275-
iam_role_arn = try(var.service.iam_role_arn, null)
276-
iam_role_name = try(var.service.iam_role_name, null)
275+
iam_role_arn = var.service.iam_role_arn
276+
iam_role_name = var.service.iam_role_name
277277
iam_role_use_name_prefix = try(var.service.iam_role_use_name_prefix, true)
278-
iam_role_path = try(var.service.iam_role_path, null)
279-
iam_role_description = try(var.service.iam_role_description, null)
280-
iam_role_permissions_boundary = try(var.service.iam_role_permissions_boundary, null)
278+
iam_role_path = var.service.iam_role_path
279+
iam_role_description = var.service.iam_role_description
280+
iam_role_permissions_boundary = var.service.iam_role_permissions_boundary
281281
iam_role_tags = try(var.service.iam_role_tags, {})
282282
iam_role_statements = lookup(var.service, "iam_role_statements", [])
283283

284284
# Task definition
285285
create_task_definition = try(var.service.create_task_definition, true)
286-
task_definition_arn = try(var.service.task_definition_arn, null)
286+
task_definition_arn = var.service.task_definition_arn
287287
container_definitions = merge(
288288
{
289289
atlantis = {
290290
command = try(var.atlantis.command, [])
291291
cpu = try(var.atlantis.cpu, 1024)
292-
dependencies = try(var.atlantis.dependencies, []) # depends_on is a reserved word
293-
disable_networking = try(var.atlantis.disable_networking, null)
294-
dns_search_domains = try(var.atlantis.dns_search_domains, [])
295-
dns_servers = try(var.atlantis.dns_servers, [])
296-
docker_labels = try(var.atlantis.docker_labels, {})
297-
docker_security_options = try(var.atlantis.docker_security_options, [])
292+
dependsOn = try(var.atlantis.depends_on, [])
293+
disableNetworking = try(var.atlantis.disableNetworking, null)
294+
dnsSearchDomains = try(var.atlantis.dnsSearchDomains, [])
295+
dnsServers = try(var.atlantis.dnsServers, [])
296+
dockerLabels = try(var.atlantis.dockerLabels, {})
297+
dockerSecurityOptions = try(var.atlantis.dockerSecurityOptions, [])
298298
enable_execute_command = try(var.atlantis.enable_execute_command, try(var.service.enable_execute_command, false))
299-
entrypoint = try(var.atlantis.entrypoint, [])
299+
entryPoint = try(var.atlantis.entryPoint, [])
300300
environment = concat(
301301
[
302302
{
@@ -310,40 +310,40 @@ module "ecs_service" {
310310
],
311311
lookup(var.atlantis, "environment", [])
312312
)
313-
environment_files = try(var.atlantis.environment_files, [])
313+
environmentFiles = try(var.atlantis.environmentFiles, [])
314314
essential = try(var.atlantis.essential, true)
315-
extra_hosts = try(var.atlantis.extra_hosts, [])
316-
firelens_configuration = try(var.atlantis.firelens_configuration, {})
317-
health_check = try(var.atlantis.health_check, {})
315+
extraHosts = try(var.atlantis.extraHosts, [])
316+
firelensConfiguration = try(var.atlantis.firelensConfiguration, {})
317+
healthCheck = try(var.atlantis.healthCheck, {})
318318
hostname = try(var.atlantis.hostname, null)
319319
image = try(var.atlantis.image, "ghcr.io/runatlantis/atlantis:latest")
320320
interactive = try(var.atlantis.interactive, false)
321321
links = try(var.atlantis.links, [])
322-
linux_parameters = try(var.atlantis.linux_parameters, {})
323-
log_configuration = lookup(var.atlantis, "log_configuration", {})
322+
linuxParameters = try(var.atlantis.linuxParameters, {})
323+
logConfiguration = lookup(var.atlantis, "logConfiguration", {})
324324
memory = try(var.atlantis.memory, 2048)
325-
memory_reservation = try(var.atlantis.memory_reservation, null)
326-
mount_points = local.mount_points
325+
memoryReservation = try(var.atlantis.memoryReservation, null)
326+
mountPoints = local.mount_points
327327
name = "atlantis"
328-
port_mappings = [{
328+
portMappings = [{
329329
name = "atlantis"
330330
containerPort = local.atlantis_port
331331
hostPort = local.atlantis_port
332332
protocol = "tcp"
333333
}]
334334
privileged = try(var.atlantis.privileged, false)
335-
pseudo_terminal = try(var.atlantis.pseudo_terminal, false)
336-
readonly_root_filesystem = try(var.atlantis.readonly_root_filesystem, false)
337-
repository_credentials = try(var.atlantis.repository_credentials, {})
338-
resource_requirements = try(var.atlantis.resource_requirements, [])
335+
pseudoTerminal = try(var.atlantis.pseudoTerminal, false)
336+
readonlyRootFilesystem = try(var.atlantis.readonlyRootFilesystem, false)
337+
repositoryCredentials = try(var.atlantis.repositoryCredentials, {})
338+
resourceRequirements = try(var.atlantis.resourceRequirements, [])
339339
secrets = try(var.atlantis.secrets, [])
340-
start_timeout = try(var.atlantis.start_timeout, 30)
341-
stop_timeout = try(var.atlantis.stop_timeout, 120)
342-
system_controls = try(var.atlantis.system_controls, [])
340+
startTimeout = try(var.atlantis.startTimeout, 30)
341+
stopTimeout = try(var.atlantis.stopTimeout, 120)
342+
systemControls = try(var.atlantis.systemControls, [])
343343
ulimits = try(var.atlantis.ulimits, [])
344344
user = try(var.atlantis.user, "${var.atlantis_uid}:${var.atlantis_gid}")
345-
volumes_from = try(var.atlantis.volumes_from, [])
346-
working_directory = try(var.atlantis.working_directory, null)
345+
volumesFrom = try(var.atlantis.volumesFrom, [])
346+
workingDirectory = try(var.atlantis.workingDirectory, null)
347347

348348
# CloudWatch Log Group
349349
service = var.name
@@ -357,20 +357,20 @@ module "ecs_service" {
357357
lookup(var.service, "container_definitions", {})
358358
)
359359
cpu = try(var.service.cpu, 1024)
360-
ephemeral_storage = try(var.service.ephemeral_storage, null)
361-
family = try(var.service.family, null)
362-
ipc_mode = try(var.service.ipc_mode, null)
360+
ephemeral_storage = var.service.ephemeral_storage
361+
family = var.service.family
362+
ipc_mode = var.service.ipc_mode
363363
memory = try(var.service.memory, 2048)
364364
network_mode = try(var.service.network_mode, "awsvpc")
365-
pid_mode = try(var.service.pid_mode, null)
366-
task_definition_placement_constraints = try(var.service.task_definition_placement_constraints, {})
367-
proxy_configuration = try(var.service.proxy_configuration, null)
365+
pid_mode = var.service.pid_mode
366+
task_definition_placement_constraints = var.service.task_definition_placement_constraints
367+
proxy_configuration = var.service.proxy_configuration
368368
requires_compatibilities = try(var.service.requires_compatibilities, ["FARGATE"])
369369
runtime_platform = try(var.service.runtime_platform, {
370370
operating_system_family = "LINUX"
371371
cpu_architecture = "X86_64"
372372
})
373-
skip_destroy = try(var.service.skip_destroy, null)
373+
skip_destroy = var.service.skip_destroy
374374
volume = { for k, v in merge(
375375
{
376376
efs = {
@@ -390,40 +390,40 @@ module "ecs_service" {
390390

391391
# Task execution IAM role
392392
create_task_exec_iam_role = try(var.service.create_task_exec_iam_role, true)
393-
task_exec_iam_role_arn = try(var.service.task_exec_iam_role_arn, null)
394-
task_exec_iam_role_name = try(var.service.task_exec_iam_role_name, null)
393+
task_exec_iam_role_arn = var.service.task_exec_iam_role_arn
394+
task_exec_iam_role_name = var.service.task_exec_iam_role_name
395395
task_exec_iam_role_use_name_prefix = try(var.service.task_exec_iam_role_use_name_prefix, true)
396-
task_exec_iam_role_path = try(var.service.task_exec_iam_role_path, null)
397-
task_exec_iam_role_description = try(var.service.task_exec_iam_role_description, null)
398-
task_exec_iam_role_permissions_boundary = try(var.service.task_exec_iam_role_permissions_boundary, null)
396+
task_exec_iam_role_path = var.service.task_exec_iam_role_path
397+
task_exec_iam_role_description = var.service.task_exec_iam_role_description
398+
task_exec_iam_role_permissions_boundary = var.service.task_exec_iam_role_permissions_boundary
399399
task_exec_iam_role_tags = try(var.service.task_exec_iam_role_tags, {})
400400
task_exec_iam_role_policies = lookup(var.service, "task_exec_iam_role_policies", {})
401-
task_exec_iam_role_max_session_duration = try(var.service.task_exec_iam_role_max_session_duration, null)
401+
task_exec_iam_role_max_session_duration = var.service.task_exec_iam_role_max_session_duration
402402

403403
# Task execution IAM role policy
404404
create_task_exec_policy = try(var.service.create_task_exec_policy, true)
405-
task_exec_ssm_param_arns = try(var.service.task_exec_ssm_param_arns, ["arn:aws:ssm:*:*:parameter/*"])
406-
task_exec_secret_arns = try(var.service.task_exec_secret_arns, ["arn:aws:secretsmanager:*:*:secret:*"])
405+
task_exec_ssm_param_arns = try(var.service.task_exec_ssm_param_arns, [])
406+
task_exec_secret_arns = try(var.service.task_exec_secret_arns, [])
407407
task_exec_iam_statements = lookup(var.service, "task_exec_iam_statements", [])
408408

409409
# Tasks - IAM role
410410
create_tasks_iam_role = try(var.service.create_tasks_iam_role, true)
411-
tasks_iam_role_arn = try(var.service.tasks_iam_role_arn, null)
412-
tasks_iam_role_name = try(var.service.tasks_iam_role_name, null)
411+
tasks_iam_role_arn = var.service.tasks_iam_role_arn
412+
tasks_iam_role_name = var.service.tasks_iam_role_name
413413
tasks_iam_role_use_name_prefix = try(var.service.tasks_iam_role_use_name_prefix, true)
414-
tasks_iam_role_path = try(var.service.tasks_iam_role_path, null)
415-
tasks_iam_role_description = try(var.service.tasks_iam_role_description, null)
416-
tasks_iam_role_permissions_boundary = try(var.service.tasks_iam_role_permissions_boundary, null)
414+
tasks_iam_role_path = var.service.tasks_iam_role_path
415+
tasks_iam_role_description = var.service.tasks_iam_role_description
416+
tasks_iam_role_permissions_boundary = var.service.tasks_iam_role_permissions_boundary
417417
tasks_iam_role_tags = try(var.service.tasks_iam_role_tags, {})
418418
tasks_iam_role_policies = lookup(var.service, "tasks_iam_role_policies", {})
419419
tasks_iam_role_statements = lookup(var.service, "tasks_iam_role_statements", [])
420420

421421
# Task set
422-
external_id = try(var.service.external_id, null)
423-
scale = try(var.service.scale, {})
424-
force_delete = try(var.service.force_delete, null)
422+
external_id = var.service.external_id
423+
scale = var.service.scale
424+
force_delete = var.service.force_delete
425425
wait_until_stable = try(var.service.wait_until_stable, null)
426-
wait_until_stable_timeout = try(var.service.wait_until_stable_timeout, null)
426+
wait_until_stable_timeout = var.service.wait_until_stable_timeout
427427

428428
# Autoscaling
429429
enable_autoscaling = try(var.service.enable_autoscaling, false)
@@ -434,9 +434,9 @@ module "ecs_service" {
434434

435435
# Security Group
436436
create_security_group = try(var.service.create_security_group, true)
437-
security_group_name = try(var.service.security_group_name, null)
437+
security_group_name = var.service.security_group_name
438438
security_group_use_name_prefix = try(var.service.security_group_use_name_prefix, true)
439-
security_group_description = try(var.service.security_group_description, null)
439+
security_group_description = var.service.security_group_description
440440
security_group_ingress_rules = merge(
441441
{
442442
atlantis = {

0 commit comments

Comments
 (0)