feat: Bump versions, add missing arguments and variable type definitions

bryantbiggs · bryantbiggs · commit 6c79a2d53237 · 2025-06-24T17:18:01.000-05:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.96.2
+    rev: v1.99.4
     hooks:
       - id: terraform_fmt
       - id: terraform_docs
diff --git a/README.md b/README.md
@@ -24,9 +24,6 @@ module "batch" {
         security_group_ids = ["sg-f1d03a88"]
         subnets            = ["subnet-30ef7b3c", "subnet-1ecda77b", "subnet-ca09ddbc"]
 
-        # Note - any tag changes here will force compute environment replacement
-        # which can lead to job queue conflicts. Only specify tags that will be static
-        # for the lifetime of the compute environment
         tags = {
           # This will set the name on the Ec2 instances launched by this compute environment
           Name = "example"
@@ -51,9 +48,6 @@ module "batch" {
         security_group_ids = ["sg-f1d03a88"]
         subnets            = ["subnet-30ef7b3c", "subnet-1ecda77b", "subnet-ca09ddbc"]
 
-        # Note - any tag changes here will force compute environment replacement
-        # which can lead to job queue conflicts. Only specify tags that will be static
-        # for the lifetime of the compute environment
         tags = {
           # This will set the name on the Ec2 instances launched by this compute environment
           Name = "example-spot"
@@ -70,7 +64,14 @@ module "batch" {
       state    = "ENABLED"
       priority = 1
 
-      compute_environments = ["b_ec2_spot"]
+      compute_environment_order = {
+        0 = {
+          compute_environment_key = "b_ec2_spot"
+        }
+        1 = {
+          compute_environment_key = "a_ec2"
+        }
+      }
 
       tags = {
         JobQueue = "Low priority job queue"
@@ -82,6 +83,12 @@ module "batch" {
       state    = "ENABLED"
       priority = 99
 
+      compute_environment_order = {
+        0 = {
+          compute_environment_key = "a_ec2"
+        }
+      }
+
       fair_share_policy = {
         compute_reservation = 1
         share_decay_seconds = 3600
@@ -163,14 +170,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.78 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.78 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
 
 ## Modules
 
@@ -200,10 +207,9 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_compute_environments"></a> [compute\_environments](#input\_compute\_environments) | Map of compute environment definitions to create | `any` | `{}` | no |
+| <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 |
 | <a name="input_create"></a> [create](#input\_create) | Controls if resources should be created (affects nearly all resources) | `bool` | `true` | no |
 | <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 |
-| <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 |
 | <a name="input_create_job_queues"></a> [create\_job\_queues](#input\_create\_job\_queues) | Determines whether to create job queues | `bool` | `true` | no |
 | <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 |
 | <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 +220,8 @@ No modules.
 | <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 |
 | <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 |
 | <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 |
-| <a name="input_job_definitions"></a> [job\_definitions](#input\_job\_definitions) | Map of job definitions to create | `any` | `{}` | no |
-| <a name="input_job_queues"></a> [job\_queues](#input\_job\_queues) | Map of job queue and scheduling policy defintions to create | `any` | `{}` | no |
+| <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 |
+| <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 = map(object({<br/>      compute_environment_key = string<br/>      order                   = optional(number) # Will fall back to use map key as order<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_factor    = optional(number)<br/>      })))<br/>    }))<br/>  }))</pre> | `null` | no |
 | <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 |
 | <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 |
 | <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 |
diff --git a/examples/ec2/README.md b/examples/ec2/README.md
@@ -24,23 +24,23 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.78 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.78 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_batch"></a> [batch](#module\_batch) | ../.. | n/a |
 | <a name="module_batch_disabled"></a> [batch\_disabled](#module\_batch\_disabled) | ../.. | n/a |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
-| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
+| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 6.0 |
 
 ## Resources
 
diff --git a/examples/ec2/main.tf b/examples/ec2/main.tf
@@ -121,7 +121,14 @@ module "batch" {
       state    = "ENABLED"
       priority = 1
 
-      compute_environments = ["b_ec2_spot"]
+      compute_environment_order = {
+        0 = {
+          compute_environment_key = "b_ec2_spot"
+        }
+        1 = {
+          compute_environment_key = "a_ec2"
+        }
+      }
 
       tags = {
         JobQueue = "Low priority job queue"
@@ -133,6 +140,12 @@ module "batch" {
       state    = "ENABLED"
       priority = 99
 
+      compute_environment_order = {
+        0 = {
+          compute_environment_key = "a_ec2"
+        }
+      }
+
       fair_share_policy = {
         compute_reservation = 1
         share_decay_seconds = 3600
@@ -204,7 +217,7 @@ module "batch" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 5.0"
+  version = "~> 6.0"
 
   name = local.name
   cidr = local.vpc_cidr
@@ -221,7 +234,7 @@ module "vpc" {
 
 module "vpc_endpoints" {
   source  = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
-  version = "~> 5.0"
+  version = "~> 6.0"
 
   vpc_id = module.vpc.vpc_id
 
diff --git a/examples/ec2/versions.tf b/examples/ec2/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.78"
+      version = ">= 6.0"
     }
   }
 }
diff --git a/examples/fargate/README.md b/examples/fargate/README.md
@@ -24,23 +24,23 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.78 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.78 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_batch"></a> [batch](#module\_batch) | ../.. | n/a |
 | <a name="module_batch_disabled"></a> [batch\_disabled](#module\_batch\_disabled) | ../.. | n/a |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
-| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
+| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 6.0 |
 
 ## Resources
 
diff --git a/examples/fargate/main.tf b/examples/fargate/main.tf
@@ -90,6 +90,15 @@ module "batch" {
       state    = "ENABLED"
       priority = 1
 
+      compute_environment_order = {
+        0 = {
+          compute_environment_key = "b_fargate_spot"
+        }
+        1 = {
+          compute_environment_key = "a_fargate"
+        }
+      }
+
       tags = {
         JobQueue = "Low priority job queue"
       }
@@ -100,6 +109,12 @@ module "batch" {
       state    = "ENABLED"
       priority = 99
 
+      compute_environment_order = {
+        0 = {
+          compute_environment_key = "a_fargate"
+        }
+      }
+
       fair_share_policy = {
         compute_reservation = 1
         share_decay_seconds = 3600
@@ -176,7 +191,7 @@ module "batch" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 5.0"
+  version = "~> 6.0"
 
   name = local.name
   cidr = local.vpc_cidr
@@ -193,7 +208,7 @@ module "vpc" {
 
 module "vpc_endpoints" {
   source  = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
-  version = "~> 5.0"
+  version = "~> 6.0"
 
   vpc_id = module.vpc.vpc_id
 
diff --git a/examples/fargate/versions.tf b/examples/fargate/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.10"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.78"
+      version = ">= 6.0"
     }
   }
 }
diff --git a/main.tf b/main.tf
diff --git a/outputs.tf b/outputs.tf
diff --git a/variables.tf b/variables.tf
diff --git a/versions.tf b/versions.tf

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = ">= 1.3"`
	`2`	`+ required_version = ">= 1.10"`
`3`	`3`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = ">= 5.78"`
	`7`	`+ version = ">= 6.0"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`