diff --git a/wdl/HardCloneWorkspace/HardCloneWorkspace.wdl b/wdl/HardCloneWorkspace/HardCloneWorkspace.wdl index 4d8c5cbc..f035add4 100644 --- a/wdl/HardCloneWorkspace/HardCloneWorkspace.wdl +++ b/wdl/HardCloneWorkspace/HardCloneWorkspace.wdl @@ -36,12 +36,10 @@ workflow HardCloneTerraWorkspace { } if (rsync_workspace) { - String source_bucket = read_string(HardCloneTerraWorkspaceTask.src_bucket) - String dest_bucket = read_string(HardCloneTerraWorkspaceTask.dest_bucket) call gcp_utils.GcloudRsync { input: - source=source_bucket, - destination=dest_bucket + source=HardCloneTerraWorkspaceTask.src_bucket, + destination=HardCloneTerraWorkspaceTask.dest_bucket } } } @@ -75,8 +73,8 @@ task HardCloneTerraWorkspaceTask { >>> output { - String dest_bucket = "dest_workspace_bucket.txt" - String src_bucket = "source_workspace_bucket.txt" + String dest_bucket = read_string("dest_workspace_bucket.txt") + String src_bucket = read_string("source_workspace_bucket.txt") } runtime { diff --git a/wdl/utils/GcpUtils.wdl b/wdl/utils/GcpUtils.wdl index 5ab2ae45..6de15a9d 100644 --- a/wdl/utils/GcpUtils.wdl +++ b/wdl/utils/GcpUtils.wdl @@ -11,7 +11,7 @@ task GcloudRsync { # Note that this is a Python regular expression, not a pure wildcard pattern. For example, # matching a string ending in "abc" is .*abc$ rather than *abc. Also note that the exclude path is relative, # as opposed to absolute (similar to Linux rsync and tar exclude options). - gcloud storage rsync --recursive ${source} ${destination} ${"--exclude=" + exclude_regex} + gcloud storage rsync --recursive ~{source} ~{destination} ~{"--exclude= " + exclude_regex} >>> runtime {