From ef9de00325e4723e727d35aa2af9c1aba9475338 Mon Sep 17 00:00:00 2001 From: dcore94 Date: Fri, 15 Oct 2021 18:04:30 +0200 Subject: [PATCH] added rejection of downloads greater than max size --- templates/da_cache_to_shub.json.j2 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/templates/da_cache_to_shub.json.j2 b/templates/da_cache_to_shub.json.j2 index 0139241..7cc04f5 100644 --- a/templates/da_cache_to_shub.json.j2 +++ b/templates/da_cache_to_shub.json.j2 @@ -20,6 +20,7 @@ "parentfolder" : "Blue-Cloud Data Pool", "folder" : "${workflow.input.descriptor.userOrderName}-${workflow.input.descriptor.orderNumber}", "bcc" : ["prog@maris.nl","marco.lettere@nubisware.com"], + "max_download_size" : 16106127360, "scriptExpression": "1 === 1" } }, @@ -142,7 +143,8 @@ "upload" : "${init.input.storagehub}/workspace/items/${workflow.variables.target_folder_id}/create/ARCHIVE", "auth" : "Bearer ${workflow.input.token}", "description" : "${workflow.input.descriptor.userOrderName}", - "scriptExpression": "inputs={};tasks=[];for(var i=0;i<$.downloads.length;i++)download=$.downloads[i],tasks.push({name:'pyrestbridge',type:'SIMPLE',taskReferenceName:'downloads_'+i}),inputs['downloads_'+i]={ fail : false, datamap : { place: 'files', name : 'file'}, endpoint1 : { url: download.url}, endpoint2 : { url: $.upload, headers: { Authorization : $.auth}, files: { parentFolderName : 'download_' + download.number}} };return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};" + "max" : "${init.input.max_download_size}", + "scriptExpression": "inputs={};tasks=[];rejected=[];for(var i=0;i<$.downloads.length;i++) if($.downloads[i].size > $.max) rejected.push($.downloads[i]); else download=$.downloads[i],tasks.push({name:'pyrestbridge',type:'SIMPLE',taskReferenceName:'downloads_'+i}),inputs['downloads_'+i]={ fail : false, datamap : { place: 'files', name : 'file'}, endpoint1 : { url: download.url}, endpoint2 : { url: $.upload, headers: { Authorization : $.auth}, files: { parentFolderName : 'download_' + download.number}} };return {tasks:Java.to(tasks,'java.util.Map[]'),rejected:Java.to(rejected,'java.util.Map[]'),inputs:inputs};" } }, { @@ -174,7 +176,8 @@ "inputParameters": { "input" : "${workflow.input.descriptor}", "output" : "${join_parallel_downloads.output}", - "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}" + "rejected" : "${build_transfer_tasks.output.result.rejected}", + "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})};for(var r=0; r< $.rejected.length;r++) errors.push({url:$.rejected[r].url,number:$.rejected[r].number,error_number:9999,error_message:'Rejected because size is larger than allowed (16GB)'});report['errors']=Java.to(errors,'java.util.Map[]');return {report:report}" } }, { @@ -222,6 +225,15 @@ "scriptExpression": "var k,report='',keys=[];for(var k in $.output) keys.push(k);keys.sort();for(k in keys){var index=keys[k].split('_')[1];report+='';var o=$.output[keys[k]];o.endpoint1.error||o.endpoint2.error?report+='':report+='',report+=''}report+='
DownloadOutcome
'+(Number(index)+1)+''+(o.endpoint1.error||'')+(o.endpoint2.error||'')+'OK
';return { report : report}" } }, + { + "name": "LAMBDA_TASK", + "taskReferenceName": "build_rejected_email_report", + "type": "LAMBDA", + "inputParameters": { + "rejected" : "${build_transfer_tasks.output.result.rejected}", + "scriptExpression": "if($.rejected.length === 0) return {report: ''}; var k,report='';for(var r=0; r< $.rejected.length;r++){report+=''}report+='
DownloadRejected
'+$.rejected[r].number+''+$.rejected[r].size+' exceeds max (16GB)
';return { report : report}" + } + }, { "name" : "pymail", "taskReferenceName" : "send_email_report", @@ -236,7 +248,7 @@ "v1" : "${workflow.input.descriptor.requestId}", "v2" : "${workflow.input.descriptor.userOrderName}", "v3" : "${workflow.input.descriptor.orderNumber}", - "v4" : "${build_email_report.output.result.report}", + "v4" : "${build_email_report.output.result.report}
${build_rejected_email_report.output.result.report}", "v5" : "${init.input.workspace}/group/${init.input.workspace_group}/workspace?itemid=${workflow.variables.target_folder_id}&operation=gotofolder", "v6" : "${init.input.parentfolder}/${init.input.folder}" }