From 66c0e3ac680ee587f364155a1eaaa7aa1550b608 Mon Sep 17 00:00:00 2001 From: dcore94 Date: Fri, 17 Sep 2021 15:12:32 +0200 Subject: [PATCH] fixing workflow --- templates/da_cache_to_shub.json.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/da_cache_to_shub.json.j2 b/templates/da_cache_to_shub.json.j2 index 60e69ee..1cdf645 100644 --- a/templates/da_cache_to_shub.json.j2 +++ b/templates/da_cache_to_shub.json.j2 @@ -17,7 +17,7 @@ "workspace" : "{{ workspace }}", "auth" : "Bearer ${workflow.input.token}", "parentfolder" : "Blue-Cloud Data Downloads", - "folder" : "${workflow.input.descriptor.userOrderName}-${workflow.input.descriptor.order_number}", + "folder" : "${workflow.input.descriptor.userOrderName}-${workflow.input.descriptor.orderNumber}", "scriptExpression": "1 === 1" } }, @@ -172,7 +172,7 @@ "inputParameters": { "input" : "${workflow.input.descriptor}", "output" : "${join_parallel_downloads.output}", - "scriptExpression": "var k,report={requestid:$.input.request_id,order_number:$.input.order_number,errors:[]},keys=[],errors=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1],o=$.output[keys[k]];o.endpoint1.error&&errors.push({url:$.input.downloads[index].url,number:index,error_number:1002,error_message:o.endpoint1.error}),o.endpoint2.error&&errors.push({url:$.input.descriptor.downloads[index].url,number:index,error_number:9999,error_message:o.endpoint2.error})};report['errors']=Java.to(errors,'java.util.Map[]');return {report:report}" + "scriptExpression": "var k,report={requestid:$.input.requestId,orderNumber:$.input.orderNumber,errors:[]},keys=[],errors=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1],o=$.output[keys[k]];o.endpoint1.error&&errors.push({url:$.input.downloads[index].url,number:index,error_number:1002,error_message:o.endpoint1.error}),o.endpoint2.error&&errors.push({url:$.input.descriptor.downloads[index].url,number:index,error_number:9999,error_message:o.endpoint2.error})};report['errors']=Java.to(errors,'java.util.Map[]');return {report:report}" } }, { @@ -211,9 +211,9 @@ "html" : "

Dear user,

your request with id {v1} related to order {v2} number {v3} has completed with the following outcome:


{v4}

You can access your data through the D4Science workspace in the folder {v6}



WARNING / LEGAL TEXT: This message is intended only for the use of the individual or entity to which it is addressed and may contain information which is privileged, confidential, proprietary, or exempt from disclosure under applicable law. If you are not the intended recipient or the person responsible for delivering the message to the intended recipient, you are strictly prohibited from disclosing, distributing, copying, or in any way using this message. If you have received this communication in error, please notify the sender and destroy and delete any copies you may have received.

", "subject" : "Outcome of Bluecloud DA cache download {v1}", "extra_vars":{ - "v1" : "${workflow.input.descriptor.request_id}", + "v1" : "${workflow.input.descriptor.requestId}", "v2" : "${workflow.input.descriptor.userOrderName}", - "v3" : "${workflow.input.descriptor.order_number}", + "v3" : "${workflow.input.descriptor.orderNumber}", "v4" : "${build_email_report.output.result.report}", "v5" : "${init.input.workspace}", "v6" : "${init.input.parentfolder}"