Skip to content

Commit 65ba20f

Browse files
committed
feat: Bump versions, add missing arguments and variable type definitions
1 parent 8dc85b9 commit 65ba20f

File tree

11 files changed

+523
-131
lines changed

11 files changed

+523
-131
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.96.2
3+
rev: v1.99.4
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_docs

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
163163

164164
| Name | Version |
165165
|------|---------|
166-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
167-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.78 |
166+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
167+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
168168

169169
## Providers
170170

171171
| Name | Version |
172172
|------|---------|
173-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.78 |
173+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
174174

175175
## Modules
176176

@@ -200,10 +200,9 @@ No modules.
200200

201201
| Name | Description | Type | Default | Required |
202202
|------|-------------|------|---------|:--------:|
203-
| <a name="input_compute_environments"></a> [compute\_environments](#input\_compute\_environments) | Map of compute environment definitions to create | `any` | `{}` | no |
203+
| <a name="input_compute_environments"></a> [compute\_environments](#input\_compute\_environments) | Map of compute environment definitions to create | <pre>map(object({<br/> name = optional(string)<br/> name_prefix = optional(string)<br/> compute_resources = optional(object({<br/> allocation_strategy = optional(string)<br/> bid_percentage = optional(number)<br/> desired_vcpus = optional(number)<br/> ec2_configuration = optional(list(object({<br/> image_id_override = optional(string)<br/> image_type = optional(string)<br/> })))<br/> ec2_key_pair = optional(string)<br/> instance_role = optional(string)<br/> instance_types = optional(list(string))<br/> launch_template = optional(object({<br/> launch_template_id = optional(string)<br/> launch_template_name = optional(string)<br/> version = optional(string)<br/> }))<br/> max_vcpus = number<br/> min_vcpus = optional(number)<br/> placement_group = optional(string)<br/> security_group_ids = optional(list(string))<br/> spot_iam_fleet_role = optional(string)<br/> subnets = list(string)<br/> tags = optional(map(string), {})<br/> type = string<br/> }))<br/> eks_configuration = optional(object({<br/> eks_cluster_arn = string<br/> kubernetes_namespace = string<br/> }))<br/> service_role = optional(string)<br/> state = optional(string)<br/> tags = optional(map(string), {})<br/> type = optional(string, "MANAGED")<br/> update_policy = optional(object({<br/> job_execution_timeout_minutes = number<br/> terminate_jobs_on_update = optional(bool, false)<br/> }))<br/> }))</pre> | `null` | no |
204204
| <a name="input_create"></a> [create](#input\_create) | Controls if resources should be created (affects nearly all resources) | `bool` | `true` | no |
205205
| <a name="input_create_instance_iam_role"></a> [create\_instance\_iam\_role](#input\_create\_instance\_iam\_role) | Determines whether a an IAM role is created or to use an existing IAM role | `bool` | `true` | no |
206-
| <a name="input_create_job_definitions"></a> [create\_job\_definitions](#input\_create\_job\_definitions) | Determines whether to create the job definitions defined | `bool` | `true` | no |
207206
| <a name="input_create_job_queues"></a> [create\_job\_queues](#input\_create\_job\_queues) | Determines whether to create job queues | `bool` | `true` | no |
208207
| <a name="input_create_service_iam_role"></a> [create\_service\_iam\_role](#input\_create\_service\_iam\_role) | Determines whether a an IAM role is created or to use an existing IAM role | `bool` | `true` | no |
209208
| <a name="input_create_spot_fleet_iam_role"></a> [create\_spot\_fleet\_iam\_role](#input\_create\_spot\_fleet\_iam\_role) | Determines whether a an IAM role is created or to use an existing IAM role | `bool` | `false` | no |
@@ -214,8 +213,8 @@ No modules.
214213
| <a name="input_instance_iam_role_permissions_boundary"></a> [instance\_iam\_role\_permissions\_boundary](#input\_instance\_iam\_role\_permissions\_boundary) | ARN of the policy that is used to set the permissions boundary for the IAM role | `string` | `null` | no |
215214
| <a name="input_instance_iam_role_tags"></a> [instance\_iam\_role\_tags](#input\_instance\_iam\_role\_tags) | A map of additional tags to add to the IAM role created | `map(string)` | `{}` | no |
216215
| <a name="input_instance_iam_role_use_name_prefix"></a> [instance\_iam\_role\_use\_name\_prefix](#input\_instance\_iam\_role\_use\_name\_prefix) | Determines whether the IAM role name (`instance_iam_role_name`) is used as a prefix | `string` | `true` | no |
217-
| <a name="input_job_definitions"></a> [job\_definitions](#input\_job\_definitions) | Map of job definitions to create | `any` | `{}` | no |
218-
| <a name="input_job_queues"></a> [job\_queues](#input\_job\_queues) | Map of job queue and scheduling policy defintions to create | `any` | `{}` | no |
216+
| <a name="input_job_definitions"></a> [job\_definitions](#input\_job\_definitions) | Map of job definitions to create | <pre>map(object({<br/> container_properties = optional(string)<br/> deregister_on_new_revision = optional(bool)<br/> ecs_properties = optional(string)<br/> eks_properties = optional(object({<br/> pod_properties = object({<br/> containers = map(object({<br/> args = optional(list(string))<br/> command = optional(list(string))<br/> env = optional(map(string))<br/> image = string<br/> image_pull_policy = optional(string)<br/> name = optional(string) # Will fall back to use map key as container name<br/> resources = object({<br/> limits = optional(map(string))<br/> requests = optional(map(string))<br/> })<br/> security_context = optional(object({<br/> privileged = optional(bool)<br/> read_only_root_file_system = optional(bool)<br/> run_as_group = optional(number)<br/> run_as_non_root = optional(bool)<br/> run_as_user = optional(number)<br/> }))<br/> volume_mounts = optional(map(object({<br/> mount_path = string<br/> name = optional(string) # Will fall back to use map key as volume mount name<br/> read_only = optional(bool)<br/> })))<br/> }))<br/> })<br/> dns_policy = optional(string)<br/> host_network = optional(bool)<br/> image_pull_secrets = optional(list(object({<br/> name = string<br/> })))<br/> init_containers = optional(map(object({<br/> args = optional(list(string))<br/> command = optional(list(string))<br/> env = optional(map(string))<br/> image = string<br/> image_pull_policy = optional(string)<br/> name = optional(string) # Will fall back to use map key as init container name<br/> resources = object({<br/> limits = optional(map(string))<br/> requests = optional(map(string))<br/> })<br/> security_context = optional(object({<br/> privileged = optional(bool)<br/> read_only_root_file_system = optional(bool)<br/> run_as_group = optional(number)<br/> run_as_non_root = optional(bool)<br/> run_as_user = optional(number)<br/> }))<br/> volume_mounts = optional(map(object({<br/> mount_path = string<br/> name = optional(string) # Will fall back to use map key as volume mount name<br/> read_only = optional(bool)<br/> })))<br/> })))<br/> metadata = optional(object({<br/> labels = optional(map(string))<br/> }))<br/> service_account_name = optional(string)<br/> share_process_namespace = optional(bool)<br/> volumes = optional(map(object({<br/> empty_dir = optional(object({<br/> medium = optional(string)<br/> size_limit = optional(string)<br/> }))<br/> host_path = optional(object({<br/> path = string<br/> }))<br/> name = optional(string) # Will fall back to use map key as volume name<br/> secret = optional(object({<br/> optional = optional(bool)<br/> secret_name = string<br/> }))<br/> })))<br/> }))<br/> name = optional(string) # Will fall back to use map key as job definition name<br/> node_properties = optional(string)<br/> parameters = optional(map(string))<br/> platform_capabilities = optional(list(string))<br/> propagate_tags = optional(bool)<br/> retry_strategy = optional(object({<br/> attempts = optional(number)<br/> evaluate_on_exit = optional(map(object({<br/> action = string<br/> on_exit_code = optional(string)<br/> on_reason = optional(string)<br/> on_status_reason = optional(string)<br/> })))<br/> }))<br/> scheduling_priority = optional(number)<br/> tags = optional(map(string), {})<br/> timeout = optional(object({<br/> attempt_duration_seconds = optional(number)<br/> }))<br/> type = optional(string, "container")<br/> }))</pre> | `null` | no |
217+
| <a name="input_job_queues"></a> [job\_queues](#input\_job\_queues) | Map of job queue and scheduling policy defintions to create | <pre>map(object({<br/> compute_environment_order = optional(map(object({<br/> compute_environment_key = string<br/> order = number<br/> })))<br/> job_state_time_limit_action = optional(map(object({<br/> action = optional(string, "CANCEL")<br/> max_time_seconds = number<br/> reason = optional(string)<br/> state = optional(string, "RUNNABLE")<br/> })))<br/> name = optional(string) # Will fall back to use map key as queue name<br/> priority = number<br/> scheduling_policy_arn = optional(string)<br/> state = optional(string, "ENABLED")<br/> tags = optional(map(string), {})<br/> timeouts = optional(object({<br/> create = optional(string, "10m")<br/> update = optional(string, "10m")<br/> delete = optional(string, "10m")<br/> }))<br/><br/> # Scheduling policy<br/> create_scheduling_policy = optional(bool, true)<br/> fair_share_policy = optional(object({<br/> compute_reservation = optional(number)<br/> share_decay_seconds = optional(number)<br/> share_distribution = optional(list(object({<br/> share_identifier = string<br/> weight = optional(number)<br/> })))<br/> }))<br/> }))</pre> | `null` | no |
219218
| <a name="input_service_iam_role_additional_policies"></a> [service\_iam\_role\_additional\_policies](#input\_service\_iam\_role\_additional\_policies) | Additional policies to be added to the IAM role | `map(string)` | `{}` | no |
220219
| <a name="input_service_iam_role_description"></a> [service\_iam\_role\_description](#input\_service\_iam\_role\_description) | Batch service IAM role description | `string` | `null` | no |
221220
| <a name="input_service_iam_role_name"></a> [service\_iam\_role\_name](#input\_service\_iam\_role\_name) | Batch service IAM role name | `string` | `null` | no |

examples/ec2/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ Note that this example may create resources which will incur monetary charges on
2424

2525
| Name | Version |
2626
|------|---------|
27-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
28-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.78 |
27+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
28+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
2929

3030
## Providers
3131

3232
| Name | Version |
3333
|------|---------|
34-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.78 |
34+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
3535

3636
## Modules
3737

3838
| Name | Source | Version |
3939
|------|--------|---------|
4040
| <a name="module_batch"></a> [batch](#module\_batch) | ../.. | n/a |
4141
| <a name="module_batch_disabled"></a> [batch\_disabled](#module\_batch\_disabled) | ../.. | n/a |
42-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
43-
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
42+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
43+
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 6.0 |
4444

4545
## Resources
4646

examples/ec2/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ module "batch" {
204204

205205
module "vpc" {
206206
source = "terraform-aws-modules/vpc/aws"
207-
version = "~> 5.0"
207+
version = "~> 6.0"
208208

209209
name = local.name
210210
cidr = local.vpc_cidr
@@ -221,7 +221,7 @@ module "vpc" {
221221

222222
module "vpc_endpoints" {
223223
source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
224-
version = "~> 5.0"
224+
version = "~> 6.0"
225225

226226
vpc_id = module.vpc.vpc_id
227227

examples/ec2/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.3"
2+
required_version = ">= 1.10"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.78"
7+
version = ">= 6.0"
88
}
99
}
1010
}

examples/fargate/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ Note that this example may create resources which will incur monetary charges on
2424

2525
| Name | Version |
2626
|------|---------|
27-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
28-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.78 |
27+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
28+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
2929

3030
## Providers
3131

3232
| Name | Version |
3333
|------|---------|
34-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.78 |
34+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
3535

3636
## Modules
3737

3838
| Name | Source | Version |
3939
|------|--------|---------|
4040
| <a name="module_batch"></a> [batch](#module\_batch) | ../.. | n/a |
4141
| <a name="module_batch_disabled"></a> [batch\_disabled](#module\_batch\_disabled) | ../.. | n/a |
42-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
43-
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
42+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
43+
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 6.0 |
4444

4545
## Resources
4646

examples/fargate/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ module "batch" {
176176

177177
module "vpc" {
178178
source = "terraform-aws-modules/vpc/aws"
179-
version = "~> 5.0"
179+
version = "~> 6.0"
180180

181181
name = local.name
182182
cidr = local.vpc_cidr
@@ -193,7 +193,7 @@ module "vpc" {
193193

194194
module "vpc_endpoints" {
195195
source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
196-
version = "~> 5.0"
196+
version = "~> 6.0"
197197

198198
vpc_id = module.vpc.vpc_id
199199

examples/fargate/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.3"
2+
required_version = ">= 1.10"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.78"
7+
version = ">= 6.0"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)