Skip to content

Commit ffd5a47

Browse files
committed
add noAddress: true to runtime blocks for airgap-safe tasks
Adds noAddress: true to the runtime block of all WDL tasks that do not require internet access. Tasks that need network (NCBI downloads/uploads, Terra API calls, Nextstrain dataset fetches, GISAID uploads, pangolin, snpEff, kraken2 db builds) are left unchanged. This Cromwell/Terra runtime attribute prevents allocation of a public IP address to task VMs, improving security posture and reducing costs.
1 parent 82d6631 commit ffd5a47

15 files changed

+148
-0
lines changed

pipes/WDL/tasks/tasks_16S_amplicon.wdl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ task qiime_import_from_bam {
6565
cpu: cpu
6666
disk: "~{disk_size_gb} GB"
6767
disks: "local-disk ~{disk_size_gb} HDD"
68+
noAddress: true
6869
}
6970
}
7071

@@ -146,6 +147,7 @@ task trim_reads {
146147
cpu: cpu
147148
disk: "~{disk_size_gb} GB"
148149
disks: "local-disk ~{disk_size_gb} HDD"
150+
noAddress: true
149151
}
150152
}
151153

@@ -196,6 +198,7 @@ task join_paired_ends {
196198
cpu: cpu
197199
disk: "~{disk_size_gb} GB"
198200
disks: "local-disk ~{disk_size_gb} HDD"
201+
noAddress: true
199202
}
200203
}
201204

@@ -271,6 +274,7 @@ task deblur {
271274
cpu: cpu
272275
disk: "~{disk_size_gb} GB"
273276
disks: "local-disk ~{disk_size_gb} HDD"
277+
noAddress: true
274278
}
275279
}
276280
task train_classifier {
@@ -359,6 +363,7 @@ task train_classifier {
359363
cpu: cpu
360364
disk: "~{disk_size_gb} GB"
361365
disks: "local-disk ~{disk_size_gb} HDD"
366+
noAddress: true
362367
}
363368
}
364369
task tax_analysis {
@@ -422,5 +427,6 @@ task tax_analysis {
422427
cpu: cpu
423428
disk: "~{disk_size_gb} GB"
424429
disks: "local-disk ~{disk_size_gb} HDD"
430+
noAddress: true
425431
}
426432
}

pipes/WDL/tasks/tasks_assembly.wdl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ task assemble {
107107
disks: "local-disk ~{disk_size} SSD"
108108
disk: "~{disk_size} GB" # TES
109109
dx_instance_type: "mem1_ssd1_v2_x8"
110+
noAddress: true
110111
}
111112

112113
}
@@ -197,6 +198,7 @@ task select_references {
197198
disk: "~{disk_size} GB" # TESs
198199
dx_instance_type: "mem1_ssd1_v2_x2"
199200
preemptible: 2
201+
noAddress: true
200202
}
201203
}
202204

@@ -459,6 +461,7 @@ task scaffold {
459461
disks: "local-disk ~{disk_size} SSD"
460462
disk: "~{disk_size} GB" # TES
461463
dx_instance_type: "mem1_ssd1_v2_x8"
464+
noAddress: true
462465
}
463466
}
464467

@@ -544,6 +547,7 @@ task skani_triangle {
544547
disk: "~{disk_size} GB" # TES
545548
dx_instance_type: "mem1_ssd1_v2_x4"
546549
preemptible: 2
550+
noAddress: true
547551
}
548552
}
549553

@@ -626,6 +630,7 @@ task ivar_trim {
626630
disks: "local-disk ~{disk_size} HDD"
627631
disk: "~{disk_size} GB" # TES
628632
dx_instance_type: "mem1_ssd1_v2_x4"
633+
noAddress: true
629634
}
630635
}
631636

@@ -691,6 +696,7 @@ task ivar_trim_stats {
691696
disks: "local-disk ~{disk_size} HDD"
692697
disk: "~{disk_size} GB"
693698
dx_instance_type: "mem1_ssd1_v2_x2"
699+
noAddress: true
694700
}
695701
}
696702

@@ -859,6 +865,7 @@ task align_reads {
859865
disk: "~{disk_size} GB" # TES
860866
dx_instance_type: "mem1_ssd1_v2_x8"
861867
preemptible: 1
868+
noAddress: true
862869
}
863870
}
864871

@@ -999,6 +1006,7 @@ task refine_assembly_with_aligned_reads {
9991006
disks: "local-disk ~{disk_size} SSD"
10001007
disk: "~{disk_size} GB" # TES
10011008
dx_instance_type: "mem1_ssd1_v2_x8"
1009+
noAddress: true
10021010
}
10031011
}
10041012

