Skip to content

Commit 85d41db

Browse files
authored
Doc fix (#141)
* redocument * update news/desc * update links * update actions
1 parent 2118fc8 commit 85d41db

25 files changed

+119
-86
lines changed

.github/workflows/check-standard.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ jobs:
1717
config:
1818
- {os: windows-latest, r: 'release'}
1919
- {os: macOS-latest, r: 'release'}
20-
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
20+
- {os: ubuntu-24.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
2121

2222
env:
2323
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2424
RSPM: ${{ matrix.config.rspm }}
2525

2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0 # required for mirroring, see https://stackoverflow.com/a/64272409/474349
3030

3131
- name: Copy to Cloudyr
32-
if: runner.os == 'Linux' && github.ref == 'refs/heads/master' && github.repository_owner == 'Azure'
32+
if: github.repository_owner == 'Azure' && runner.os == 'Linux' && github.ref == 'refs/heads/master'
3333
env:
3434
token: "${{ secrets.ghPat }}"
3535
# git config hack required, see https://stackoverflow.com/q/64270867/474349
@@ -39,11 +39,11 @@ jobs:
3939
xargs -L1 git config --unset-all
4040
git push --prune https://token:[email protected]/${CLOUDYR_REPO}.git +refs/remotes/origin/*:refs/heads/* +refs/tags/*:refs/tags/*
4141
42-
- uses: r-lib/actions/setup-r@master
42+
- uses: r-lib/actions/setup-r@v2
4343
with:
4444
r-version: ${{ matrix.config.r }}
4545

46-
- uses: r-lib/actions/setup-pandoc@master
46+
- uses: r-lib/actions/setup-pandoc@v2
4747

4848
- name: Query dependencies
4949
run: |
@@ -54,11 +54,11 @@ jobs:
5454

5555
- name: Cache R packages
5656
if: runner.os != 'Windows'
57-
uses: actions/cache@v2
57+
uses: actions/cache@v3
5858
with:
5959
path: ${{ env.R_LIBS_USER }}
6060
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
61-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
61+
# restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-5-
6262

6363
- name: Install system dependencies
6464
if: runner.os == 'Linux'
@@ -85,13 +85,13 @@ jobs:
8585

8686
- name: Upload check results
8787
if: failure()
88-
uses: actions/upload-artifact@main
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
9191
path: check
9292

9393
- name: Update Cloudyr drat
94-
if: success() && runner.os == 'Linux' && github.ref == 'refs/heads/master' && github.repository_owner == 'Azure'
94+
if: success() && github.repository_owner == 'Azure' && runner.os == 'Linux' && github.ref == 'refs/heads/master'
9595
env:
9696
token: "${{ secrets.ghPat }}"
9797
run: |

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: AzureStor
22
Title: Storage Management in 'Azure'
3-
Version: 3.7.0.9000
3+
Version: 3.7.1
44
Authors@R: c(
55
person("Hong", "Ooi", , "[email protected]", role = c("aut", "cre")),
66
person("Microsoft", role="cph")
77
)
8-
Description: Manage storage in Microsoft's 'Azure' cloud: <https://azure.microsoft.com/en-us/product-categories/storage/>. On the admin side, 'AzureStor' includes features to create, modify and delete storage accounts. On the client side, it includes an interface to blob storage, file storage, and 'Azure Data Lake Storage Gen2': upload and download files and blobs; list containers and files/blobs; create containers; and so on. Authenticated access to storage is supported, via either a shared access key or a shared access signature (SAS). Part of the 'AzureR' family of packages.
8+
Description: Manage storage in Microsoft's 'Azure' cloud: <https://azure.microsoft.com/en-us/products/category/storage/>. On the admin side, 'AzureStor' includes features to create, modify and delete storage accounts. On the client side, it includes an interface to blob storage, file storage, and 'Azure Data Lake Storage Gen2': upload and download files and blobs; list containers and files/blobs; create containers; and so on. Authenticated access to storage is supported, via either a shared access key or a shared access signature (SAS). Part of the 'AzureR' family of packages.
99
License: MIT + file LICENSE
1010
URL: https://github.com/Azure/AzureStor https://github.com/Azure/AzureR
1111
BugReports: https://github.com/Azure/AzureStor/issues
@@ -31,4 +31,4 @@ Suggests:
3131
processx,
3232
uuid
3333
Roxygen: list(markdown=TRUE, r6=FALSE, old_usage=TRUE)
34-
RoxygenNote: 7.1.1
34+
RoxygenNote: 7.3.1

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# AzureStor 3.7.1
22

3+
- Update documentation links for CRAN
34
- Fix a bug that caused a generated SAS to be invalid (thanks to Peter Solymos, #134)
45

56
# AzureStor 3.7.0

R/add_methods.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
#' @seealso
4141
#' [get_storage_account], [delete_storage_account], [az_storage]
4242
#'
43-
#' [Azure Storage documentation](https://docs.microsoft.com/en-us/azure/storage/),
44-
#' [Azure Storage Provider API reference](https://docs.microsoft.com/en-us/rest/api/storagerp/),
45-
#' [Azure Data Lake Storage hierarchical namespaces](https://docs.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-namespace)
43+
#' [Azure Storage documentation](https://learn.microsoft.com/en-us/azure/storage/),
44+
#' [Azure Storage Provider API reference](https://learn.microsoft.com/en-us/rest/api/storagerp/),
45+
#' [Azure Data Lake Storage hierarchical namespaces](https://learn.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-namespace)
4646
#'
4747
#' @examples
4848
#' \dontrun{
@@ -90,7 +90,7 @@ NULL
9090
#'
9191
#' @seealso
9292
#' [create_storage_account], [delete_storage_account], [az_storage],
93-
#' [Azure Storage Provider API reference](https://docs.microsoft.com/en-us/rest/api/storagerp/)
93+
#' [Azure Storage Provider API reference](https://learn.microsoft.com/en-us/rest/api/storagerp/)
9494
#'
9595
#' @examples
9696
#' \dontrun{
@@ -129,7 +129,7 @@ NULL
129129
#'
130130
#' @seealso
131131
#' [create_storage_account], [get_storage_account], [az_storage],
132-
#' [Azure Storage Provider API reference](https://docs.microsoft.com/en-us/rest/api/storagerp/)
132+
#' [Azure Storage Provider API reference](https://learn.microsoft.com/en-us/rest/api/storagerp/)
133133
#'
134134
#' @examples
135135
#' \dontrun{

R/az_storage.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#' - `regen_key(key)`: Regenerates (creates a new value for) an access key. The argument `key` can be 1 or 2.
1717
#'
1818
#' @section Initialization:
19-
#' Initializing a new object of this class can either retrieve an existing storage account, or create a account on the host. Generally, the best way to initialize an object is via the `get_storage_account`, `create_storage_account` or `list_storage_accounts` methods of the [az_resource_group] class, which handle the details automatically.
19+
#' Initializing a new object of this class can either retrieve an existing storage account, or create a account on the host. Generally, the best way to initialize an object is via the `get_storage_account`, `create_storage_account` or `list_storage_accounts` methods of the [AzureRMR::az_resource_group] class, which handle the details automatically.
2020
#'
2121
#' @section Creating a shared access signature:
2222
#' Note that you don't need to worry about this section if you have been _given_ a SAS, and only want to use it to access storage.
@@ -73,12 +73,12 @@
7373
#' [blob_endpoint], [file_endpoint],
7474
#' [create_storage_account], [get_storage_account], [delete_storage_account], [Date], [POSIXt]
7575
#'
76-
#' [Azure Storage Provider API reference](https://docs.microsoft.com/en-us/rest/api/storagerp/),
77-
#' [Azure Storage Services API reference](https://docs.microsoft.com/en-us/rest/api/storageservices/)
76+
#' [Azure Storage Provider API reference](https://learn.microsoft.com/en-us/rest/api/storagerp/),
77+
#' [Azure Storage Services API reference](https://learn.microsoft.com/en-us/rest/api/storageservices/)
7878
#'
79-
#' [Create an account SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/create-account-sas),
80-
#' [Create a user delegation SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas),
81-
#' [Create a service SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/create-service-sas)
79+
#' [Create an account SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-account-sas),
80+
#' [Create a user delegation SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas),
81+
#' [Create a service SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-service-sas)
8282
#'
8383
#' @examples
8484
#' \dontrun{

R/azcopy.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#' @seealso
2121
#' [processx::run], [download_blob], [download_azure_file], [download_adls_file]
2222
#'
23-
#' [AzCopy page on Microsoft Docs](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azcopy-v10)
23+
#' [AzCopy page on Microsoft Docs](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azcopy-v10)
2424
#'
2525
#' [AzCopy GitHub repo](https://github.com/Azure/azure-storage-azcopy)
2626
#' @examples

R/blob_client_funcs.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ delete_blob_container.blob_endpoint <- function(endpoint, name, confirm=TRUE, le
279279
#' [blob_container], [az_storage], [storage_download], [call_azcopy], [list_blob_snapshots], [list_blob_versions]
280280
#'
281281
#' [AzCopy version 10 on GitHub](https://github.com/Azure/azure-storage-azcopy)
282-
#' [Guide to the different blob types](https://docs.microsoft.com/en-us/rest/api/storageservices/understanding-block-blobs--append-blobs--and-page-blobs)
282+
#' [Guide to the different blob types](https://learn.microsoft.com/en-us/rest/api/storageservices/understanding-block-blobs--append-blobs--and-page-blobs)
283283
#'
284284
#' @examples
285285
#' \dontrun{

R/blob_lease.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#'
1818
#' @seealso
1919
#' [blob_container],
20-
#' [Leasing a blob](https://docs.microsoft.com/en-us/rest/api/storageservices/lease-blob),
21-
#' [Leasing a container](https://docs.microsoft.com/en-us/rest/api/storageservices/lease-container)
20+
#' [Leasing a blob](https://learn.microsoft.com/en-us/rest/api/storageservices/lease-blob),
21+
#' [Leasing a container](https://learn.microsoft.com/en-us/rest/api/storageservices/lease-container)
2222
#'
2323
#' @rdname lease
2424
#' @export

R/client_endpoint.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#' If multiple authentication objects are supplied, they are used in this order of priority: first an access key, then an AAD token, then a SAS. If no authentication objects are supplied, only public (anonymous) access to the endpoint is possible.
1818
#'
1919
#' @section Storage emulators:
20-
#' AzureStor supports connecting to the [Azure SDK](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator) and [Azurite](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite) emulators for blob and queue storage. To connect, pass the full URL of the endpoint, including the account name, to the `blob_endpoint` and `queue_endpoint` methods (the latter from the AzureQstor package). The warning about an unrecognised endpoint can be ignored. See the linked pages, and the examples below, for details on how to authenticate with the emulator.
20+
#' AzureStor supports connecting to the [Azure SDK](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-emulator) and [Azurite](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite) emulators for blob and queue storage. To connect, pass the full URL of the endpoint, including the account name, to the `blob_endpoint` and `queue_endpoint` methods (the latter from the AzureQstor package). The warning about an unrecognised endpoint can be ignored. See the linked pages, and the examples below, for details on how to authenticate with the emulator.
2121
#'
2222
#' Note that the Azure SDK emulator is no longer being actively developed; it's recommended to use Azurite for development work.
2323
#'

R/sas.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
#' [blob_endpoint], [file_endpoint],
4040
#' [Date], [POSIXt]
4141
#'
42-
#' [Azure Storage Provider API reference](https://docs.microsoft.com/en-us/rest/api/storagerp/),
43-
#' [Azure Storage Services API reference](https://docs.microsoft.com/en-us/rest/api/storageservices/)
42+
#' [Azure Storage Provider API reference](https://learn.microsoft.com/en-us/rest/api/storagerp/),
43+
#' [Azure Storage Services API reference](https://learn.microsoft.com/en-us/rest/api/storageservices/)
4444
#'
45-
#' [Create an account SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/create-account-sas),
46-
#' [Create a user delegation SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas),
47-
#' [Create a service SAS](https://docs.microsoft.com/en-us/rest/api/storageservices/create-service-sas)
45+
#' [Create an account SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-account-sas),
46+
#' [Create a user delegation SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas),
47+
#' [Create a service SAS](https://learn.microsoft.com/en-us/rest/api/storageservices/create-service-sas)
4848
#'
4949
#' @examples
5050
#' # account SAS valid for 7 days

0 commit comments

Comments
 (0)