From e38834105c983ef183136ba7023d7433bbfe7caf Mon Sep 17 00:00:00 2001
From: Linda Xiang <linda.xiang@oicr.on.ca>
Date: Thu, 18 Aug 2022 15:37:12 -0400
Subject: [PATCH 1/2] [wfpm v0.8.0] started a new version download-aspera@0.1.1
 from download-aspera@0.1.0 which was released

---
 download-aspera/main.nf          | 2 +-
 download-aspera/pkg.json         | 4 ++--
 download-aspera/tests/checker.nf | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/download-aspera/main.nf b/download-aspera/main.nf
index bcdb1c0..e27dd47 100755
--- a/download-aspera/main.nf
+++ b/download-aspera/main.nf
@@ -24,7 +24,7 @@
 /* this block is auto-generated based on info from pkg.json where   */
 /* changes can be made if needed, do NOT modify this block manually */
 nextflow.enable.dsl = 2
-version = '0.1.0'  // package version
+version = '0.1.1'
 
 container = [
     'ghcr.io': 'ghcr.io/icgc-argo/argo-data-submission.download-aspera'
diff --git a/download-aspera/pkg.json b/download-aspera/pkg.json
index 3d5d48e..03701c6 100644
--- a/download-aspera/pkg.json
+++ b/download-aspera/pkg.json
@@ -1,6 +1,6 @@
 {
     "name": "download-aspera",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "Wrapper to utilize Aspera for EGA downloads",
     "main": "main.nf",
     "deprecated": false,
@@ -34,4 +34,4 @@
     "license": "GNU Affero General Public License v3",
     "bugReport": "https://github.com/icgc-argo/argo-data-submission/issues",
     "homepage": "https://github.com/icgc-argo/argo-data-submission#readme"
-}
+}
\ No newline at end of file
diff --git a/download-aspera/tests/checker.nf b/download-aspera/tests/checker.nf
index ee3f23e..b13419b 100755
--- a/download-aspera/tests/checker.nf
+++ b/download-aspera/tests/checker.nf
@@ -29,7 +29,7 @@
 /* this block is auto-generated based on info from pkg.json where   */
 /* changes can be made if needed, do NOT modify this block manually */
 nextflow.enable.dsl = 2
-version = '0.1.0'  // package version
+version = '0.1.1'
 
 container = [
     'ghcr.io': 'ghcr.io/icgc-argo/argo-data-submission.download-aspera'

From a481c70c5402f3eee304d3b51f700432db670888 Mon Sep 17 00:00:00 2001
From: Linda Xiang <linda.xiang@oicr.on.ca>
Date: Thu, 18 Aug 2022 15:49:41 -0400
Subject: [PATCH 2/2] add dependency and move ASPERA params from inputs

---
 download-aspera/main.nf          | 16 +++++++---------
 download-aspera/tests/checker.nf | 13 +++----------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/download-aspera/main.nf b/download-aspera/main.nf
index e27dd47..31f16a6 100755
--- a/download-aspera/main.nf
+++ b/download-aspera/main.nf
@@ -18,6 +18,7 @@
 
   Authors:
     Edmund Su
+    Linda Xiang
 */
 
 /********************************************************************/
@@ -60,9 +61,8 @@ process downloadAspera {
   input:  // input, make update as needed
     val target_file
     val EGAF
-    val ASCP_SCP_HOST
-    val ASCP_SCP_USER
-    val ASPERA_SCP_PASS
+    val dependency
+
   output:  // output, make update as needed
     path "${EGAF}/${regexed_file_name}", emit: output_file
 
@@ -71,9 +71,9 @@ process downloadAspera {
     regexed_file_name=target_file.replaceAll(/^.*\//,'')
     """
     mkdir ${EGAF}
-    export ASCP_SCP_HOST=${ASCP_SCP_HOST}
-    export ASCP_SCP_USER=${ASCP_SCP_USER}
-    export ASPERA_SCP_PASS=${ASPERA_SCP_PASS}
+    export ASCP_SCP_HOST=${params.ASCP_SCP_HOST}
+    export ASCP_SCP_USER=${params.ASCP_SCP_USER}
+    export ASPERA_SCP_PASS=${params.ASPERA_SCP_PASS}
     python3.6 /tools/main.py \\
       -f ${target_file} \\
       -o ${EGAF} \\
@@ -87,8 +87,6 @@ workflow {
   downloadAspera(
     params.target_file,
     params.EGAF,
-    params.ASCP_SCP_HOST,
-    params.ASCP_SCP_USER,
-    params.ASPERA_SCP_PASS,
+    true
   )
 }
\ No newline at end of file
diff --git a/download-aspera/tests/checker.nf b/download-aspera/tests/checker.nf
index b13419b..02fe2c4 100755
--- a/download-aspera/tests/checker.nf
+++ b/download-aspera/tests/checker.nf
@@ -76,17 +76,13 @@ workflow checker {
   take:
     target_file
     EGAF
-    ASCP_SCP_HOST
-    ASCP_SCP_USER
-    ASPERA_SCP_PASS
+
 
   main:
   downloadAspera(
     params.target_file,
     params.EGAF,
-    params.ASCP_SCP_HOST,
-    params.ASCP_SCP_USER,
-    params.ASPERA_SCP_PASS,
+    true
   )
 
     file_smart_diff(
@@ -98,9 +94,6 @@ workflow checker {
 workflow {
   checker(
     params.target_file,
-    params.EGAF,
-    params.ASCP_SCP_HOST,
-    params.ASCP_SCP_USER,
-    params.ASPERA_SCP_PASS,
+    params.EGAF
   )
 }