Support vcpu configuration (#26)

main.tf

@@ -48,6 +48,7 @@ module "sfn" {
   job_policy_arns          = var.job_policy_arns
   sfn_template_files       = var.sfn_template_files
   stage_memory_defaults    = var.stage_memory_defaults
+  stage_vcpu_defaults      = var.stage_vcpu_defaults
   extra_env_vars           = var.extra_env_vars
   tags                     = var.tags
 }

terraform/modules/sfn-io-helper-lambdas/app/sfn_io_helper/stage_io.py

@@ -99,5 +99,7 @@ def preprocess_sfn_input(sfn_state, aws_region, aws_account_id, state_machine_na
         for compute_env in "SPOT", "EC2":
             memory_key = stage + compute_env + "Memory"
             sfn_state.setdefault(memory_key, int(os.environ[memory_key + "Default"]))
+            vcpu_key = stage + compute_env + "Vcpu"
+            sfn_state.setdefault(vcpu_key, int(os.environ[vcpu_key + "Default"]))
 
     return sfn_state

terraform/modules/sfn-io-helper-lambdas/main.tf

@@ -134,7 +134,12 @@ resource "aws_lambda_function" "lambda" {
       for stage, defaults in var.stage_memory_defaults : "${stage}SPOTMemoryDefault" => "${defaults.spot}"
       }, {
       for stage, defaults in var.stage_memory_defaults : "${stage}EC2MemoryDefault" => "${defaults.on_demand}"
+      }, {
+      for stage, defaults in var.stage_vcpu_defaults : "${stage}SPOTVcpuDefault" => "${defaults.spot}"
+      }, {
+      for stage, defaults in var.stage_vcpu_defaults : "${stage}EC2VcpuDefault" => "${defaults.on_demand}"
       },
+
     )
   }
 }

terraform/modules/sfn-io-helper-lambdas/variables.tf

@@ -42,3 +42,10 @@ variable "stage_memory_defaults" {
   }))
 }
 
+variable "stage_vcpu_defaults" {
+  type = map(object({
+    on_demand = number,
+    spot      = number,
+  }))
+}
+

terraform/modules/swipe-sfn/main.tf

@@ -52,6 +52,7 @@ module "sfn_io_helper" {
   workspace_s3_prefix    = var.workspace_s3_prefix
   wdl_workflow_s3_prefix = var.wdl_workflow_s3_prefix
   stage_memory_defaults  = var.stage_memory_defaults
+  stage_vcpu_defaults    = var.stage_vcpu_defaults
   tags                   = var.tags
 }
 

terraform/modules/swipe-sfn/variables.tf

@@ -66,6 +66,13 @@ variable "stage_memory_defaults" {
   }))
 }
 
+variable "stage_vcpu_defaults" {
+  type = map(object({
+    on_demand = number,
+    spot      = number,
+  }))
+}
+
 variable "extra_env_vars" {
   description = "Additional env vars to set on batch task definitions"
   type        = map(string)

variables.tf

@@ -88,6 +88,20 @@ variable "stage_memory_defaults" {
   }
 }
 
+variable "stage_vcpu_defaults" {
+  type = map(object({
+    on_demand = number,
+    spot      = number,
+  }))
+
+  default = {
+    "Run" : {
+      on_demand = 2,
+      spot      = 2,
+    }
+  }
+}
+
 variable "extra_env_vars" {
   description = "Additional env vars to set on batch task definitions"
   type        = map(string)

version

@@ -1 +1 @@
-v0.5.1-beta
+v0.6.0-beta