@@ -1120,6 +1128,7 @@ task run_discordance {
11201128
disk: "~{disk_size} GB" # TES
11211129
dx_instance_type: "mem1_ssd1_v2_x2"
11221130
preemptible: 1
1131+
noAddress: true
11231132
}
11241133
}
11251134

@@ -1231,6 +1240,7 @@ task filter_bad_ntc_batches {
12311240
disks: "local-disk ~{disk_size} HDD"
12321241
disk: "~{disk_size} GB" # TES
12331242
dx_instance_type: "mem1_ssd1_v2_x2"
1243+
noAddress: true
12341244
}
12351245
output {
12361246
File seqids_kept = "seqids.filtered.txt"
@@ -1341,5 +1351,6 @@ task wgsim {
13411351
disks: "local-disk ~{disk_size} HDD"
13421352
disk: "~{disk_size} GB" # TES
13431353
dx_instance_type: "mem1_ssd1_v2_x2"
1354+
noAddress: true
13441355
}
13451356
}

pipes/WDL/tasks/tasks_demux.wdl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ task merge_tarballs {
3838
disk: "~{disk_size} GB" # TES
3939
dx_instance_type: "mem1_ssd2_v2_x16"
4040
preemptible: 0
41+
noAddress: true
4142
}
4243
}
4344

@@ -90,6 +91,7 @@ task samplesheet_rename_ids {
9091
disks: "local-disk ~{disk_size} HDD"
9192
disk: "~{disk_size} GB" # TES
9293
dx_instance_type: "mem1_ssd1_v2_x2"
94+
noAddress: true
9395
}
9496
}
9597

@@ -134,6 +136,7 @@ task revcomp_i5 {
134136
disks: "local-disk ~{disk_size} HDD"
135137
disk: "~{disk_size} GB"
136138
dx_instance_type: "mem1_ssd1_v2_x2"
139+
noAddress: true
137140
}
138141
}
139142

@@ -653,6 +656,7 @@ task illumina_demux {
653656
dx_instance_type: "mem3_ssd2_v2_x32"
654657
dx_timeout: "20H"
655658
preemptible: 0 # this is the very first operation before scatter, so let's get it done quickly & reliably
659+
noAddress: true
656660
}
657661
}
658662

@@ -685,6 +689,7 @@ task map_map_setdefault {
685689
disks: "local-disk ~{disk_size} HDD"
686690
disk: "~{disk_size} GB"
687691
dx_instance_type: "mem1_ssd1_v2_x2"
692+
noAddress: true
688693
}
689694
}
690695

@@ -716,6 +721,7 @@ task merge_maps {
716721
disks: "local-disk ~{disk_size} LOCAL"
717722
disk: "~{disk_size} GB" # TES
718723
dx_instance_type: "mem1_ssd1_v2_x2"
724+
noAddress: true
719725
}
720726
}
721727

@@ -804,6 +810,7 @@ task group_fastq_pairs {
804810
disks: "local-disk ~{disk_size} HDD"
805811
disk: "~{disk_size} GB" # TES
806812
dx_instance_type: "mem1_ssd1_v2_x2"
813+
noAddress: true
807814
}
808815
}
809816

@@ -862,6 +869,7 @@ task get_illumina_run_metadata {
862869
disks: "local-disk ~{disk_size} LOCAL"
863870
disk: "~{disk_size} GB" # TES
864871
dx_instance_type: "mem1_ssd1_v2_x2"
872+
noAddress: true
865873
}
866874
}
867875

@@ -900,6 +908,7 @@ task check_for_barcode3 {
900908
docker: docker
901909
memory: "1 GB"
902910
cpu: 1
911+
noAddress: true
903912
}
904913
}
905914

@@ -1036,6 +1045,7 @@ task demux_fastqs {
10361045
disk: "~{disk_size} GB" # TES
10371046
dx_instance_type: "mem1_ssd1_v2_x16"
10381047
preemptible: 0 # this is the very first operation before scatter, so let's get it done quickly & reliably
1048+
noAddress: true
10391049
}
10401050
}
10411051

@@ -1083,6 +1093,7 @@ task merge_demux_metrics {
10831093
disks: "local-disk 50 HDD"
10841094
disk: "50 GB"
10851095
dx_instance_type: "mem1_ssd1_v2_x2"
1096+
noAddress: true
10861097
}
10871098
}
10881099

@@ -1150,5 +1161,6 @@ task merge_sample_metadata {
11501161
disks: "local-disk 50 HDD"
11511162
disk: "50 GB"
11521163
dx_instance_type: "mem1_ssd1_v2_x2"
1164+
noAddress: true
11531165
}
11541166
}

