move batch_image and batch_resource_requirement fields from job_definition to batch variables

Author: avrohomgottlieb

infrastructure/batch/job_definition.tf

@@ -8,23 +8,13 @@ resource "aws_batch_job_definition" "scpca_portal_project" {
   container_properties = jsonencode({
     # command definition expected in cotaninerOverrides when using this job definition
     command = []
-    image   = "${var.dockerhub_repo}/scpca_portal_api:latest"
+    image   = var.batch_image
     fargatePlatformConfiguration = {
       platformVersion = "LATEST"
     }
     environment = var.batch_environment
 
-    resourceRequirements = [
-      # requirements match api requirements, which uses a t2.medium (2 vcpus and 4.0 GB of RAM)
-      {
-        type  = "VCPU"
-        value = "2.0"
-      },
-      {
-        type  = "MEMORY"
-        value = "4096"
-      }
-    ]
+    resourceRequirements = var.batch_resource_requirements
 
     # without this declaration, ephemeralStroage defaults to 20GB
     ephemeralStorage = {

infrastructure/batch/variables.tf

@@ -6,19 +6,42 @@ variable "batch_environment" {
 
   default = [
     for pair in flatten([for line in split("\n", templatefile("$api-configuration/environment.tpl", {
-        django_secret_key  = var.django_secret_key
-        database_host      = aws_db_instance.postgres_db.address
-        database_port      = aws_db_instance.postgres_db.port
-        database_user      = aws_db_instance.postgres_db.username
-        database_password  = var.database_password
-        aws_region         = var.region
-        aws_s3_bucket_name = aws_s3_bucket.scpca_portal_bucket.id
-        sentry_dsn         = var.sentry_dsn
-        sentry_env         = var.sentry_env
+      django_secret_key  = var.django_secret_key
+      database_host      = aws_db_instance.postgres_db.address
+      database_port      = aws_db_instance.postgres_db.port
+      database_user      = aws_db_instance.postgres_db.username
+      database_password  = var.database_password
+      aws_region         = var.region
+      aws_s3_bucket_name = aws_s3_bucket.scpca_portal_bucket.id
+      sentry_dsn         = var.sentry_dsn
+      sentry_env         = var.sentry_env
     })) : split("=", line)]) :
     {
       name  = pair[0]
       value = pair[1]
     }
   ]
 }
+
+variable "batch_image" {
+  type    = string
+  default = "${var.dockerhub_repo}/scpca_portal_api:latest"
+}
+
+variable "batch_resource_requirements" {
+  type = list(object({
+    type  = string
+    value = string
+  }))
+  # requirements match api requirements, which uses a t2.medium (2 vcpus and 4.0 GB of RAM)
+  default = [
+    {
+      type  = "VCPU"
+      value = "2.0"
+    },
+    {
+      type  = "MEMORY"
+      value = "4096"
+    }
+  ]
+}