feat!: Bump Terraform version to 1.0, and allow specifying compute environments for queue (#19)

Co-authored-by: Uziel David Sulkies <[email protected]>

Author: antonbabenko

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.77.0
+    rev: v1.77.3
     hooks:
       - id: terraform_fmt
       - id: terraform_validate

README.md

@@ -70,6 +70,8 @@ module "batch" {
       state    = "ENABLED"
       priority = 1
 
+      compute_environments = ["b_ec2_spot"]
+
       tags = {
         JobQueue = "Low priority job queue"
       }
@@ -92,7 +94,7 @@ module "batch" {
           weight_factor    = 0.2
         }]
       }
-
+      
       tags = {
         JobQueue = "High priority job queue"
       }
@@ -161,14 +163,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.30 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |
 
 ## Modules
 

examples/ec2/README.md

@@ -24,31 +24,30 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.30 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.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 | ~> 3.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 4.0 |
 | <a name="module_vpc_endpoint_security_group"></a> [vpc\_endpoint\_security\_group](#module\_vpc\_endpoint\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 |
-| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 3.0 |
+| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 4.0 |
 
 ## Resources
 
 | Name | Type |
 |------|------|
 | [aws_cloudwatch_log_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
-| [aws_ami.ubuntu](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
 | [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
 
 ## Inputs

examples/ec2/main.tf

@@ -108,32 +108,6 @@ module "batch" {
     c_unmanaged = {
       name_prefix = "ec2_unmanaged"
       type        = "UNMANAGED"
-
-      compute_resources = {
-        type                = "EC2"
-        allocation_strategy = "BEST_FIT_PROGRESSIVE"
-
-        min_vcpus      = 4
-        max_vcpus      = 16
-        desired_vcpus  = 4
-        instance_types = ["m4.large", "m3.large", "r4.large", "r3.large"]
-
-        security_group_ids = [module.vpc_endpoint_security_group.security_group_id]
-        subnets            = module.vpc.private_subnets
-
-        ec2_configuration = {
-          image_id_override = data.aws_ami.ubuntu.image_id
-        }
-
-        # 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 = "${local.name}-unmanaged"
-          Type = "Ec2UnManaged"
-        }
-      }
     }
   }
 
@@ -144,6 +118,8 @@ module "batch" {
       state    = "ENABLED"
       priority = 1
 
+      compute_environments = ["b_ec2_spot"]
+
       tags = {
         JobQueue = "Low priority job queue"
       }
@@ -225,7 +201,7 @@ module "batch" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   name = local.name
   cidr = "10.99.0.0/18"
@@ -234,20 +210,14 @@ module "vpc" {
   public_subnets  = ["10.99.0.0/24", "10.99.1.0/24", "10.99.2.0/24"]
   private_subnets = ["10.99.3.0/24", "10.99.4.0/24", "10.99.5.0/24"]
 
-  enable_nat_gateway      = true
-  single_nat_gateway      = true
-  map_public_ip_on_launch = false
+  enable_nat_gateway = true
+  single_nat_gateway = true
 
   public_route_table_tags  = { Name = "${local.name}-public" }
   public_subnet_tags       = { Name = "${local.name}-public" }
   private_route_table_tags = { Name = "${local.name}-private" }
   private_subnet_tags      = { Name = "${local.name}-private" }
 
-  manage_default_security_group  = true
-  default_security_group_name    = "${local.name}-default"
-  default_security_group_ingress = []
-  default_security_group_egress  = []
-
   enable_dhcp_options      = true
   enable_dns_hostnames     = true
   dhcp_options_domain_name = data.aws_region.current.name == "us-east-1" ? "ec2.internal" : "${data.aws_region.current.name}.compute.internal"
@@ -257,7 +227,7 @@ module "vpc" {
 
 module "vpc_endpoints" {
   source  = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   vpc_id             = module.vpc.vpc_id
   security_group_ids = [module.vpc_endpoint_security_group.security_group_id]
@@ -317,16 +287,6 @@ module "vpc_endpoint_security_group" {
   tags = local.tags
 }
 
-data "aws_ami" "ubuntu" {
-  owners      = ["099720109477"]
-  most_recent = true
-
-  filter {
-    name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-*-20.04-amd64-server-*"]
-  }
-}
-
 resource "aws_cloudwatch_log_group" "this" {
   name              = "/aws/batch/${local.name}"
   retention_in_days = 1

examples/ec2/versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.13.1"
+  required_version = ">= 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.30"
+      version = ">= 4.0"
     }
   }
 }

examples/fargate/README.md

@@ -24,24 +24,24 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.30 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.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 | ~> 3.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 4.0 |
 | <a name="module_vpc_endpoint_security_group"></a> [vpc\_endpoint\_security\_group](#module\_vpc\_endpoint\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 |
-| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 3.0 |
+| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 4.0 |
 
 ## Resources
 

examples/fargate/main.tf

@@ -173,7 +173,7 @@ module "batch" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   name = local.name
   cidr = "10.99.0.0/18"
@@ -182,20 +182,14 @@ module "vpc" {
   public_subnets  = ["10.99.0.0/24", "10.99.1.0/24", "10.99.2.0/24"]
   private_subnets = ["10.99.3.0/24", "10.99.4.0/24", "10.99.5.0/24"]
 
-  enable_nat_gateway      = true
-  single_nat_gateway      = true
-  map_public_ip_on_launch = false
+  enable_nat_gateway = true
+  single_nat_gateway = true
 
   public_route_table_tags  = { Name = "${local.name}-public" }
   public_subnet_tags       = { Name = "${local.name}-public" }
   private_route_table_tags = { Name = "${local.name}-private" }
   private_subnet_tags      = { Name = "${local.name}-private" }
 
-  manage_default_security_group  = true
-  default_security_group_name    = "${local.name}-default"
-  default_security_group_ingress = []
-  default_security_group_egress  = []
-
   enable_dhcp_options      = true
   enable_dns_hostnames     = true
   dhcp_options_domain_name = data.aws_region.current.name == "us-east-1" ? "ec2.internal" : "${data.aws_region.current.name}.compute.internal"
@@ -205,7 +199,7 @@ module "vpc" {
 
 module "vpc_endpoints" {
   source  = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   vpc_id             = module.vpc.vpc_id
   security_group_ids = [module.vpc_endpoint_security_group.security_group_id]

examples/fargate/versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.13.1"
+  required_version = ">= 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.30"
+      version = ">= 4.0"
     }
   }
 }

main.tf

@@ -228,7 +228,7 @@ resource "aws_batch_job_queue" "this" {
   state                 = each.value.state
   priority              = each.value.priority
   scheduling_policy_arn = try(each.value.create_scheduling_policy, true) ? aws_batch_scheduling_policy.this[each.key].arn : try(each.value.scheduling_policy_arn, null)
-  compute_environments  = [for env in aws_batch_compute_environment.this : env.arn]
+  compute_environments  = slice([for env in try(each.value.compute_environments, keys(var.compute_environments)) : aws_batch_compute_environment.this[env].arn], 0, min(length(try(each.value.compute_environments, keys(var.compute_environments))), 3))
 
   tags = merge(var.tags, lookup(each.value, "tags", {}))
 }

versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.13.1"
+  required_version = ">= 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.30"
+      version = ">= 4.0"
     }
   }
 }