pipes/WDL/tasks/tasks_interhost.wdl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ task subsample_by_cases {
133133
disks: "local-disk 200 HDD"
134134
disk: "200 GB"
135135
dx_instance_type: "mem3_ssd1_v2_x4"
136+
noAddress: true
136137
}
137138
output {
138139
File genome_matrix_days = "genome_matrix_days.tsv"
@@ -194,6 +195,7 @@ task multi_align_mafft_ref {
194195
disks: "local-disk ~{disk_size} HDD"
195196
disk: "~{disk_size} GB" # TES
196197
dx_instance_type: "mem3_ssd1_v2_x8"
198+
noAddress: true
197199
}
198200
}
199201

@@ -239,6 +241,7 @@ task multi_align_mafft {
239241
disks: "local-disk ~{disk_size} HDD"
240242
disk: "~{disk_size} GB" # TES
241243
dx_instance_type: "mem2_ssd1_v2_x8"
244+
noAddress: true
242245
}
243246
}
244247

@@ -339,6 +342,7 @@ task beast {
339342
gpuType: select_first([gpu_type, "nvidia-tesla-p4"]) # Terra
340343
gpuCount: select_first([gpu_count, 1]) # Terra
341344
nvidiaDriverVersion: "410.79"
345+
noAddress: true
342346
}
343347
}
344348

@@ -376,6 +380,7 @@ task index_ref {
376380
disks: "local-disk ~{disk_size} HDD"
377381
disk: "~{disk_size} GB" # TES
378382
383+
noAddress: true
379384
}
380385
}
381386

@@ -405,6 +410,7 @@ task trimal_clean_msa {
405410
disks: "local-disk ~{disk_size} HDD"
406411
disk: "~{disk_size} GB" # TES
407412
dx_instance_type: "mem1_ssd1_v2_x8"
413+
noAddress: true
408414
}
409415
}
410416

@@ -461,6 +467,7 @@ task merge_vcfs_bcftools {
461467
memory: "~{select_first([machine_mem_gb, 3])} GB"
462468
cpu: 2
463469
dx_instance_type: "mem1_ssd1_v2_x2"
470+
noAddress: true
464471
}
465472
}
466473

@@ -522,6 +529,7 @@ task merge_vcfs_gatk {
522529
memory: "~{select_first([machine_mem_gb, 3])} GB"
523530
cpu: 2
524531
dx_instance_type: "mem1_ssd1_v2_x2"
532+
noAddress: true
525533
}
526534
}
527535

@@ -591,5 +599,6 @@ task reconstructr {
591599
disk: "~{disk_size} GB" # TES
592600
bootDiskSizeGb: 50
593601
dx_instance_type: "mem1_ssd1_v2_x4"
602+
noAddress: true
594603
}
595604
}

pipes/WDL/tasks/tasks_intrahost.wdl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ task polyphonia_detect_cross_contamination {
126126
disks: "local-disk ~{disk_size} HDD"
127127
disk: "~{disk_size} GB" # TES
128128
dx_instance_type: "mem1_ssd1_v2_x4"
129+
noAddress: true
129130
}
130131
}
131132

@@ -201,6 +202,7 @@ task lofreq {
201202
disks: "local-disk ~{disk_size} SSD"
202203
disk: "~{disk_size} GB" # TES
203204
dx_instance_type: "mem1_ssd1_v2_x4"
205+
noAddress: true
204206
}
205207
}
206208

@@ -241,6 +243,7 @@ task isnvs_per_sample {
241243
docker: docker
242244
memory: "~{select_first([machine_mem_gb, 7])} GB"
243245
dx_instance_type: "mem1_ssd1_v2_x8"
246+
noAddress: true
244247
}
245248
}
246249

pipes/WDL/tasks/tasks_megablast.wdl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ task trim_rmdup_subsamp {
5656
cpu: cpu
5757
disks: "local-disk ~{disk_size_gb} LOCAL"
5858
dx_instance_type: "n2-highmem-4"
59+
noAddress: true
5960
}
6061
}
6162

@@ -154,6 +155,7 @@ task lca_megablast {
154155
disks: "local-disk ~{disk_size_gb} HDD"
155156

156157
dx_instance_type: "n2-highmem-16"
158+
noAddress: true
157159
}
158160
}
159161

@@ -233,6 +235,7 @@ task ChunkBlastHits {
233235
disks: "local-disk ~{disk_size_gb} LOCAL"
234236

235237
dx_instance_type: "n2-standard-16"
238+
noAddress: true
236239
}
237240
}
238241

@@ -406,5 +409,6 @@ task blastoff {
406409
disks: "local-disk ~{disk_size_gb} HDD"
407410

408411
dx_instance_type: "n2-highmem-8"
412+
noAddress: true
409413
}
410414
}

0 commit comments

Comments
 (0)