diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b784816..0bb0a2e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,8 +2,8 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform rev: v1.99.5 hooks: - - id: terraform_fmt - id: terraform_wrapper_module_for_each + - id: terraform_fmt - id: terraform_docs args: - '--args=--lockfile=false' diff --git a/modules/cluster/README.md b/modules/cluster/README.md index 06f4bd8..bb18050 100644 --- a/modules/cluster/README.md +++ b/modules/cluster/README.md @@ -177,7 +177,7 @@ No modules. | [create\_cloudwatch\_log\_group](#input\_create\_cloudwatch\_log\_group) | Determines whether a log group is created by this module for the cluster logs. If not, AWS will automatically create one if logging is enabled | `bool` | `true` | no | | [create\_task\_exec\_iam\_role](#input\_create\_task\_exec\_iam\_role) | Determines whether the ECS task definition IAM role should be created | `bool` | `false` | no | | [create\_task\_exec\_policy](#input\_create\_task\_exec\_policy) | Determines whether the ECS task definition IAM policy should be created. This includes permissions included in AmazonECSTaskExecutionRolePolicy as well as access to secrets and SSM parameters | `bool` | `true` | no | -| [default\_capacity\_provider\_strategy](#input\_default\_capacity\_provider\_strategy) | Map of default capacity provider strategy definitions to use for the cluster |
map(object({
base = optional(number)
name = optional(string) # Will fall back to use map key if not set
weight = optional(number)
}))
| `null` | no | +| [default\_capacity\_provider\_strategy](#input\_default\_capacity\_provider\_strategy) | Map of default capacity provider strategy definitions to use for the cluster |
map(object({
base = optional(number)
name = optional(string) # Will fall back to use map key if not set
weight = optional(number)
}))
| `{}` | no | | [name](#input\_name) | Name of the cluster (up to 255 letters, numbers, hyphens, and underscores) | `string` | `""` | no | | [region](#input\_region) | Region where the resource(s) will be managed. Defaults to the Region set in the provider configuration | `string` | `null` | no | | [service\_connect\_defaults](#input\_service\_connect\_defaults) | Configures a default Service Connect namespace |
object({
namespace = string
})
| `null` | no | diff --git a/modules/cluster/variables.tf b/modules/cluster/variables.tf index fae86a9..495e5dd 100644 --- a/modules/cluster/variables.tf +++ b/modules/cluster/variables.tf @@ -147,7 +147,8 @@ variable "default_capacity_provider_strategy" { name = optional(string) # Will fall back to use map key if not set weight = optional(number) })) - default = null + default = {} + nullable = false } ################################################################################ diff --git a/wrappers/cluster/main.tf b/wrappers/cluster/main.tf index e18fc62..bbd27c5 100644 --- a/wrappers/cluster/main.tf +++ b/wrappers/cluster/main.tf @@ -20,7 +20,7 @@ module "wrapper" { create_cloudwatch_log_group = try(each.value.create_cloudwatch_log_group, var.defaults.create_cloudwatch_log_group, true) create_task_exec_iam_role = try(each.value.create_task_exec_iam_role, var.defaults.create_task_exec_iam_role, false) create_task_exec_policy = try(each.value.create_task_exec_policy, var.defaults.create_task_exec_policy, true) - default_capacity_provider_strategy = try(each.value.default_capacity_provider_strategy, var.defaults.default_capacity_provider_strategy, null) + default_capacity_provider_strategy = try(each.value.default_capacity_provider_strategy, var.defaults.default_capacity_provider_strategy, {}) name = try(each.value.name, var.defaults.name, "") region = try(each.value.region, var.defaults.region, null) service_connect_defaults = try(each.value.service_connect_defaults, var.defaults.service_connect_defaults, null)