diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml index d2dfb7e..87d0802 100644 --- a/.github/workflows/check-standard.yaml +++ b/.github/workflows/check-standard.yaml @@ -6,7 +6,7 @@ name: R-CMD-check jobs: R-CMD-check: - if: github.repository_owner == 'Azure' + if: github.repository_owner == 'AzureRSDK' runs-on: ${{ matrix.config.os }} name: ${{ matrix.config.os }} (${{ matrix.config.r }}) @@ -34,7 +34,7 @@ jobs: token: "${{ secrets.ghPat }}" # git config hack required, see https://stackoverflow.com/q/64270867/474349 run: | - export CLOUDYR_REPO=$(echo $GITHUB_REPOSITORY | sed "s/Azure/cloudyr/") + export CLOUDYR_REPO=$(echo $GITHUB_REPOSITORY | sed "s/AzureRSDK/cloudyr/") git config -l | grep 'http\..*\.extraheader' | cut -d= -f1 | \ xargs -L1 git config --unset-all git push --prune https://token:$token@github.com/${CLOUDYR_REPO}.git +refs/remotes/origin/*:refs/heads/* +refs/tags/*:refs/tags/* diff --git a/DESCRIPTION b/DESCRIPTION index e5683c9..6d547cd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,14 +1,14 @@ Package: AzureStor Title: Storage Management in 'Azure' -Version: 3.3.0 +Version: 3.3.0.9000 Authors@R: c( person("Hong", "Ooi", , "hongooi73@gmail.com", role = c("aut", "cre")), person("Microsoft", role="cph") ) Description: Manage storage in Microsoft's 'Azure' cloud: . 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. License: MIT + file LICENSE -URL: https://github.com/Azure/AzureStor https://github.com/Azure/AzureR -BugReports: https://github.com/Azure/AzureStor/issues +URL: https://github.com/AzureRSDK/AzureStor https://github.com/AzureRSDK/AzureR +BugReports: https://github.com/AzureRSDK/AzureStor/issues VignetteBuilder: knitr Depends: R (>= 3.3), diff --git a/NEWS.md b/NEWS.md index f046725..04cfab2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,10 +1,13 @@ +# AzureStor 3.3.0.9000 + +- Transfer to AzureRSDK org on GitHub. + # AzureStor 3.3.0 - ADLS, file and block blob uploads gain the option to compute and store the MD5 hash of the uploaded file, via the `put_md5` argument to `upload_adls_file`, `upload_azure_file` and `upload_blob`. - Similarly, downloads gain the option to verify the integrity of the downloaded file using the MD5 hash, via the `check_md5` argument to `download_adls_file`, `download_azure_file` and `download_blob`. This requires that the file's `Content-MD5` property is set. - Add support for uploading to [append blobs](https://docs.microsoft.com/en-us/rest/api/storageservices/understanding-block-blobs--append-blobs--and-page-blobs), which are a type of blob optimized for append operations. They are useful for data that is constantly growing, but should not be modified once written, such as server logs. See `?upload_blob` for more details. -- Add support for the [Azurite](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite) and [Azure SDK](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator) storage emulators. To connect to the endpoint, use the service-specific functions `blob_endpoint` and `queue_endpoint` (the latter from the AzureQstor package), passing the full URL including the account name: `blob_endpoint("http://127.0.0.1:10000/myaccount", key="mykey")`. The warning about an unrecognised endpoint can be ignored. See the linked pages for full details on how to authenticate to the emulator. - +- Add support for the [Azurite](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite) and [Azure SDK](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator) storage emulators. To connect to the endpoint, use the service-specific functions `blob_endpoint` and `queue_endpoint` (the latter from the AzureQstor package), passing the full URL including the account name: `blob_endpoint("http://127.0.0.1:10000/myaccount", key="mykey")`. The warning about an unrecognised endpoint can be ignored. See the linked pages for full details on how to authenticate to the emulator.
Note that the Azure SDK emulator is no longer being actively developed; it's recommended to use Azurite. - Add a 10-second fuzz factor to the default starting datetime for a generated SAS, to allow for differences in clocks. - More fixes to the directory handling of `list_blobs()`. diff --git a/README.md b/README.md index eaa75ad..9c996e9 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ [![CRAN](https://www.r-pkg.org/badges/version/AzureStor)](https://cran.r-project.org/package=AzureStor) ![Downloads](https://cranlogs.r-pkg.org/badges/AzureStor) -![R-CMD-check](https://github.com/Azure/AzureStor/workflows/R-CMD-check/badge.svg) +![R-CMD-check](https://github.com/AzureRSDK/AzureStor/workflows/R-CMD-check/badge.svg) -This package implements both an admin- and client-side interface to [Azure Storage Services](https://docs.microsoft.com/en-us/rest/api/storageservices/). The admin interface uses R6 classes and extends the framework provided by [AzureRMR](https://github.com/Azure/AzureRMR). The client interface provides several S3 methods for efficiently managing storage and performing file transfers. +This package implements both an admin- and client-side interface to [Azure Storage Services](https://docs.microsoft.com/en-us/rest/api/storageservices/). The admin interface uses R6 classes and extends the framework provided by [AzureRMR](https://github.com/AzureRSDK/AzureRMR). The client interface provides several S3 methods for efficiently managing storage and performing file transfers. -The primary repo for this package is at https://github.com/Azure/AzureStor; please submit issues and PRs there. It is also mirrored at the Cloudyr org at https://github.com/cloudyr/AzureStor. You can install the development version of the package with `devtools::install_github("Azure/AzureStor")`. +The primary repo for this package is at https://github.com/AzureRSDK/AzureStor; please submit issues and PRs there. It is also mirrored at the Cloudyr org at https://github.com/cloudyr/AzureStor. You can install the development version of the package with `devtools::install_github("AzureRSDK/AzureStor")`. ## Storage endpoints @@ -207,4 +207,4 @@ blobstor2$delete() ``` --- -

