Merge pull request #593 from wri/fix-ecs-role-perm

give ecs task role permission to run on on-demand compute job queue
wri · Oct 10, 2024 · b73a890 · b73a890
2 parents 28714da + 50ab46a
commit b73a890
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/terraform/data.tf b/terraform/data.tf
@@ -96,15 +96,16 @@ data "template_file" "container_definition" {
 data "template_file" "task_batch_policy" {
   template = file("${path.root}/templates/run_batch_policy.json.tmpl")
   vars = {
-    aurora_job_definition_arn     = module.batch_job_queues.aurora_job_definition_arn
-    aurora_job_queue_arn          = module.batch_job_queues.aurora_job_queue_arn
-    aurora_job_queue_fast_arn     = module.batch_job_queues.aurora_job_queue_fast_arn
-    data_lake_job_definition_arn  = module.batch_job_queues.data_lake_job_definition_arn
-    data_lake_job_queue_arn       = module.batch_job_queues.data_lake_job_queue_arn
-    tile_cache_job_definition_arn = module.batch_job_queues.tile_cache_job_definition_arn
-    tile_cache_job_queue_arn      = module.batch_job_queues.tile_cache_job_queue_arn
-    pixetl_job_definition_arn     = module.batch_job_queues.pixetl_job_definition_arn
-    pixetl_job_queue_arn          = module.batch_job_queues.pixetl_job_queue_arn
+    aurora_job_definition_arn       = module.batch_job_queues.aurora_job_definition_arn
+    aurora_job_queue_arn            = module.batch_job_queues.aurora_job_queue_arn
+    aurora_job_queue_fast_arn       = module.batch_job_queues.aurora_job_queue_fast_arn
+    data_lake_job_definition_arn    = module.batch_job_queues.data_lake_job_definition_arn
+    data_lake_job_queue_arn         = module.batch_job_queues.data_lake_job_queue_arn
+    tile_cache_job_definition_arn   = module.batch_job_queues.tile_cache_job_definition_arn
+    tile_cache_job_queue_arn        = module.batch_job_queues.tile_cache_job_queue_arn
+    pixetl_job_definition_arn       = module.batch_job_queues.pixetl_job_definition_arn
+    pixetl_job_queue_arn            = module.batch_job_queues.pixetl_job_queue_arn
+    on_demand_compute_job_queue_arn = module.batch_job_queues.on_demand_compute_job_queue_arn
   }
   depends_on = [
     module.batch_job_queues.aurora_job_definition,

diff --git a/terraform/templates/run_batch_policy.json.tmpl b/terraform/templates/run_batch_policy.json.tmpl
@@ -21,7 +21,9 @@
                 "${tile_cache_job_definition_arn}",
 
                 "${pixetl_job_queue_arn}",
-                "${pixetl_job_definition_arn}"
+                "${pixetl_job_definition_arn}",
+
+                "${on_demand_compute_job_queue_arn}"
             ]
         },
         {