Skip to content
This repository was archived by the owner on Oct 31, 2019. It is now read-only.

Commit 172172e

Browse files
author
Ubuntu
committed
Fix unit tests; fix R CMD check warnings; Bump version to 0.2.7
1 parent d8fd5f7 commit 172172e

File tree

91 files changed

+554
-508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+554
-508
lines changed

.Rbuildignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
.vs/*
66
CONTRIBUTING.md
77
README.md
8+
man-roxygen

AzureSMR.Rproj

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ LaTeX: pdfLaTeX
1515
BuildType: Package
1616
PackageUseDevtools: Yes
1717
PackageInstallArgs: --no-multiarch --with-keep.source
18+
PackageCheckArgs: --as-cran --no-tests --no-vignettes
19+
PackageRoxygenize: rd,collate,namespace

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Description: Helps users to manage Azure Services and objects from within an
55
Machines and HDInsight (Spark, Hive). To use the package, you must configure an
66
Azure Active Directory application and service principal in the Azure portal.
77
Type: Package
8-
Version: 0.2.6
9-
Date: 2017-06-16
8+
Version: 0.2.7
9+
Date: 2017-09-26
1010
Authors@R: c(
1111
person(family="Microsoft Corporation", role="cph"),
1212
person("Alan", "Weaver", role=c("aut"), email="[email protected]"),

NAMESPACE

+3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ importFrom(miniUI,miniPage)
106106
importFrom(shiny,observeEvent)
107107
importFrom(shiny,paneViewer)
108108
importFrom(shiny,runGadget)
109+
importFrom(shiny,stopApp)
109110
importFrom(utils,URLencode)
110111
importFrom(utils,browseURL)
111112
importFrom(utils,ls.str)
113+
importFrom(utils,setTxtProgressBar)
112114
importFrom(utils,str)
115+
importFrom(utils,txtProgressBar)

R/AzureAuthenticate.R

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#' Authenticates against Azure Active directory application.
22
#'
33
#' @inheritParams setAzureContext
4-
#' @param verbose Print Tracing information (Default False)
4+
#' @param verbose If TRUE, prints verbose messages
5+
#' @param resource URL of azure management portal
56
#'
67
#' @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
78
#' @references \url{https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/}
@@ -10,12 +11,16 @@
1011
#' @family Azure resource functions
1112
#'
1213
#' @export
13-
azureAuthenticate <- function(azureActiveContext, tenantID, clientID, authKey, verbose = FALSE, resource = "https%3A%2F%2Fmanagement.azure.com%2F") {
14+
azureAuthenticate <- function(azureActiveContext, tenantID, clientID, authKey,
15+
verbose = FALSE,
16+
resource = "https://management.azure.com/") {
1417
assert_that(is.azureActiveContext(azureActiveContext))
1518

1619
if (missing(tenantID)) tenantID <- azureActiveContext$tenantID
1720
if (missing(clientID)) clientID <- azureActiveContext$clientID
1821
if (missing(authKey)) authKey <- azureActiveContext$authKey
22+
23+
resource <- URLencode(resource, reserved = TRUE, repeated = TRUE)
1924

2025
assert_that(is_tenant_id(tenantID))
2126
assert_that(is_client_id(clientID))

R/AzureBatch.R

+2
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ azureDeleteBatchAccount <- function(azureActiveContext, batchAccount,
119119
#'
120120
#' @inheritParams setAzureContext
121121
#' @inheritParams azureAuthenticate
122+
#'
123+
#' @param batchAccount storage account used by Azure Batch
122124
#'
123125
#' @family Batch account functions
124126
#' @export

R/AzureContextObject.R

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#' 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.
66
#'
77
#' @inheritParams setAzureContext
8+
#' @inheritParams read.AzureSMR.config
89
#' @family azureActiveContext functions
910
#'
1011
#' @seealso [setAzureContext()], [azureAuthenticate()], [read.AzureSMR.config)]

0 commit comments

Comments
 (0)