update azure blob upload support to use azure_storage_blob (#762)

Author: demoray

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "avml"
-version = "0.17.0"
+version = "0.18.0"
 license = "MIT"
 description = "A portable volatile memory acquisition tool"
 authors = ["avml@microsoft.com"]
@@ -15,11 +15,12 @@ rust-version = "1.88.0"
 [features]
 default = ["put", "blobstore", "native-tls"]
 put = ["dep:reqwest", "reqwest?/stream", "dep:url", "dep:tokio", "dep:tokio-util"]
-blobstore = ["dep:url", "dep:azure_core", "dep:azure_storage_blobs", "dep:tokio", "dep:tokio-util", "dep:async-channel"]
+blobstore = ["dep:url", "dep:azure_core", "dep:azure_storage_blob", "dep:tokio", "dep:async-trait"]
 status = ["dep:indicatif"]
-native-tls = ["dep:native-tls"]
+native-tls = ["dep:native-tls", "azure_core?/reqwest", "reqwest?/native-tls-vendored"]
 
 [dependencies]
+async-trait = {version="0.1", optional=true}
 byteorder = "1.5"
 bytes = "1.11"
 clap = {version="4.6", default-features=false, features=["derive", "std", "usage", "error-context", "help"]}
@@ -30,9 +31,8 @@ snap = "1.1"
 thiserror = "2.0"
 libc = "0.2"
 
-async-channel = {version="2.5", optional=true}
-azure_core = {version="0.21", optional=true, default-features=false}
-azure_storage_blobs = {version="0.21", optional=true, default-features=false}
+azure_core = {version="0.35", optional=true, default-features=false, features=["reqwest", "tokio"]}
+azure_storage_blob = {version="0.12", optional=true, default-features=false, features=["tokio"]}
 indicatif = {version="0.18", optional=true, default-features=false}
 native-tls = {version="0.2", features=["vendored"], optional=true, default-features=false}
 reqwest = {version="0.13", optional=true, default-features=false}

Cargo.toml

@@ -140,12 +140,10 @@ Options:
           upload via Azure Blob Store upon acquisition
 
       --sas-block-size <SAS_BLOCK_SIZE>
-          specify maximum block size in MiB
+          specify maximum block size in MiB; must be greater than 0
 
       --sas-block-concurrency <SAS_BLOCK_CONCURRENCY>
-          specify blob upload concurrency
-
-          [default: 10]
+          specify blob upload concurrency; must be greater than 0
 
   -h, --help
           Print help (see a summary with '-h')

README.md

@@ -11,6 +11,7 @@ cd $(dirname ${BASH_SOURCE[0]})/../
 ARCH=$(uname -m)
 
 cargo +stable test --release --target ${ARCH}-unknown-linux-musl --locked --all-targets --all-features
+cargo +stable test --release --target ${ARCH}-unknown-linux-musl --locked --doc --all-features
 for FEATURE in $(cargo metadata --locked --format-version 1 | jq '.packages | [.[] | select(.name=="avml")][0].features | keys | @tsv' -r); do
     cargo +stable check --release --target ${ARCH}-unknown-linux-musl --locked --no-default-features --features ${FEATURE} --features native-tls
 done

eng/build.sh

@@ -7,9 +7,12 @@
 #![deny(clippy::manual_assert)]
 #![deny(clippy::indexing_slicing)]
 
-use avml::{BlobUploader, DEFAULT_CONCURRENCY, Error, Result, put};
+use avml::{BlobUploader, Error, Result, put};
 use clap::{Parser, Subcommand};
-use std::path::PathBuf;
+use std::{
+    num::{NonZeroU64, NonZeroUsize},
+    path::PathBuf,
+};
 use tokio::runtime::Runtime;
 use url::Url;
 
@@ -37,13 +40,13 @@ enum Commands {
         /// url to upload via Azure Blob Storage
         url: Url,
 
-        /// specify blob upload concurrency
-        #[arg(long, default_value_t=DEFAULT_CONCURRENCY)]
-        sas_block_concurrency: usize,
+        /// specify blob upload concurrency; must be greater than 0
+        #[arg(long)]
+        sas_block_concurrency: Option<NonZeroUsize>,
 
-        /// specify maximum block size in MiB
+        /// specify maximum block size in MiB; must be greater than 0
         #[arg(long)]
-        sas_block_size: Option<usize>,
+        sas_block_size: Option<NonZeroU64>,
     },
 }
 

src/bin/avml-upload.rs

@@ -11,6 +11,8 @@
 use avml::Error;
 use avml::{Result, Snapshot, Source, iomem};
 use clap::Parser;
+#[cfg(feature = "blobstore")]
+use std::num::NonZeroUsize;
 use std::{num::NonZeroU64, ops::Range, path::PathBuf};
 #[cfg(any(feature = "blobstore", feature = "put"))]
 use tokio::{fs::remove_file, runtime::Runtime};
@@ -52,15 +54,15 @@ struct Config {
     #[arg(long)]
     sas_url: Option<Url>,
 
-    /// specify maximum block size in MiB
+    /// specify maximum block size in MiB; must be greater than 0
     #[cfg(feature = "blobstore")]
     #[arg(long)]
-    sas_block_size: Option<usize>,
+    sas_block_size: Option<NonZeroU64>,
 
-    /// specify blob upload concurrency
+    /// specify blob upload concurrency; must be greater than 0
     #[cfg(feature = "blobstore")]
-    #[arg(long, default_value_t=avml::DEFAULT_CONCURRENCY)]
-    sas_block_concurrency: usize,
+    #[arg(long)]
+    sas_block_concurrency: Option<NonZeroUsize>,
 
     /// name of the file to write to on local system
     filename: PathBuf,