+

diff --git a/tests/testthat/test02_blob.R b/tests/testthat/test02_blob.R index 7a57d6e..315392a 100644 --- a/tests/testthat/test02_blob.R +++ b/tests/testthat/test02_blob.R @@ -287,7 +287,7 @@ test_that("copy from url works", cont <- create_blob_container(bl, "urltransfer") # copy from GitHub repo - src_url <- "https://raw.githubusercontent.com/Azure/AzureStor/master/tests/resources/iris.csv" + src_url <- "https://raw.githubusercontent.com/AzureRSDK/AzureStor/master/tests/resources/iris.csv" orig_file <- "../resources/iris.csv" new_file <- tempfile() diff --git a/tests/testthat/test02a_blobext.R b/tests/testthat/test02a_blobext.R index 6dbafd1..5d5101a 100644 --- a/tests/testthat/test02a_blobext.R +++ b/tests/testthat/test02a_blobext.R @@ -127,7 +127,7 @@ test_that("Blob multicopy from URL works", cont <- create_blob_container(bl, contname) fnames <- c("LICENSE", "DESCRIPTION", "NAMESPACE") - src_urls <- paste0("https://raw.githubusercontent.com/Azure/AzureStor/master/", fnames) + src_urls <- paste0("https://raw.githubusercontent.com/AzureRSDK/AzureStor/master/", fnames) origs <- replicate(3, tempfile()) dests <- replicate(3, tempfile()) diff --git a/tests/testthat/test05_generics.R b/tests/testthat/test05_generics.R index ba5ae0d..d5cda5c 100644 --- a/tests/testthat/test05_generics.R +++ b/tests/testthat/test05_generics.R @@ -165,7 +165,7 @@ test_that("Blob copy from URL works", cont <- create_blob_container(bl, contname) # copy from GitHub repo - src_url <- "https://raw.githubusercontent.com/Azure/AzureStor/master/tests/resources/iris.csv" + src_url <- "https://raw.githubusercontent.com/AzureRSDK/AzureStor/master/tests/resources/iris.csv" orig_file <- tempfile() new_file <- tempfile() @@ -176,7 +176,7 @@ test_that("Blob copy from URL works", expect_true(files_identical(orig_file, new_file)) fnames <- c("LICENSE", "DESCRIPTION", "NAMESPACE") - src_urls <- paste0("https://raw.githubusercontent.com/Azure/AzureStor/master/", fnames) + src_urls <- paste0("https://raw.githubusercontent.com/AzureRSDK/AzureStor/master/", fnames) origs <- replicate(3, tempfile()) dests <- replicate(3, tempfile())