projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16827: Update the generated API to Arvados 2.0
[arvados.git]
/
sdk
/
R
/
R
/
autoGenAPI.R
diff --git
a/sdk/R/R/autoGenAPI.R
b/sdk/R/R/autoGenAPI.R
index 1aef20b6cb90fe11d7440219bbe24d464af988c2..c86684f8b0a13ab62f53eddc23884a16e2504ffc 100644
(file)
--- a/
sdk/R/R/autoGenAPI.R
+++ b/
sdk/R/R/autoGenAPI.R
@@
-3,7
+3,7
@@
# SPDX-License-Identifier: Apache-2.0
getAPIDocument <- function(){
# SPDX-License-Identifier: Apache-2.0
getAPIDocument <- function(){
- url <- "https://
4xphq
.arvadosapi.com/discovery/v1/apis/arvados/v1/rest"
+ url <- "https://
jutro
.arvadosapi.com/discovery/v1/apis/arvados/v1/rest"
serverResponse <- httr::RETRY("GET", url = url)
httr::content(serverResponse, as = "parsed", type = "application/json")
serverResponse <- httr::RETRY("GET", url = url)
httr::content(serverResponse, as = "parsed", type = "application/json")
@@
-17,6
+17,10
@@
generateAPI <- function()
discoveryDocument <- getAPIDocument()
methodResources <- discoveryDocument$resources
discoveryDocument <- getAPIDocument()
methodResources <- discoveryDocument$resources
+
+ # Don't emit deprecated APIs
+ methodResources <- methodResources[!(names(methodResources) %in% c("jobs", "job_tasks", "pipeline_templates", "pipeline_instances",
+ "keep_disks", "nodes", "humans", "traits", "specimens"))]
resourceNames <- names(methodResources)
methodDoc <- genMethodsDoc(methodResources, resourceNames)
resourceNames <- names(methodResources)
methodDoc <- genMethodsDoc(methodResources, resourceNames)
@@
-34,6
+38,10
@@
generateAPI <- function()
arvadosAPIFooter)
fileConn <- file("./R/Arvados.R", "w")
arvadosAPIFooter)
fileConn <- file("./R/Arvados.R", "w")
+ writeLines(c(
+ "# Copyright (C) The Arvados Authors. All rights reserved.",
+ "#",
+ "# SPDX-License-Identifier: Apache-2.0", ""), fileConn)
writeLines(unlist(arvadosClass), fileConn)
close(fileConn)
NULL
writeLines(unlist(arvadosClass), fileConn)
close(fileConn)
NULL
@@
-252,7
+260,7
@@
getRequestURL <- function(methodMetaData)
getRequestHeaders <- function()
{
getRequestHeaders <- function()
{
- c("headers <- list(Authorization = paste(\"
OAuth2
\", private$token), ",
+ c("headers <- list(Authorization = paste(\"
Bearer
\", private$token), ",
" \"Content-Type\" = \"application/json\")")
}
" \"Content-Type\" = \"application/json\")")
}