Skip to content

Commit 2ce56ee

Browse files
committed
fixes
1 parent dfb1a2c commit 2ce56ee

14 files changed

Lines changed: 26 additions & 14 deletions

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ Suggests:
2828
httpuv,
2929
AzureStor
3030
Roxygen: list(markdown=TRUE, r6=FALSE, old_usage=TRUE)
31-
RoxygenNote: 7.2.1
31+
RoxygenNote: 7.3.1

NAMESPACE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,16 @@ export(pool_sapply)
5050
export(pool_size)
5151
import(AzureAuth)
5252
import(AzureGraph)
53+
importFrom(AzureAuth,AzureR_dir)
54+
importFrom(AzureAuth,clean_token_directory)
55+
importFrom(AzureAuth,delete_azure_token)
56+
importFrom(AzureAuth,get_azure_token)
57+
importFrom(AzureAuth,is_azure_token)
58+
importFrom(AzureAuth,is_azure_v1_token)
59+
importFrom(AzureAuth,is_guid)
60+
importFrom(AzureAuth,list_azure_tokens)
61+
importFrom(AzureGraph,format_public_fields)
62+
importFrom(AzureGraph,format_public_methods)
63+
importFrom(AzureGraph,is_empty)
64+
importFrom(AzureGraph,named_list)
5365
importFrom(utils,modifyList)

R/az_login.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#' @param version The Azure Active Directory version to use for authenticating.
1212
#' @param scopes The Azure Service Management scopes (permissions) to obtain for this login. Only for `version=2`.
1313
#' @param config_file Optionally, a JSON file containing any of the arguments listed above. Arguments supplied in this file take priority over those supplied on the command line. You can also use the output from the Azure CLI `az ad sp create-for-rbac` command.
14-
#' @param token Optionally, an OAuth 2.0 token, of class [AzureToken]. This allows you to reuse the authentication details for an existing session. If supplied, the other arguments above to `create_azure_login` will be ignored.
14+
#' @param token Optionally, an OAuth 2.0 token, of class [AzureAuth::AzureToken]. This allows you to reuse the authentication details for an existing session. If supplied, the other arguments above to `create_azure_login` will be ignored.
1515
#' @param graph_host The Microsoft Graph endpoint. See 'Microsoft Graph integration' below.
1616
#' @param refresh For `get_azure_login`, whether to refresh the authentication token on loading the client.
1717
#' @param selection For `get_azure_login`, if you have multiple logins for a given tenant, which one to use. This can be a number, or the input MD5 hash of the token used for the login. If not supplied, `get_azure_login` will print a menu and ask you to choose a login.

R/az_resgroup.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#' @section Initialization:
3434
#' Initializing a new object of this class can either retrieve an existing resource group, or create a new resource group on the host. Generally, the easiest way to create a resource group object is via the `get_resource_group`, `create_resource_group` or `list_resource_groups` methods of the [az_subscription] class, which handle this automatically.
3535
#'
36-
#' To create a resource group object in isolation, supply (at least) an Oauth 2.0 token of class [AzureToken], the subscription ID, and the resource group name. If this object refers to a _new_ resource group, supply the location as well (use the `list_locations` method of the `az_subscription class` for possible locations). You can also pass any optional parameters for the resource group as named arguments to `new()`.
36+
#' To create a resource group object in isolation, supply (at least) an Oauth 2.0 token of class [AzureAuth::AzureToken], the subscription ID, and the resource group name. If this object refers to a _new_ resource group, supply the location as well (use the `list_locations` method of the `az_subscription class` for possible locations). You can also pass any optional parameters for the resource group as named arguments to `new()`.
3737
#'
3838
#' @section Templates:
3939
#' To deploy a new template, pass the following arguments to `deploy_template()`:

R/az_rm.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#' - `aad_host`: Azure Active Directory host for authentication. Defaults to `https://login.microsoftonline.com/`. Change this if you are using a government or private cloud.
2828
#' - `...`: Further arguments to pass to `get_azure_token`.
2929
#' - `scopes`: The Azure Service Management scopes (permissions) to obtain for this login. Only for `version=2`.
30-
#' - `token`: Optionally, an OAuth 2.0 token, of class [AzureToken]. This allows you to reuse the authentication details for an existing session. If supplied, all other arguments will be ignored.
30+
#' - `token`: Optionally, an OAuth 2.0 token, of class [AzureAuth::AzureToken]. This allows you to reuse the authentication details for an existing session. If supplied, all other arguments will be ignored.
3131
#'
3232
#' @section Operations:
3333
#' The `do_operation()` method allows you to carry out arbitrary operations on the Resource Manager endpoint. It takes the following arguments:

R/az_subscription.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#' - `get_tags()` Get the tags on this subscription.
3030
#'
3131
#' @section Details:
32-
#' Generally, the easiest way to create a subscription object is via the `get_subscription` or `list_subscriptions` methods of the [az_rm] class. To create a subscription object in isolation, call the `new()` method and supply an Oauth 2.0 token of class [AzureToken], along with the ID of the subscription.
32+
#' Generally, the easiest way to create a subscription object is via the `get_subscription` or `list_subscriptions` methods of the [az_rm] class. To create a subscription object in isolation, call the `new()` method and supply an Oauth 2.0 token of class [AzureAuth::AzureToken], along with the ID of the subscription.
3333
#'
3434
#' @section Operations:
3535
#' The `do_operation()` method allows you to carry out arbitrary operations on the subscription. It takes the following arguments:
@@ -158,7 +158,7 @@ public=list(
158158
else sapply(apis, select_version)
159159
}
160160
},
161-
161+
162162
get_tags=function()
163163
{
164164
if(is.null(self$tags))

R/call_azure_rm.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#' Call the Azure Resource Manager REST API
22
#'
3-
#' @param token An Azure OAuth token, of class [AzureToken].
3+
#' @param token An Azure OAuth token, of class [AzureAuth::AzureToken].
44
#' @param subscription For `call_azure_rm`, a subscription ID.
55
#' @param operation The operation to perform, which will form part of the URL path.
66
#' @param options A named list giving the URL query parameters.

R/utils.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#' @param lst A named list of objects.
44
#' @param x For `is_url`, An R object.
55
#' @param https_only For `is_url`, whether to allow only HTTPS URLs.
6-
#' @param token For `get_paged_list`, an Azure OAuth token, of class [AzureToken].
6+
#' @param token For `get_paged_list`, an Azure OAuth token, of class [AzureAuth::AzureToken].
77
#' @param next_link_name,value_name For `get_paged_list`, the names of the next link and value components in the `lst` argument. The default values are correct for Resource Manager.
88
#'
99
#' @details

man/az_resource_group.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/az_rm.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)