From f3ebfd37f23d29b38186e4308151dd6ac74381c1 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:40:25 +0100 Subject: [PATCH 01/10] Use markdown in roxygen #57 --- DESCRIPTION | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 983c286..68a6724 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,16 +1,16 @@ Package: AzureSMR Title: Package for Interacting with Azure Services Manager -Description: Helps users to manage Azure Services and objects from within an R Session. - This includes Azure Storage (e.g. containers and blobs), Virtual Machines and HDInsight (Spark, Hive). - Requires that an Active Directory application and service principal has been configured - to access Azure resources. +Description: Helps users to manage Azure Services and objects from within an + R Session. This includes Azure Storage (e.g. containers and blobs), Virtual + Machines and HDInsight (Spark, Hive). Requires that an Active Directory + application and service principal has been configured to access Azure resources. Type: Package Version: 0.2.2 Date: 2016-12-22 Authors@R: c( person(family="Microsoft Corporation", role="cph"), - person("Alan", "Weaver", role=c("aut"), email="alanwe@microsoft.com"), - person("Andrie", "de Vries", role=c("aut", "cre"), email="adevries@microsoft.com") + person("Alan", "Weaver", role=c("aut", "cre"), email="alanwe@microsoft.com"), + person("Andrie", "de Vries", role=c("aut"), email="adevries@microsoft.com") ) Copyright: Microsoft License: MIT + file LICENSE @@ -18,18 +18,19 @@ URL: https://github.com/Microsoft/AzureSMR BugReports: https://github.com/Microsoft/AzureSMR/issues NeedsCompilation: no Imports: - httr, - jsonlite, + httr, + jsonlite, XML, - plyr, - base64enc, + plyr, + base64enc, digest Depends: R(>= 3.0.0) -Suggests: - knitr, +Suggests: + knitr, rmarkdown, testthat VignetteBuilder: knitr LazyData: TRUE -RoxygenNote: 6.0.0 +RoxygenNote: 6.0.1 +Roxygen: list(markdown = TRUE) From e2dfca0363677ea707f4b53bef835cad195d2119 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:48:47 +0100 Subject: [PATCH 02/10] Ignore .Rproj --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 63b2fab..a8185fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.Rproj.user +*.Rproj.user .Rhistory .RData *.Rproj From 8c7b36ee192f8b907615fc2fa2787c234a7e7742 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:49:55 +0100 Subject: [PATCH 03/10] Ignore Visual Studio RTVS artefacts --- .Rbuildignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.Rbuildignore b/.Rbuildignore index 52e4b51..c0fded0 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,4 +1,7 @@ ^.*\.Rproj$ ^\.Rproj\.user$ +.rxproj$ +.rxproj.user$ +.vs/* CONTRIBUTING.md README.md From 333bb5325f9d65659b634c190b18f1b95637f8f9 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:50:40 +0100 Subject: [PATCH 04/10] Add help for `marker` --- R/AzureBlob.R | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/R/AzureBlob.R b/R/AzureBlob.R index 80db039..2674681 100644 --- a/R/AzureBlob.R +++ b/R/AzureBlob.R @@ -5,10 +5,10 @@ #' @inheritParams azureAuthenticate #' @inheritParams azureSAGetKey #' -#' @param maxresults Optional. Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxresults or specifies a value greater than 5,000, the server will return up to 5,000 items. Setting maxresults to a value less than or equal to zero results in error response code 400(Bad Request) . +#' @param maxresults Optional. Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxresults or specifies a value greater than 5,000, the server will return up to 5,000 items. Setting maxresults to a value less than or equal to zero results in error response code 400 (Bad Request). #' @param prefix Optional. Filters the results to return only blobs whose names begin with the specified prefix. #' @param delimiter Optional. When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string. -#' @param Optional. A string value that identifies the portion of the list to be returned with the next list operation. The operation returns a marker value within the response body if the list returned was not complete. The marker value may then be used in a subsequent call to request the next set of list items. The marker value is opaque to the client. +#' @param marker Optional. A string value that identifies the portion of the list to be returned with the next list operation. The operation returns a marker value within the response body if the list returned was not complete. The marker value may then be used in a subsequent call to request the next set of list items. The marker value is opaque to the client. #' #' @return Returns a data frame. This data frame has an attribute called "marker" that can be used with the "marker" argument to return the next set of values. #' @family blob store functions @@ -275,7 +275,7 @@ azureBlobLS <- function(azureActiveContext, directory, recursive = FALSE, #' @inheritParams azureSAGetKey #' @inheritParams azureBlobLS -#' @param type String, either "text" or "raw". Passed to \code{\link[httr]{content}} +#' @param type String, either "text" or "raw". Passed to `httr::content` #' #' @family blob store functions #' @export @@ -713,7 +713,7 @@ azureDeleteBlob <- function(azureActiveContext, blob, directory, SIG <- getSig(azureActiveContext, url = URL, verb = "DELETE", key = storageKey, storageAccount = storageAccount, container = container, - CMD = paste0("/", blob), dateS = D1) + CMD = paste0("/", blob), dateSig = D1) AT <- paste0("SharedKey ", storageAccount, ":", SIG) From e48002d46fa104b964b7ef598f5ab6d4d9209896 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:51:32 +0100 Subject: [PATCH 05/10] Use markdown in roxygen #57 --- R/AzureContextObject.R | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/R/AzureContextObject.R b/R/AzureContextObject.R index 9ae115c..6ebfbdb 100644 --- a/R/AzureContextObject.R +++ b/R/AzureContextObject.R @@ -7,7 +7,7 @@ #' @inheritParams setAzureContext #' @family azureActiveContext functions #' -#' @seealso \code{\link{setAzureContext}} +#' @seealso `setAzureContext` #' @export createAzureContext <- function(tenantID, clientID, authKey){ azEnv <- new.env(parent = globalenv()) @@ -33,24 +33,24 @@ dumpAzureContext <- function(azureActiveContext){ #' Updates azureActiveContext object. #' -#' Updates the value of an azureActiveContext object, created by \code{\link{createAzureContext}} +#' Updates the value of an azureActiveContext object, created by `createAzureContext` #' #' @param azureActiveContext A container used for caching variables used by AzureSMR #' @param tenantID The Tenant ID provided during creation of the Active Directory application / service principal #' @param clientID The Client ID provided during creation of the Active Directory application / service principal #' @param authKey The Authentication Key provided during creation of the Active Directory application / service principal -#' @param subscriptionID Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory -#' @param azToken Azure authentication token, obtained by \code{\link{azureAuthenticate}} +#' @param subscriptionID Set the subscriptionID. This is obtained automatically by `azureAuthenticate` when only a single subscriptionID is available via Active Directory +#' @param azToken Azure authentication token, obtained by `azureAuthenticate` #' @param resourceGroup Name of the resource group #' @param vmName Name of the virtual Machine #' @param storageAccount Name of the azure storage account #' @param storageKey Storage key associated with storage account #' @param blob Blob name -#' @param clustername Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}} -#' @param sessionID Spark sessionID. See \code{\link{azureSparkCMD}} +#' @param clustername Cluster name, used for HDI and Spark clusters. See `azureCreateHDI` +#' @param sessionID Spark sessionID. See `azureSparkCMD` #' @param hdiAdmin HDInsight admin username #' @param hdiPassword HDInsight admin password -#' @param container Storage container name. See \code{\link{azureListStorageContainers}} +#' @param container Storage container name. See `azureListStorageContainers` #' @param kind HDinsight kind: "hadoop","spark" or "pyspark" #' #' @family azureActiveContext functions From 1679eb327f31c971d2f6e3b39ab9214f4d048c17 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:52:09 +0100 Subject: [PATCH 06/10] Use message() instead of writeLines() --- R/AzureHDI.R | 32 ++++++++++++++++---------------- R/AzureHive.R | 4 ++-- R/AzureSpark.R | 14 +++++++------- R/AzureTemplate.R | 12 ++++++------ R/AzureVM.R | 32 ++++++++++++++++---------------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/R/AzureHDI.R b/R/AzureHDI.R index 727eed9..cfdd5b5 100644 --- a/R/AzureHDI.R +++ b/R/AzureHDI.R @@ -265,22 +265,22 @@ azureResizeHDI <- function(azureActiveContext, clustername, role = "worker", RT <- "Request accepted" if (toupper(mode) == "SYNC") { azureActiveContext$resourceGroup <- RGI - writeLines(paste("azureResizeHDI: Request Submitted: ", Sys.time())) - writeLines("Accepted(A), Resizing(R), Succeeded(S)") + message(paste("azureResizeHDI: Request Submitted: ", Sys.time())) + message("Accepted(A), Resizing(R), Succeeded(S)") a <- 1 while (a > 0) { rc <- azureListHDI(azureActiveContext, clustername = clustername) rc1 <- rc[9, 1] if (rc1 == "Running") { message("R") - writeLines("") - writeLines(paste("Finished Resizing Sucessfully: ", Sys.time())) + message("") + message(paste("Finished Resizing Sucessfully: ", Sys.time())) (break)() } if (rc1 == "Error") { - writeLines("") - writeLines(paste("Error Resizing: ", Sys.time())) + message("") + message(paste("Error Resizing: ", Sys.time())) (break)() } @@ -305,9 +305,9 @@ azureResizeHDI <- function(azureActiveContext, clustername, role = "worker", } # RT <- clusters[12,1] } - writeLines(paste("Finished: ", Sys.time())) + message(paste("Finished: ", Sys.time())) - return("Done") + return(TRUE) } @@ -613,21 +613,21 @@ azureCreateHDI <- function(azureActiveContext, clustername, location, kind = "sp rl <- content(r, "text", encoding = "UTF-8") if (toupper(mode) == "SYNC") { azureActiveContext$resourceGroup <- RGI - writeLines(paste("azureResizeHDI: Request Submitted: ", Sys.time())) - writeLines("Runing(C), Succeeded(S)") + message(paste("azureResizeHDI: Request Submitted: ", Sys.time())) + message("Runing(C), Succeeded(S)") a <- 1 while (a > 0) { rc <- azureListHDI(azureActiveContext, clustername = clustername) rc1 <- rc[8, 1] if (rc1 == "Succeeded") { message("S") - writeLines("") - writeLines(paste("Finished Creating Sucessfully: ", Sys.time())) + message("") + message(paste("Finished Creating Sucessfully: ", Sys.time())) (break)() } if (rc1 == "Error") { - writeLines("") - writeLines(paste("Error Creating: ", Sys.time())) + message("") + message(paste("Error Creating: ", Sys.time())) (break)() } a <- a + 1 @@ -644,8 +644,8 @@ azureCreateHDI <- function(azureActiveContext, clustername, location, kind = "sp azureActiveContext$hdiAdmin <- adminUser azureActiveContext$hdiPassword <- adminPassword azureActiveContext$clustername <- clustername - writeLines(paste("Finished: ", Sys.time())) - return("Done")} + message(paste("Finished: ", Sys.time())) + return(TRUE)} #' Run Script Action on HDI Cluster. diff --git a/R/AzureHive.R b/R/AzureHive.R index c0558a5..74519e5 100644 --- a/R/AzureHive.R +++ b/R/AzureHive.R @@ -121,8 +121,8 @@ azureHiveSQL <- function(azureActiveContext, CMD, clustername, hdiAdmin, rl <- content(r, "text", encoding = "UTF-8") df <- fromJSON(rl) - writeLines(paste("CMD Running: ", Sys.time())) - writeLines("Prep(P), Running(R), Completed(C)") + message(paste("CMD Running: ", Sys.time())) + message("Prep(P), Running(R), Completed(C)") DUR <- 2 # print(df$status$state) while (df$status$state == "RUNNING" | df$status$state == "PREP") { diff --git a/R/AzureSpark.R b/R/AzureSpark.R index 9c6da29..9adc946 100644 --- a/R/AzureSpark.R +++ b/R/AzureSpark.R @@ -191,7 +191,7 @@ azureSparkStopSession <- function(azureActiveContext, clustername, hdiAdmin, if (status_code(r) != "200") stop(paste("Error Return Code:", status_code(r))) - return("Done") + return(TRUE) } @@ -275,8 +275,8 @@ azureSparkCMD <- function(azureActiveContext, CMD, clustername, hdiAdmin, URL <- paste("https://", CN, ".azurehdinsight.net/livy/", rh$location, sep = "") # print(URL) - writeLines(paste("CMD Running: ", Sys.time())) - writeLines("Running(R), Completed(C)") + message(paste("CMD Running: ", Sys.time())) + message("Running(R), Completed(C)") while (df$state == "running") { Sys.sleep(DUR) @@ -373,8 +373,8 @@ azureSparkJob <- function(azureActiveContext, FILE, clustername, hdiAdmin, URL <- paste("https://", CN, ".azurehdinsight.net/livy/batches/", BI, sep = "") # print(URL) - writeLines(paste("CMD Running: ", Sys.time())) - writeLines("Running(R), Completed(C)") + message(paste("CMD Running: ", Sys.time())) + message("Running(R), Completed(C)") LOGURL2 <- "" while (df$state == "running") { @@ -392,8 +392,8 @@ azureSparkJob <- function(azureActiveContext, FILE, clustername, hdiAdmin, } message("C") STATE <- df$state - writeLines("") - writeLines(paste("Finished Running statement: ", Sys.time())) + message("") + message(paste("Finished Running statement: ", Sys.time())) # BID = gsub('application_','container_',df$appId) print(df$log[2]) # HN<- strsplit(df$log[2], ' ') diff --git a/R/AzureTemplate.R b/R/AzureTemplate.R index e150022..e0b5643 100644 --- a/R/AzureTemplate.R +++ b/R/AzureTemplate.R @@ -96,20 +96,20 @@ azureDeployTemplate <- function(azureActiveContext, deplname, templateURL, df <- fromJSON(rl) if (toupper(mode) == "SYNC") { rc <- "running" - writeLines(paste("azureDeployTemplate: Request Submitted: ", Sys.time())) - writeLines("Running(R), Succeeded(S)") + message(paste("azureDeployTemplate: Request Submitted: ", Sys.time())) + message("Running(R), Succeeded(S)") a <- 1 while (a > 0) { rc <- azureDeployStatus(azureActiveContext, deplname = deplname, resourceGroup = RGI) if (grepl("Succeeded", rc)) { - writeLines("") - writeLines(paste("Finished Deploying Sucessfully: ", Sys.time())) + message("") + message(paste("Finished Deploying Sucessfully: ", Sys.time())) (break)() } if (grepl("Error", rc) || grepl("Failed", rc)) { - writeLines("") - writeLines(paste("Error Deploying: ", Sys.time())) + message("") + message(paste("Error Deploying: ", Sys.time())) (break)() } diff --git a/R/AzureVM.R b/R/AzureVM.R index ad1ced5..92b4a7e 100644 --- a/R/AzureVM.R +++ b/R/AzureVM.R @@ -128,8 +128,8 @@ azureStartVM <- function(azureActiveContext, resourceGroup, vmName, mode = "Sync azureActiveContext$vmName <- vmNameI if (toupper(mode) == "SYNC") { rc <- "running" - writeLines(paste("azureStartVM: Request Submitted: ", Sys.time())) - writeLines("Updating(U), deallocating(D), starting(S), Deallocated(-) ") + message(paste("azureStartVM: Request Submitted: ", Sys.time())) + message("Updating(U), deallocating(D), starting(S), Deallocated(-) ") a <- 1 Sys.sleep(5) while (a > 0) { @@ -137,8 +137,8 @@ azureStartVM <- function(azureActiveContext, resourceGroup, vmName, mode = "Sync # rc1 <- rc$displayStatus[2] print(rc) print(rc1) a <- a + 1 if (grepl("running", rc1)) { - writeLines("") - writeLines(paste("Finished Started Sucessfully: ", Sys.time())) + message("") + message(paste("Finished Started Sucessfully: ", Sys.time())) (break)() } if (grepl("Updating", rc1)) { @@ -167,10 +167,10 @@ azureStartVM <- function(azureActiveContext, resourceGroup, vmName, mode = "Sync Sys.sleep(5) } message("Finished: ", Sys.time()) - return("Done") + return(TRUE) } - writeLines(paste("Start request Submitted: ", Sys.time())) - return("") + message(paste("Start request Submitted: ", Sys.time())) + return(TRUE) } @@ -237,14 +237,14 @@ azureStopVM <- function(azureActiveContext, resourceGroup, vmName, mode = "Sync" if (toupper(mode) == "SYNC") { rc <- "running" - writeLines(paste("azureStopVM: Request Submitted: ", Sys.time())) - writeLines("Updating(U), deallocating(D), starting(S), Stopped/Deallocated(-) ") + message(paste("azureStopVM: Request Submitted: ", Sys.time())) + message("Updating(U), deallocating(D), starting(S), Stopped/Deallocated(-) ") a <- 1 while (a > 0) { rc1 <- azureVMStatus(azureActiveContext) if (grepl("deallocated", rc1)) { - writeLines("") - writeLines(paste("Finished Deallocated Sucessfully: ", + message("") + message(paste("Finished Deallocated Sucessfully: ", Sys.time())) (break)() } @@ -407,14 +407,14 @@ azureDeleteVM <- function(azureActiveContext, resourceGroup, vmName, subscriptio if (toupper(mode) == "SYNC") { rc <- "running" - writeLines(paste("azureDeleteVM: Request Submitted: ", Sys.time())) - writeLines("Updating(U), Deleting(D), Stopped/Deallocated(-) ") + message(paste("azureDeleteVM: Request Submitted: ", Sys.time())) + message("Updating(U), Deleting(D), Stopped/Deallocated(-) ") a <- 1 while (a > 0) { rc <- azureVMStatus(ignore = "Y") if (grepl("NA", rc)) { - writeLines("") - writeLines(paste("Finished Deleted Sucessfully: ", Sys.time())) + message("") + message(paste("Finished Deleted Sucessfully: ", Sys.time())) (break)() } @@ -438,7 +438,7 @@ azureDeleteVM <- function(azureActiveContext, resourceGroup, vmName, subscriptio Sys.sleep(5) } } - writeLines(paste("Finished: ", Sys.time())) + message(paste("Finished: ", Sys.time())) return(rc) } From a886abdeb016917b4369d0b19475ecd38e90aa90 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:52:45 +0100 Subject: [PATCH 07/10] Rename file --- R/{AzureSM-package.R => AzureSMR-package.R} | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename R/{AzureSM-package.R => AzureSMR-package.R} (81%) diff --git a/R/AzureSM-package.R b/R/AzureSMR-package.R similarity index 81% rename from R/AzureSM-package.R rename to R/AzureSMR-package.R index b934064..d1ce44b 100644 --- a/R/AzureSM-package.R +++ b/R/AzureSMR-package.R @@ -4,12 +4,10 @@ #' #' This enables you to use and change many Azure resources, including: #' -#' \itemize{ -#' \item Storage blobs -#' \item HDInsight (Nodes, Hive, Spark) -#' \item Azure Resource Manager -#' \item Virtual Machines -#' } +#' * Storage blobs +#' * HDInsight (Nodes, Hive, Spark) +#' * Azure Resource Manager +#' * Virtual Machines #' #' #' @name AzureSMR-package From 329d7547f5fb52da7e36ed290acac9b1ca54e758 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:53:20 +0100 Subject: [PATCH 08/10] Move helper functions to testthat --- R/zzz_test_helpers.R => tests/testthat/helper.R | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename R/zzz_test_helpers.R => tests/testthat/helper.R (100%) diff --git a/R/zzz_test_helpers.R b/tests/testthat/helper.R similarity index 100% rename from R/zzz_test_helpers.R rename to tests/testthat/helper.R From d6ca0dd5af8d1c58f10f162d3706dcf594544102 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:54:06 +0100 Subject: [PATCH 09/10] Minor refactoring --- R/AzureAuthenticate.R | 34 ++++++++++++++++++---------------- R/AzureContainer.R | 6 +++--- R/config.R | 2 +- R/internal.R | 2 +- R/methods.R | 2 +- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/R/AzureAuthenticate.R b/R/AzureAuthenticate.R index 0317b96..fcc0fbd 100644 --- a/R/AzureAuthenticate.R +++ b/R/AzureAuthenticate.R @@ -3,42 +3,44 @@ #' @inheritParams setAzureContext #' @param verbose Print Tracing information (Default False) #' -#' @note See \url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/} to learn how to set up an Active directory application +#' @note See \url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/} for instructions to set up an Active Directory application #' @references \url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/} #' #' @return Retunrs Azure Tokem and sets AzureContext Token #' @family Resources +#' +#' @importFrom utils URLencode #' @export azureAuthenticate <- function(azureActiveContext, tenantID, clientID, authKey, verbose = FALSE) { if (missing(tenantID)) { - AtenantID <- azureActiveContext$tenantID - } else (AtenantID <- tenantID) + tenantID <- azureActiveContext$tenantID + } else (tenantID <- tenantID) if (missing(clientID)) { - AclientID <- azureActiveContext$clientID - } else (AclientID <- clientID) + clientID <- azureActiveContext$clientID + } else (clientID <- clientID) if (missing(authKey)) { - AauthKey <- azureActiveContext$authKey - } else (AauthKey <- authKey) + authKey <- azureActiveContext$authKey + } else (authKey <- authKey) - if (!length(AtenantID)) { + if (!length(tenantID)) { stop("Error: No tenantID provided: Use tenantID argument or set in AzureContext") } - if (!length(AclientID)) { + if (!length(clientID)) { stop("Error: No clientID provided: Use clientID argument or set in AzureContext") } - if (!length(AauthKey)) { + if (!length(authKey)) { stop("Error: No authKey provided: Use authKey argument or set in AzureContext") } verbosity <- if (verbose) httr::verbose(TRUE) else NULL - URLGT <- paste0("https://login.microsoftonline.com/", AtenantID, "/oauth2/token?api-version=1.0") + URLGT <- paste0("https://login.microsoftonline.com/", tenantID, "/oauth2/token?api-version=1.0") - AauthKeyE <- URLencode(AauthKey, reserved = TRUE) + authKeyEncoded <- URLencode(authKey, reserved = TRUE) bodyGT <- paste0("grant_type=client_credentials&resource=https%3A%2F%2Fmanagement.azure.com%2F&client_id=", - AclientID, "&client_secret=", AauthKeyE) + clientID, "&client_secret=", authKeyEncoded) r <- httr::POST(URLGT, add_headers( @@ -53,9 +55,9 @@ azureAuthenticate <- function(azureActiveContext, tenantID, clientID, authKey, v azureActiveContext$Token <- AT - azureActiveContext$tenantID <- AtenantID - azureActiveContext$clientID <- AclientID - azureActiveContext$authKey <- AauthKey + azureActiveContext$tenantID <- tenantID + azureActiveContext$clientID <- clientID + azureActiveContext$authKey <- authKey azureActiveContext$EXPIRY <- Sys.time() + 3598 SUBS <- azureListSubscriptions(azureActiveContext) return("Authentication Suceeded : Key Obtained") diff --git a/R/AzureContainer.R b/R/AzureContainer.R index f344f00..e9a5a00 100644 --- a/R/AzureContainer.R +++ b/R/AzureContainer.R @@ -57,7 +57,7 @@ azureListStorageContainers <- function(azureActiveContext, storageAccount, stora D1 <- format(Sys.time(), "%a, %d %b %Y %H:%M:%S %Z", tz = "GMT") SIG <- getSig(azureActiveContext, url = URL, verb = "GET", key = STK, storageAccount = SAI, - CMD = "\ncomp:list", dateS = D1) + CMD = "\ncomp:list", dateSig = D1) AT <- paste0("SharedKey ", SAI, ":", SIG) @@ -177,7 +177,7 @@ azureCreateStorageContainer <- function(azureActiveContext, container, storageAc SIG <- getSig(azureActiveContext, url = URL, verb = "PUT", key = STK, storageAccount = SAI, container = CNTR, - CMD = "\nrestype:container", dateS = D1) + CMD = "\nrestype:container", dateSig = D1) AT <- paste0("SharedKey ", SAI, ":", SIG) r <- PUT(URL, add_headers(.headers = c(Authorization = AT, `Content-Length` = "0", @@ -261,7 +261,7 @@ azureDeleteStorageContainer <- function(azureActiveContext, container, storageAc azureActiveContext$resourceGroup <- RGI SIG <- getSig(azureActiveContext, url = URL, verb = "DELETE", key = STK, storageAccount = SAI, - CMD = paste0(CNTR, "\nrestype:container"), dateS = D1) + CMD = paste0(CNTR, "\nrestype:container"), dateSig = D1) AT <- paste0("SharedKey ", SAI, ":", SIG) diff --git a/R/config.R b/R/config.R index a52887c..84393db 100644 --- a/R/config.R +++ b/R/config.R @@ -1,6 +1,6 @@ # Reads settings from configuration file in JSON format. # -# @config location of file that contains configuration in JSON format +# @param config location of file that contains configuration in JSON format # read.AzureSMR.config <- function(config = getOption("AzureSMR.config")){ z <- tryCatch(fromJSON(file(config)), diff --git a/R/internal.R b/R/internal.R index e8b5f1f..65fc263 100644 --- a/R/internal.R +++ b/R/internal.R @@ -23,7 +23,7 @@ callAzureStorageApi <- function(url, verb = "GET", storageKey, storageAccount, if (missing(CMD) || is.null(CMD)) CMD <- extractUrlArguments(url) - sig <- createAzureStorageSignature(url = URL, verb = verb, + sig <- createAzureStorageSignature(url = url, verb = verb, key = storageKey, storageAccount = storageAccount, container = container, headers = headers, CMD = CMD, size = size, contenttype = contenttype, dateStamp = dateStamp, verbose = verbose) diff --git a/R/methods.R b/R/methods.R index 4717b19..fec531a 100644 --- a/R/methods.R +++ b/R/methods.R @@ -6,7 +6,7 @@ #' @param object Object to create, test or print #' @param ... Ignored #' -#' @seealso \code{\link{createAzureContext}} +#' @seealso `createAzureContext` #' @export #' @rdname Internal as.azureActiveContext <- function(x){ From 95e3c6b0a2ed36796efd39a276d79216a99e8265 Mon Sep 17 00:00:00 2001 From: Andrie de Vries Date: Sat, 20 May 2017 21:54:22 +0100 Subject: [PATCH 10/10] Rebuild documentation --- NAMESPACE | 1 + man/AzureSMR-package.Rd | 3 +-- man/Internal.Rd | 2 +- man/azureAuthenticate.Rd | 2 +- man/azureBlobCD.Rd | 6 ++++-- man/azureBlobFind.Rd | 6 ++++-- man/azureBlobLS.Rd | 2 +- man/azureCancelDeploy.Rd | 4 ++-- man/azureCreateHDI.Rd | 6 +++--- man/azureCreateResourceGroup.Rd | 4 ++-- man/azureCreateStorageAccount.Rd | 2 +- man/azureCreateStorageContainer.Rd | 6 +++--- man/azureDeleteBlob.Rd | 2 +- man/azureDeleteDeploy.Rd | 4 ++-- man/azureDeleteHDI.Rd | 6 +++--- man/azureDeleteResourceGroup.Rd | 4 ++-- man/azureDeleteStorageContainer.Rd | 6 +++--- man/azureDeleteVM.Rd | 4 ++-- man/azureDeletestorageAccount.Rd | 2 +- man/azureDeployStatus.Rd | 4 ++-- man/azureDeployTemplate.Rd | 4 ++-- man/azureGetBlob.Rd | 4 ++-- man/azureHDIConf.Rd | 6 +++--- man/azureHiveSQL.Rd | 2 +- man/azureHiveStatus.Rd | 2 +- man/azureListAllResources.Rd | 2 +- man/azureListHDI.Rd | 6 +++--- man/azureListRG.Rd | 4 ++-- man/azureListSA.Rd | 2 +- man/azureListScaleSetNetwork.Rd | 4 ++-- man/azureListScaleSetVM.Rd | 4 ++-- man/azureListScaleSets.Rd | 4 ++-- man/azureListStorageBlobs.Rd | 8 ++++---- man/azureListStorageContainers.Rd | 4 ++-- man/azureListSubscriptions.Rd | 2 +- man/azureListVM.Rd | 4 ++-- man/azurePutBlob.Rd | 10 +++++++--- man/azureResizeHDI.Rd | 6 +++--- man/azureRunScriptAction.Rd | 6 +++--- man/azureSAGetKey.Rd | 2 +- man/azureScriptActionHistory.Rd | 6 +++--- man/azureSparkCMD.Rd | 4 ++-- man/azureSparkJob.Rd | 2 +- man/azureSparkListJobs.Rd | 2 +- man/azureSparkListSessions.Rd | 2 +- man/azureSparkNewSession.Rd | 2 +- man/azureSparkStopSession.Rd | 4 ++-- man/azureStartVM.Rd | 4 ++-- man/azureStopVM.Rd | 4 ++-- man/azureVMStatus.Rd | 4 ++-- man/createAzureContext.Rd | 2 +- man/setAzureContext.Rd | 12 ++++++------ 52 files changed, 109 insertions(+), 101 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 52ef64c..4ec0b90 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -76,6 +76,7 @@ importFrom(httr,http_status) importFrom(httr,status_code) importFrom(jsonlite,fromJSON) importFrom(plyr,rbind.fill) +importFrom(utils,URLencode) importFrom(utils,browseURL) importFrom(utils,ls.str) importFrom(utils,str) diff --git a/man/AzureSMR-package.Rd b/man/AzureSMR-package.Rd index d9df671..533b5c7 100644 --- a/man/AzureSMR-package.Rd +++ b/man/AzureSMR-package.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/AzureSM-package.R +% Please edit documentation in R/AzureSMR-package.R \docType{package} \name{AzureSMR-package} \alias{AzureSMR-package} @@ -10,7 +10,6 @@ The AzureSMR package connects R to the Azure Service Manager API. } \details{ This enables you to use and change many Azure resources, including: - \itemize{ \item Storage blobs \item HDInsight (Nodes, Hive, Spark) diff --git a/man/Internal.Rd b/man/Internal.Rd index 9d924ac..6a05f15 100644 --- a/man/Internal.Rd +++ b/man/Internal.Rd @@ -26,5 +26,5 @@ is.azureActiveContext(x) Functions for creating and displaying information about azureActiveContext objects. } \seealso{ -\code{\link{createAzureContext}} +\code{createAzureContext} } diff --git a/man/azureAuthenticate.Rd b/man/azureAuthenticate.Rd index f238ddf..98314d8 100644 --- a/man/azureAuthenticate.Rd +++ b/man/azureAuthenticate.Rd @@ -25,7 +25,7 @@ Retunrs Azure Tokem and sets AzureContext Token Authenticates against Azure Active directory application. } \note{ -See \url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/} to learn how to set up an Active directory application +See \url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/} for instructions to set up an Active Directory application } \references{ \url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/} diff --git a/man/azureBlobCD.Rd b/man/azureBlobCD.Rd index 21a01be..7e6cc4d 100644 --- a/man/azureBlobCD.Rd +++ b/man/azureBlobCD.Rd @@ -12,9 +12,11 @@ azureBlobCD(azureActiveContext, directory, container, file, storageAccount, \item{directory}{Blob store directory to list for content} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} -\item{file}{- Local filename to store in Azure blob} +\item{file}{\itemize{ +\item Local filename to store in Azure blob +}} \item{storageAccount}{Name of the azure storage account} diff --git a/man/azureBlobFind.Rd b/man/azureBlobFind.Rd index ab5c1a5..bb27caf 100644 --- a/man/azureBlobFind.Rd +++ b/man/azureBlobFind.Rd @@ -10,13 +10,15 @@ azureBlobFind(azureActiveContext, file, storageAccount, storageKey, container, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{file}{- Local filename to store in Azure blob} +\item{file}{\itemize{ +\item Local filename to store in Azure blob +}} \item{storageAccount}{Name of the azure storage account} \item{storageKey}{Storage key associated with storage account} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{resourceGroup}{Name of the resource group} diff --git a/man/azureBlobLS.Rd b/man/azureBlobLS.Rd index 2797a7d..befce6e 100644 --- a/man/azureBlobLS.Rd +++ b/man/azureBlobLS.Rd @@ -18,7 +18,7 @@ azureBlobLS(azureActiveContext, directory, recursive = FALSE, storageAccount, \item{storageKey}{Storage key associated with storage account} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{resourceGroup}{Name of the resource group} diff --git a/man/azureCancelDeploy.Rd b/man/azureCancelDeploy.Rd index c5678b0..93bca0c 100644 --- a/man/azureCancelDeploy.Rd +++ b/man/azureCancelDeploy.Rd @@ -14,9 +14,9 @@ azureCancelDeploy(azureActiveContext, deplname, resourceGroup, subscriptionID, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureCreateHDI.Rd b/man/azureCreateHDI.Rd index 83b26b5..909bd3c 100644 --- a/man/azureCreateHDI.Rd +++ b/man/azureCreateHDI.Rd @@ -13,7 +13,7 @@ azureCreateHDI(azureActiveContext, clustername, location, kind = "spark", \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{location}{Azure region, e.g. 'westeurope' or 'southcentralus'} @@ -49,9 +49,9 @@ azureCreateHDI(azureActiveContext, clustername, location, kind = "spark", \item{vmSize}{Size of nodes: "Large", "Small", "Standard_D14_V2", etc.} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{mode}{Provisioning mode, "Sync" or "Async". Use "Async" to immediately return to R session after submission of request} diff --git a/man/azureCreateResourceGroup.Rd b/man/azureCreateResourceGroup.Rd index cd96a6d..9b4d115 100644 --- a/man/azureCreateResourceGroup.Rd +++ b/man/azureCreateResourceGroup.Rd @@ -14,9 +14,9 @@ azureCreateResourceGroup(azureActiveContext, resourceGroup, location, \item{location}{Azure region, e.g. 'westeurope' or 'southcentralus'} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureCreateStorageAccount.Rd b/man/azureCreateStorageAccount.Rd index e9ef810..fe836da 100644 --- a/man/azureCreateStorageAccount.Rd +++ b/man/azureCreateStorageAccount.Rd @@ -16,7 +16,7 @@ azureCreateStorageAccount(azureActiveContext, storageAccount, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureCreateStorageContainer.Rd b/man/azureCreateStorageContainer.Rd index 287737a..9edef27 100644 --- a/man/azureCreateStorageContainer.Rd +++ b/man/azureCreateStorageContainer.Rd @@ -10,7 +10,7 @@ azureCreateStorageContainer(azureActiveContext, container, storageAccount, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{storageAccount}{Name of the azure storage account} @@ -18,9 +18,9 @@ azureCreateStorageContainer(azureActiveContext, container, storageAccount, \item{resourceGroup}{Name of the resource group} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureDeleteBlob.Rd b/man/azureDeleteBlob.Rd index 11485af..85cef36 100644 --- a/man/azureDeleteBlob.Rd +++ b/man/azureDeleteBlob.Rd @@ -18,7 +18,7 @@ azureDeleteBlob(azureActiveContext, blob, directory, storageAccount, storageKey, \item{storageKey}{Storage key associated with storage account} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{resourceGroup}{Name of the resource group} diff --git a/man/azureDeleteDeploy.Rd b/man/azureDeleteDeploy.Rd index 0e7e960..fc077ca 100644 --- a/man/azureDeleteDeploy.Rd +++ b/man/azureDeleteDeploy.Rd @@ -14,9 +14,9 @@ azureDeleteDeploy(azureActiveContext, deplname, resourceGroup, subscriptionID, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureDeleteHDI.Rd b/man/azureDeleteHDI.Rd index c8b4403..d262d2e 100644 --- a/man/azureDeleteHDI.Rd +++ b/man/azureDeleteHDI.Rd @@ -10,11 +10,11 @@ azureDeleteHDI(azureActiveContext, clustername, azToken, subscriptionID, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{resourceGroup}{Name of the resource group} diff --git a/man/azureDeleteResourceGroup.Rd b/man/azureDeleteResourceGroup.Rd index 9128441..15504c2 100644 --- a/man/azureDeleteResourceGroup.Rd +++ b/man/azureDeleteResourceGroup.Rd @@ -12,9 +12,9 @@ azureDeleteResourceGroup(azureActiveContext, resourceGroup, subscriptionID, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{type}{filter by resource type} diff --git a/man/azureDeleteStorageContainer.Rd b/man/azureDeleteStorageContainer.Rd index 44ee610..ef8aa03 100644 --- a/man/azureDeleteStorageContainer.Rd +++ b/man/azureDeleteStorageContainer.Rd @@ -10,7 +10,7 @@ azureDeleteStorageContainer(azureActiveContext, container, storageAccount, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{storageAccount}{Name of the azure storage account} @@ -18,9 +18,9 @@ azureDeleteStorageContainer(azureActiveContext, container, storageAccount, \item{resourceGroup}{Name of the resource group} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureDeleteVM.Rd b/man/azureDeleteVM.Rd index 6e1e908..27682ec 100644 --- a/man/azureDeleteVM.Rd +++ b/man/azureDeleteVM.Rd @@ -14,9 +14,9 @@ azureDeleteVM(azureActiveContext, resourceGroup, vmName, subscriptionID, \item{vmName}{Virtual Machine name} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{mode}{Wait for operation to complete 'Sync' (Default)} diff --git a/man/azureDeletestorageAccount.Rd b/man/azureDeletestorageAccount.Rd index 5328323..e1effe7 100644 --- a/man/azureDeletestorageAccount.Rd +++ b/man/azureDeletestorageAccount.Rd @@ -14,7 +14,7 @@ azureDeletestorageAccount(azureActiveContext, storageAccount, resourceGroup, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureDeployStatus.Rd b/man/azureDeployStatus.Rd index 46121f8..3a67188 100644 --- a/man/azureDeployStatus.Rd +++ b/man/azureDeployStatus.Rd @@ -14,9 +14,9 @@ azureDeployStatus(azureActiveContext, deplname, resourceGroup, subscriptionID, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureDeployTemplate.Rd b/man/azureDeployTemplate.Rd index 1aac49b..c908850 100644 --- a/man/azureDeployTemplate.Rd +++ b/man/azureDeployTemplate.Rd @@ -25,9 +25,9 @@ azureDeployTemplate(azureActiveContext, deplname, templateURL, paramURL, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureGetBlob.Rd b/man/azureGetBlob.Rd index 603200a..e8798e4 100644 --- a/man/azureGetBlob.Rd +++ b/man/azureGetBlob.Rd @@ -14,13 +14,13 @@ azureGetBlob(azureActiveContext, blob, directory, type = "text", \item{directory}{Blob store directory to list for content} -\item{type}{String, either "text" or "raw". Passed to \code{\link[httr]{content}}} +\item{type}{String, either "text" or "raw". Passed to \code{httr::content}} \item{storageAccount}{Name of the azure storage account} \item{storageKey}{Storage key associated with storage account} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{resourceGroup}{Name of the resource group} diff --git a/man/azureHDIConf.Rd b/man/azureHDIConf.Rd index 1e86bd1..5419d60 100644 --- a/man/azureHDIConf.Rd +++ b/man/azureHDIConf.Rd @@ -10,13 +10,13 @@ azureHDIConf(azureActiveContext, clustername, resourceGroup, subscriptionID, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{name}{filter by resource name} diff --git a/man/azureHiveSQL.Rd b/man/azureHiveSQL.Rd index bd5a81f..28e69fb 100644 --- a/man/azureHiveSQL.Rd +++ b/man/azureHiveSQL.Rd @@ -12,7 +12,7 @@ azureHiveSQL(azureActiveContext, CMD, clustername, hdiAdmin, hdiPassword, \item{CMD}{SQl COmmand String} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} diff --git a/man/azureHiveStatus.Rd b/man/azureHiveStatus.Rd index 842a874..838e849 100644 --- a/man/azureHiveStatus.Rd +++ b/man/azureHiveStatus.Rd @@ -10,7 +10,7 @@ azureHiveStatus(azureActiveContext, clustername, hdiAdmin, hdiPassword, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} diff --git a/man/azureListAllResources.Rd b/man/azureListAllResources.Rd index 4df16b8..d50ce49 100644 --- a/man/azureListAllResources.Rd +++ b/man/azureListAllResources.Rd @@ -14,7 +14,7 @@ azureListAllResources(azureActiveContext, resourceGroup, subscriptionID, \item{subscriptionID}{subscriptionID Object (or use azureActiveContext)} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{name}{filter by resource name} diff --git a/man/azureListHDI.Rd b/man/azureListHDI.Rd index c0fedea..fa7a7fa 100644 --- a/man/azureListHDI.Rd +++ b/man/azureListHDI.Rd @@ -12,11 +12,11 @@ azureListHDI(azureActiveContext, resourceGroup, clustername = "*", \item{resourceGroup}{Name of the resource group} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{name}{filter by resource name} diff --git a/man/azureListRG.Rd b/man/azureListRG.Rd index 0ee597b..20affb0 100644 --- a/man/azureListRG.Rd +++ b/man/azureListRG.Rd @@ -12,9 +12,9 @@ AzureListRG(azureActiveContext, subscriptionID, azToken, verbose = FALSE) \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureListSA.Rd b/man/azureListSA.Rd index 6f42f66..c362dbf 100644 --- a/man/azureListSA.Rd +++ b/man/azureListSA.Rd @@ -12,7 +12,7 @@ azureListSA(azureActiveContext, resourceGroup, subscriptionID, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureListScaleSetNetwork.Rd b/man/azureListScaleSetNetwork.Rd index c5cec73..7cbad92 100644 --- a/man/azureListScaleSetNetwork.Rd +++ b/man/azureListScaleSetNetwork.Rd @@ -14,9 +14,9 @@ azureListScaleSetNetwork(azureActiveContext, resourceGroup, location, \item{location}{Azure region, e.g. 'westeurope' or 'southcentralus'} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureListScaleSetVM.Rd b/man/azureListScaleSetVM.Rd index 3c8ea75..4512c48 100644 --- a/man/azureListScaleSetVM.Rd +++ b/man/azureListScaleSetVM.Rd @@ -16,9 +16,9 @@ azureListScaleSetVM(azureActiveContext, scaleSet, resourceGroup, location, \item{location}{Azure region, e.g. 'westeurope' or 'southcentralus'} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureListScaleSets.Rd b/man/azureListScaleSets.Rd index 864aedd..38f9fd4 100644 --- a/man/azureListScaleSets.Rd +++ b/man/azureListScaleSets.Rd @@ -14,9 +14,9 @@ azureListScaleSets(azureActiveContext, resourceGroup, location, subscriptionID, \item{location}{Azure region, e.g. 'westeurope' or 'southcentralus'} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureListStorageBlobs.Rd b/man/azureListStorageBlobs.Rd index 09f40d8..64b7e6b 100644 --- a/man/azureListStorageBlobs.Rd +++ b/man/azureListStorageBlobs.Rd @@ -14,19 +14,19 @@ azureListStorageBlobs(azureActiveContext, storageAccount, storageKey, container, \item{storageKey}{Storage key associated with storage account} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{resourceGroup}{Name of the resource group} -\item{maxresults}{Optional. Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxresults or specifies a value greater than 5,000, the server will return up to 5,000 items. Setting maxresults to a value less than or equal to zero results in error response code 400(Bad Request) .} +\item{maxresults}{Optional. Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxresults or specifies a value greater than 5,000, the server will return up to 5,000 items. Setting maxresults to a value less than or equal to zero results in error response code 400 (Bad Request).} \item{prefix}{Optional. Filters the results to return only blobs whose names begin with the specified prefix.} \item{delimiter}{Optional. When the request includes this parameter, the operation returns a BlobPrefix element in the response body that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.} -\item{verbose}{Print Tracing information (Default False)} +\item{marker}{Optional. A string value that identifies the portion of the list to be returned with the next list operation. The operation returns a marker value within the response body if the list returned was not complete. The marker value may then be used in a subsequent call to request the next set of list items. The marker value is opaque to the client.} -\item{Optional.}{A string value that identifies the portion of the list to be returned with the next list operation. The operation returns a marker value within the response body if the list returned was not complete. The marker value may then be used in a subsequent call to request the next set of list items. The marker value is opaque to the client.} +\item{verbose}{Print Tracing information (Default False)} } \value{ Returns a data frame. This data frame has an attribute called "marker" that can be used with the "marker" argument to return the next set of values. diff --git a/man/azureListStorageContainers.Rd b/man/azureListStorageContainers.Rd index 4200a15..d630e63 100644 --- a/man/azureListStorageContainers.Rd +++ b/man/azureListStorageContainers.Rd @@ -16,9 +16,9 @@ azureListStorageContainers(azureActiveContext, storageAccount, storageKey, \item{resourceGroup}{Name of the resource group} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureListSubscriptions.Rd b/man/azureListSubscriptions.Rd index 59f5f58..f08bf19 100644 --- a/man/azureListSubscriptions.Rd +++ b/man/azureListSubscriptions.Rd @@ -9,7 +9,7 @@ azureListSubscriptions(azureActiveContext, azToken, verbose = FALSE) \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureListVM.Rd b/man/azureListVM.Rd index 1f8646b..14eb30e 100644 --- a/man/azureListVM.Rd +++ b/man/azureListVM.Rd @@ -14,9 +14,9 @@ azureListVM(azureActiveContext, resourceGroup, location, subscriptionID, \item{location}{Azure region, e.g. 'westeurope' or 'southcentralus'} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azurePutBlob.Rd b/man/azurePutBlob.Rd index 5d0a33b..023d93d 100644 --- a/man/azurePutBlob.Rd +++ b/man/azurePutBlob.Rd @@ -12,9 +12,13 @@ azurePutBlob(azureActiveContext, blob, contents = "", file = "", directory, \item{blob}{Blob name} -\item{contents}{- Object or value to store} +\item{contents}{\itemize{ +\item Object or value to store +}} -\item{file}{- Local filename to store in Azure blob} +\item{file}{\itemize{ +\item Local filename to store in Azure blob +}} \item{directory}{Blob store directory to list for content} @@ -22,7 +26,7 @@ azurePutBlob(azureActiveContext, blob, contents = "", file = "", directory, \item{storageKey}{Storage key associated with storage account} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{resourceGroup}{Name of the resource group} diff --git a/man/azureResizeHDI.Rd b/man/azureResizeHDI.Rd index 51dc40a..9044d90 100644 --- a/man/azureResizeHDI.Rd +++ b/man/azureResizeHDI.Rd @@ -10,7 +10,7 @@ azureResizeHDI(azureActiveContext, clustername, role = "worker", size = 2, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{role}{role type: 'worker', 'head' or 'Edge'} @@ -18,9 +18,9 @@ azureResizeHDI(azureActiveContext, clustername, role = "worker", size = 2, \item{mode}{Provisioning mode, "Sync" or "Async". Use "Async" to immediately return to R session after submission of request} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{resourceGroup}{Name of the resource group} diff --git a/man/azureRunScriptAction.Rd b/man/azureRunScriptAction.Rd index 1ae4c07..bde1090 100644 --- a/man/azureRunScriptAction.Rd +++ b/man/azureRunScriptAction.Rd @@ -21,15 +21,15 @@ azureRunScriptAction(azureActiveContext, scriptname = "script1", scriptURL, \item{edgeNode}{install on worker nodes (default FALSE)} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{resourceGroup}{Name of the resource group} \item{parameters}{parameters} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureSAGetKey.Rd b/man/azureSAGetKey.Rd index 81e2a91..7dd54d0 100644 --- a/man/azureSAGetKey.Rd +++ b/man/azureSAGetKey.Rd @@ -14,7 +14,7 @@ azureSAGetKey(azureActiveContext, storageAccount, resourceGroup, subscriptionID, \item{resourceGroup}{Name of the resource group} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureScriptActionHistory.Rd b/man/azureScriptActionHistory.Rd index b6df4f5..e2a585b 100644 --- a/man/azureScriptActionHistory.Rd +++ b/man/azureScriptActionHistory.Rd @@ -12,11 +12,11 @@ azureScriptActionHistory(azureActiveContext, resourceGroup, clustername = "*", \item{resourceGroup}{Name of the resource group} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{name}{filter by resource name} diff --git a/man/azureSparkCMD.Rd b/man/azureSparkCMD.Rd index 3b7fb5e..55bed95 100644 --- a/man/azureSparkCMD.Rd +++ b/man/azureSparkCMD.Rd @@ -12,13 +12,13 @@ azureSparkCMD(azureActiveContext, CMD, clustername, hdiAdmin, hdiPassword, \item{CMD}{CMD} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} \item{hdiPassword}{HDInsight admin password} -\item{sessionID}{Spark sessionID. See \code{\link{azureSparkCMD}}} +\item{sessionID}{Spark sessionID. See \code{azureSparkCMD}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureSparkJob.Rd b/man/azureSparkJob.Rd index de205c9..d41a6f0 100644 --- a/man/azureSparkJob.Rd +++ b/man/azureSparkJob.Rd @@ -12,7 +12,7 @@ azureSparkJob(azureActiveContext, FILE, clustername, hdiAdmin, hdiPassword, \item{FILE}{file} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} diff --git a/man/azureSparkListJobs.Rd b/man/azureSparkListJobs.Rd index 4de5820..e13f988 100644 --- a/man/azureSparkListJobs.Rd +++ b/man/azureSparkListJobs.Rd @@ -10,7 +10,7 @@ azureSparkListJobs(azureActiveContext, clustername, hdiAdmin, hdiPassword, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} diff --git a/man/azureSparkListSessions.Rd b/man/azureSparkListSessions.Rd index 23cdfaa..ce02c5c 100644 --- a/man/azureSparkListSessions.Rd +++ b/man/azureSparkListSessions.Rd @@ -10,7 +10,7 @@ azureSparkListSessions(azureActiveContext, clustername, hdiAdmin, hdiPassword, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} diff --git a/man/azureSparkNewSession.Rd b/man/azureSparkNewSession.Rd index b97595e..dede974 100644 --- a/man/azureSparkNewSession.Rd +++ b/man/azureSparkNewSession.Rd @@ -10,7 +10,7 @@ azureSparkNewSession(azureActiveContext, clustername, hdiAdmin, hdiPassword, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} diff --git a/man/azureSparkStopSession.Rd b/man/azureSparkStopSession.Rd index 3d82b96..44187e1 100644 --- a/man/azureSparkStopSession.Rd +++ b/man/azureSparkStopSession.Rd @@ -10,13 +10,13 @@ azureSparkStopSession(azureActiveContext, clustername, hdiAdmin, hdiPassword, \arguments{ \item{azureActiveContext}{A container used for caching variables used by AzureSMR} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{hdiAdmin}{HDInsight admin username} \item{hdiPassword}{HDInsight admin password} -\item{sessionID}{Spark sessionID. See \code{\link{azureSparkCMD}}} +\item{sessionID}{Spark sessionID. See \code{azureSparkCMD}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureStartVM.Rd b/man/azureStartVM.Rd index e8621d0..19869a1 100644 --- a/man/azureStartVM.Rd +++ b/man/azureStartVM.Rd @@ -16,9 +16,9 @@ azureStartVM(azureActiveContext, resourceGroup, vmName, mode = "Sync", \item{mode}{Wait for operation to complete 'Sync' (Default)} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureStopVM.Rd b/man/azureStopVM.Rd index 373e1b2..21f7860 100644 --- a/man/azureStopVM.Rd +++ b/man/azureStopVM.Rd @@ -16,9 +16,9 @@ azureStopVM(azureActiveContext, resourceGroup, vmName, mode = "Sync", \item{mode}{Wait for operation to complete 'Sync' (Default)} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{verbose}{Print Tracing information (Default False)} } diff --git a/man/azureVMStatus.Rd b/man/azureVMStatus.Rd index 306d4ba..d006207 100644 --- a/man/azureVMStatus.Rd +++ b/man/azureVMStatus.Rd @@ -14,9 +14,9 @@ azureVMStatus(azureActiveContext, resourceGroup, vmName, subscriptionID, \item{vmName}{Name of the virtual Machine} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} \item{ignore}{ignore} diff --git a/man/createAzureContext.Rd b/man/createAzureContext.Rd index 187d401..e33f545 100644 --- a/man/createAzureContext.Rd +++ b/man/createAzureContext.Rd @@ -20,7 +20,7 @@ Create a container (azureContextObject) for holding variables used by the AzureS See the Azure documentation (\url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/}) for information to configure an Active Directory application. } \seealso{ -\code{\link{setAzureContext}} +\code{setAzureContext} Other azureActiveContext functions: \code{\link{setAzureContext}} } diff --git a/man/setAzureContext.Rd b/man/setAzureContext.Rd index c25aa3c..e9b0b5e 100644 --- a/man/setAzureContext.Rd +++ b/man/setAzureContext.Rd @@ -17,9 +17,9 @@ setAzureContext(azureActiveContext, tenantID, clientID, authKey, azToken, \item{authKey}{The Authentication Key provided during creation of the Active Directory application / service principal} -\item{azToken}{Azure authentication token, obtained by \code{\link{azureAuthenticate}}} +\item{azToken}{Azure authentication token, obtained by \code{azureAuthenticate}} -\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{\link{azureAuthenticate}} when only a single subscriptionID is available via Active Directory} +\item{subscriptionID}{Set the subscriptionID. This is obtained automatically by \code{azureAuthenticate} when only a single subscriptionID is available via Active Directory} \item{resourceGroup}{Name of the resource group} @@ -27,7 +27,7 @@ setAzureContext(azureActiveContext, tenantID, clientID, authKey, azToken, \item{storageAccount}{Name of the azure storage account} -\item{container}{Storage container name. See \code{\link{azureListStorageContainers}}} +\item{container}{Storage container name. See \code{azureListStorageContainers}} \item{blob}{Blob name} @@ -37,14 +37,14 @@ setAzureContext(azureActiveContext, tenantID, clientID, authKey, azToken, \item{hdiPassword}{HDInsight admin password} -\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{\link{azureCreateHDI}}} +\item{clustername}{Cluster name, used for HDI and Spark clusters. See \code{azureCreateHDI}} \item{kind}{HDinsight kind: "hadoop","spark" or "pyspark"} -\item{sessionID}{Spark sessionID. See \code{\link{azureSparkCMD}}} +\item{sessionID}{Spark sessionID. See \code{azureSparkCMD}} } \description{ -Updates the value of an azureActiveContext object, created by \code{\link{createAzureContext}} +Updates the value of an azureActiveContext object, created by \code{createAzureContext} } \seealso{ Other azureActiveContext functions: \code{\link{createAzureContext}}