diff --git a/wdl/GetTdrSchemaJson/GetTdrSchemaJson.wdl b/wdl/GetTdrSchemaJson/GetTdrSchemaJson.wdl index 62bbf77..2d4cf45 100644 --- a/wdl/GetTdrSchemaJson/GetTdrSchemaJson.wdl +++ b/wdl/GetTdrSchemaJson/GetTdrSchemaJson.wdl @@ -11,15 +11,6 @@ workflow GetTDRSchemaJson { } String docker_name = select_first([docker, "us-central1-docker.pkg.dev/operations-portal-427515/ops-toolbox/ops_terra_utils_slim:latest"]) - call ValidateInputs { - input: - input_metadata_tsv = input_metadata_tsv, - billing_project = billing_project, - workspace_name = workspace_name, - terra_table_names = terra_table_names, - docker_name = docker_name - } - call GenerateSchemaJson { input: input_metadata_tsv = input_metadata_tsv, @@ -29,50 +20,12 @@ workflow GetTDRSchemaJson { docker_name = docker_name, force_disparate_rows_to_string = force_disparate_rows_to_string } -} -task ValidateInputs { - input { - File? input_metadata_tsv - String? billing_project - String? workspace_name - String? terra_table_names - String docker_name + output { + File tdr_schema_json = GenerateSchemaJson.tdr_schema_json } - - command <<< - set -euo pipefail - - python3 <>> - - runtime { - docker: docker_name - } } - task GenerateSchemaJson { input { File? input_metadata_tsv @@ -84,19 +37,12 @@ task GenerateSchemaJson { } command <<< - if [ ! -z "~{input_metadata_tsv}" ]; then - python /etc/terra_utils/python/generate_tdr_schema_json.py \ - --input_tsv ~{input_metadata_tsv} \ - ~{if force_disparate_rows_to_string then "--force_disparate_rows_to_string" else ""} - - else - python /etc/terra_utils/python/generate_tdr_schema_json.py \ - --billing_project ~{billing_project} \ - --workspace_name ~{workspace_name} \ - --terra_table_names ~{terra_table_names} \ - ~{if force_disparate_rows_to_string then "--force_disparate_rows_to_string" else ""} - fi - + python /etc/terra_utils/python/generate_tdr_schema_json.py \ + ~{"--input_tsv " + input_metadata_tsv} \ + ~{"--billing_project " + billing_project} \ + ~{"--workspace_name " + workspace_name} \ + ~{"--terra_table_names " + terra_table_names} \ + ~{if force_disparate_rows_to_string then "--force_disparate_rows_to_string" else ""} >>> output {