Merge pull request #974 from danmur97/main

Add tags to batch jobs

README.md

@@ -1724,6 +1724,9 @@ Types:
     If the value of attempts is greater than one,
     the job is retried on failure the same number of attempts as the value.
     Defaults to `1`.
+  - tags (`attrsOf str`): Optional.
+    Tags to apply to the batch job.
+    Defaults to `{ }`.
   - attemptDurationSeconds (`ints.positive`): Optional.
     The time duration in seconds
     (measured from the job attempt's startedAt timestamp)

src/args/compute-on-aws-batch/default.nix

@@ -19,6 +19,7 @@
   queue,
   name,
   setup,
+  tags,
   vcpus,
 }:
 makeScript {
@@ -65,6 +66,13 @@ makeScript {
     __argName__ = name;
     __argParallel__ = parallel;
     __argQueue__ = queue;
+    __argTags__ = let
+      tag_names = builtins.attrNames tags;
+      encode_tag = key: "${key}=${tags."${key}"}";
+      encoded = map encode_tag tag_names;
+      encoded_tags = builtins.concatStringsSep "," encoded;
+    in
+      encoded_tags;
   };
   searchPaths = {
     bin = [

src/args/compute-on-aws-batch/entrypoint.sh

@@ -22,6 +22,7 @@ function main {
   local name="__argName__"
   local queue="__argQueue__"
   local parallel="__argParallel__"
+  local tags="__argTags__"
   local submit_job_args
 
   : \
@@ -76,6 +77,7 @@ function main {
       --job-definition "${definition}"
       --retry-strategy "attempts=${attempts}"
       --timeout "attemptDurationSeconds=${attempt_duration_seconds}"
+      --tags "${tags}"
     ) \
     && if [ "${parallel}" -gt "1" ]; then
       submit_job_args+=(--array-properties "size=${parallel}")

src/evaluator/modules/compute-on-aws-batch/default.nix

@@ -25,6 +25,7 @@
       inherit (config) parallel;
       inherit (config) queue;
       inherit (config) setup;
+      inherit (config) tags;
       inherit (config) vcpus;
     };
   };
@@ -73,6 +74,10 @@ in {
             default = [];
             type = lib.types.listOf lib.types.package;
           };
+          tags = lib.mkOption {
+            default = {};
+            type = lib.types.attrsOf lib.types.str;
+          };
           vcpus = lib.mkOption {
             type = lib.types.ints.positive;
           };