When env variable ARVADOS_API_HOST_INSECURE is set HTTP client will not try to valida...

[arvados.git] / sdk / R / R / HttpRequest.R

diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index ea46beae03c574a34829721fa58c76c636488db7..149ec0db7ae5f655bec60893c590ee7bf584a84a 100644 (file)
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -1,123 +1,60 @@
+source("./R/util.R")
+
 HttpRequest <- R6::R6Class(
 
     "HttrRequest",
 
     public = list(
 
+        validContentTypes = NULL,
+        validVerbs = NULL,
+
         initialize = function() 
         {
+            self$validContentTypes <- c("text", "raw")
+            self$validVerbs <- c("GET", "POST", "PUT", "DELETE", "PROPFIND", "MOVE")
         },
 
-        GET = function(url, headers = NULL, body = NULL,
-                       queryFilters = NULL, limit = NULL, offset = NULL)
+        exec = function(verb, url, headers = NULL, body = NULL, queryParams = NULL,
+                        retryTimes = 0)
         {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
+            if(!(verb %in% self$validVerbs))
+                stop("Http verb is not valid.")
 
-            serverResponse <- httr::GET(url = url, config = headers)
-        },
+            urlQuery <- self$createQuery(queryParams)
+            url      <- paste0(url, urlQuery)
 
-        PUT = function(url, headers = NULL, body = NULL,
-                       queryFilters = NULL, limit = 100, offset = 0)
-        {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
+            config <- httr::add_headers(unlist(headers))
+            if(toString(Sys.getenv("ARVADOS_API_HOST_INSECURE") == "TRUE"))
+               config$options = list(ssl_verifypeer = FALSE)
 
-            serverResponse <- httr::PUT(url = url, config = headers, body = body)
+            print(config)
+            # times = 1 regular call + numberOfRetries
+            response <- httr::RETRY(verb, url = url, body = body,
+                                    config = config, times = retryTimes + 1)
         },
 
-        POST = function(url, headers = NULL, body = NULL,
-                        queryFilters = NULL, limit = 100, offset = 0)
-        {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
-
-            serverResponse <- httr::POST(url = url, config = headers, body = body)
-        },
-
-        DELETE = function(url, headers = NULL, body = NULL,
-                          queryFilters = NULL, limit = NULL, offset = NULL)
-        {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
-
-            serverResponse <- httr::DELETE(url = url, config = headers)
-        }
-    ),
-
-    private = list(
-
-        #Todo(Fudo): Refactor this and find a better way to build
-        # Python array from R list (recursion?)
-        createQuery = function(filters, limit, offset)
+        createQuery = function(queryParams)
         {
-            finalQuery <- "?alt=json"
+            queryParams <- Filter(Negate(is.null), queryParams)
 
-            if(!is.null(filters))
+            query <- sapply(queryParams, function(param)
             {
-                filters <- sapply(filters, function(filter)
-                {
-                    if(length(filter) != 3)
-                        stop("Filter list must have exacthey 3 elements.")
-
-                    attributeAndOperator = filter[c(1, 2)]
-                    filterList = filter[[3]]
-                    filterListIsPrimitive = TRUE
-                    if(length(filterList) > 1)
-                        filterListIsPrimitive = FALSE
-
-                    attributeAndOperator <- sapply(attributeAndOperator, function(component) {
-                        component <- paste0("\"", component, "\"")
-                    })
-
-                    filterList <- sapply(unlist(filterList), function(filter) {
-                        filter <- paste0("\"", filter, "\"")
-                    })
-
-                    filterList <- paste(filterList, collapse = ",+")
-
-                    if(!filterListIsPrimitive)
-                        filterList <- paste0("[", filterList, "]")
-
-                    filter <- c(attributeAndOperator, filterList)
+                if(is.list(param) || length(param) > 1)
+                    param <- RListToPythonList(param, ",")
 
-                    queryParameter <- paste(filter, collapse = ",+")
-                    queryParameter <- paste0("[", queryParameter, "]")
-        
-                })
+                URLencode(as.character(param), reserved = T, repeated = T)
 
-                filters <- paste(filters, collapse = ",+")
-                filters <- paste0("[", filters, "]")
+            }, USE.NAMES = TRUE)
 
-                encodedQuery <- URLencode(filters, reserved = T, repeated = T)
-
-                finalQuery <- paste0(finalQuery, "&filters=", encodedQuery)
-
-                #Todo(Fudo): This is a hack for now. Find a proper solution.
-                finalQuery <- stringr::str_replace_all(finalQuery, "%2B", "+")
-            }
-
-            if(!is.null(limit))
+            if(length(query) > 0)
             {
-                if(!is.numeric(limit))
-                    stop("Limit must be a numeric type.")
-                
-                finalQuery <- paste0(finalQuery, "&limit=", limit)
-            }
+                query <- paste0(names(query), "=", query, collapse = "&")
 
-            if(!is.null(offset))
-            {
-                if(!is.numeric(offset))
-                    stop("Offset must be a numeric type.")
-                
-                finalQuery <- paste0(finalQuery, "&offset=", offset)
+                return(paste0("/?", query))
             }
 
-            finalQuery
+            return("")
         }
     ),