Fix: Option to set maximum expiry date for task completion upload tokens

Azure#363
zerweck · Aug 6, 2019 · aa10f12 · aa10f12
1 parent 9e9b494
commit aa10f12
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/R/batch-api.R b/R/batch-api.R
@@ -16,6 +16,7 @@ BatchUtilities <- R6::R6Class(
       cloudCombine <- args$cloudCombine
       userOutputFiles <- args$outputFiles
       containerImage <- args$containerImage
+      maxDate <- args$maxDate
 
       accountName <- storageClient$authentication$name
 
@@ -76,7 +77,7 @@ BatchUtilities <- R6::R6Class(
         rAzureBatch::createBlobUrl(
           storageAccount = storageClient$authentication$name,
           containerName = jobId,
-          sasToken = storageClient$generateSasToken("w", "c", jobId),
+          sasToken = storageClient$generateSasToken("w", "c", jobId, end = maxDate),
           storageEndpointSuffix = config$endpointSuffix
         )
 
@@ -109,13 +110,14 @@ BatchUtilities <- R6::R6Class(
 
       outputFiles <- append(outputFiles, userOutputFiles)
 
+
       commands <-
         c(commands,
           rCommand)
 
       commands <- linuxWrapCommands(commands)
 
-      sasToken <- storageClient$generateSasToken("rwcl", "c", jobId)
+      sasToken <- storageClient$generateSasToken("rwcl", "c", jobId, end = maxDate)
       queryParameterUrl <- "?"
 
       for (query in names(sasToken)) {

diff --git a/R/doAzureParallel.R b/R/doAzureParallel.R
@@ -557,11 +557,17 @@ setHttpTraffic <- function(value = FALSE) {
 
   job <- batchClient$jobOperations$getJob(id)
 
+  if(!is.null(obj$options$azure$maxDate)) {
+    maxDate <- obj$options$azure$maxDate
+  } else {
+    maxDate <- Sys.time() + 60 * 60 * 24 * 2 # same as default value for rAzureBatch::StorageServiceClient$public_methods$generateSasToken
+  }
+
   outputContainerUrl <-
     rAzureBatch::createBlobUrl(
       storageAccount = storageClient$authentication$name,
       containerName = id,
-      sasToken = storageClient$generateSasToken("w", "c", id),
+      sasToken = storageClient$generateSasToken("w", "c", id, end = maxDate),
       storageEndpointSuffix = config$endpointSuffix
     )
 
@@ -641,7 +647,8 @@ setHttpTraffic <- function(value = FALSE) {
       outputFiles = mergeOutput,
       containerImage = data$containerImage,
       args = args,
-      maxRetryCount = maxTaskRetryCount
+      maxRetryCount = maxTaskRetryCount,
+      maxDate = maxDate
     )
 
     cat("\r", sprintf("Submitting tasks (%s/%s)", i, length(endIndices)), sep = "")
@@ -700,7 +707,8 @@ setHttpTraffic <- function(value = FALSE) {
       cloudCombine = cloudCombine,
       outputFiles = append(obj$options$azure$outputFiles, mergeOutput),
       containerImage = data$containerImage,
-      resourceFiles = mergeResources
+      resourceFiles = mergeResources,
+      maxDate = maxDate
     )
 
     cat(". . .")