Skip to content

chore(deps): Bump the azure group with 4 updates #18773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neuronull merged 3 commits into from
Oct 18, 2023
Merged

chore(deps): Bump the azure group with 4 updates #18773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fcede7
chore(deps): Bump the azure group with 4 updates
dependabot[bot] Oct 18, 2023
4143666
updates from API
neuronull Oct 18, 2023
1ef6261
update licenses
neuronull Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 25 additions & 30 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ aws-smithy-http-tower = { git = "https://github.com/vectordotdev/aws-sdk-rust",
aws-smithy-types = { git = "https://github.com/vectordotdev/aws-sdk-rust", rev = "3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670", default-features = false, optional = true }

# Azure
azure_core = { version = "0.15", default-features = false, features = ["enable_reqwest"], optional = true }
azure_identity = { version = "0.15", default-features = false, features = ["enable_reqwest"], optional = true }
azure_storage = { version = "0.15", default-features = false, optional = true }
azure_storage_blobs = { version = "0.15", default-features = false, optional = true }
azure_core = { version = "0.16", default-features = false, features = ["enable_reqwest"], optional = true }
azure_identity = { version = "0.16", default-features = false, features = ["enable_reqwest"], optional = true }
azure_storage = { version = "0.16", default-features = false, optional = true }
azure_storage_blobs = { version = "0.16", default-features = false, optional = true }

# OpenDAL
opendal = {version = "0.38", default-features = false, features = ["native-tls", "services-webhdfs"], optional = true}
Expand Down Expand Up @@ -354,10 +354,10 @@ openssl-src = { version = "300", default-features = false, features = ["force-en
[dev-dependencies]
approx = "0.5.1"
assert_cmd = { version = "2.0.12", default-features = false }
azure_core = { version = "0.15", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
azure_identity = { version = "0.15", default-features = false, features = ["enable_reqwest"] }
azure_storage_blobs = { version = "0.15", default-features = false, features = ["azurite_workaround"] }
azure_storage = { version = "0.15", default-features = false }
azure_core = { version = "0.16", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
azure_identity = { version = "0.16", default-features = false, features = ["enable_reqwest"] }
azure_storage_blobs = { version = "0.16", default-features = false, features = ["azurite_workaround"] }
azure_storage = { version = "0.16", default-features = false }
base64 = "0.21.4"
criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] }
Expand Down
4 changes: 2 additions & 2 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ community-id,https://github.com/traceflight/rs-community-id,MIT OR Apache-2.0,Ju
concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,"Stjepan Glavina <stjepang@gmail.com>, Taiki Endo <te316e89@gmail.com>, John Nunley <jtnunley01@gmail.com>"
const-oid,https://github.com/RustCrypto/formats/tree/master/const-oid,Apache-2.0 OR MIT,RustCrypto Developers
const_fn,https://github.com/taiki-e/const_fn,Apache-2.0 OR MIT,The const_fn Authors
convert_case,https://github.com/rutrum/convert-case,MIT,David Purdum <purdum41@gmail.com>
convert_case,https://github.com/rutrum/convert-case,MIT,Rutrum <dave@rutrum.net>
cookie-factory,https://github.com/rust-bakery/cookie-factory,MIT,"Geoffroy Couprie <geo.couprie@gmail.com>, Pierre Chifflier <chifflier@wzdftpd.net>"
Expand Down Expand Up @@ -206,8 +207,6 @@ fallible-iterator,https://github.com/sfackler/rust-fallible-iterator,MIT OR Apac
fastrand,https://github.com/smol-rs/fastrand,Apache-2.0 OR MIT,Stjepan Glavina <stjepang@gmail.com>
fiat-crypto,https://github.com/mit-plv/fiat-crypto,MIT OR Apache-2.0 OR BSD-1-Clause,Fiat Crypto library authors <jgross@mit.edu>
filetime,https://github.com/alexcrichton/filetime,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
fix-hidden-lifetime-bug,https://github.com/danielhenrymantilla/fix-hidden-lifetime-bug.rs,Zlib OR MIT OR Apache-2.0,Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>
fix-hidden-lifetime-bug-proc_macros,https://github.com/danielhenrymantilla/fix-hidden-lifetime-bug.rs,Zlib OR MIT OR Apache-2.0,Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>
flagset,https://github.com/enarx/flagset,Apache-2.0,Nathaniel McCallum <nathaniel@profian.com>
flate2,https://github.com/rust-lang/flate2-rs,MIT OR Apache-2.0,"Alex Crichton <alex@alexcrichton.com>, Josh Triplett <josh@joshtriplett.org>"
float_eq,https://github.com/jtempest/float_eq-rs,MIT OR Apache-2.0,jtempest
Expand Down Expand Up @@ -588,6 +587,7 @@ twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding <jake.gouldi
typed-builder,https://github.com/idanarye/rust-typed-builder,MIT OR Apache-2.0,"IdanArye <idanarye@gmail.com>, Chris Morgan <me@chrismorgan.info>"
typenum,https://github.com/paholg/typenum,MIT OR Apache-2.0,"Paho Lurie-Gregg <paho@paholg.com>, Andre Bogus <bogusandre@gmail.com>"
typetag,https://github.com/dtolnay/typetag,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
tz-rs,https://github.com/x-hgg-x/tz-rs,MIT OR Apache-2.0,x-hgg-x
uaparser,https://github.com/davidarmstronglewis/uap-rs,MIT,David Lewis
ucd-trie,https://github.com/BurntSushi/ucd-generate,MIT OR Apache-2.0,Andrew Gallant <jamslam@gmail.com>
unarray,https://github.com/cameron1024/unarray,MIT OR Apache-2.0,The unarray Authors
Expand Down
20 changes: 11 additions & 9 deletions src/sinks/azure_common/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,12 @@ pub fn build_client(
// that account_name is not required to exist in the connection_string since
// account_name is only used with the default CloudLocation in the Azure SDK to
// generate the storage API endpoint
Some(uri) => ClientBuilder::with_location(CloudLocation::Custom {
uri: uri.to_string(),
credentials: connection_string.storage_credentials()?,
}),
Some(uri) => ClientBuilder::with_location(
CloudLocation::Custom {
uri: uri.to_string(),
},
connection_string.storage_credentials()?,
),
// Without a valid blob_endpoint in the connection_string, assume we are in Azure
// Commercial (AzureCloud location) and create a default Blob Storage Client that
// builds the API endpoint location using the account_name as input
Expand All @@ -160,15 +162,15 @@ pub fn build_client(
(None, Some(storage_account_p)) => {
let creds = std::sync::Arc::new(DefaultAzureCredential::default());
let auto_creds = std::sync::Arc::new(AutoRefreshingTokenCredential::new(creds));
let storage_credentials = StorageCredentials::TokenCredential(auto_creds);
let storage_credentials = StorageCredentials::token_credential(auto_creds);

client = match endpoint {
// If a blob_endpoint is provided in the configuration, use it with a Custom
// CloudLocation, to allow overriding the blob storage API endpoint
Some(endpoint) => ClientBuilder::with_location(CloudLocation::Custom {
uri: endpoint,
credentials: storage_credentials,
}),
Some(endpoint) => ClientBuilder::with_location(
CloudLocation::Custom { uri: endpoint },
storage_credentials,
),
// Use the storage_account configuration parameter and assume we are in Azure
// Commercial (AzureCloud location) and build the blob storage API endpoint using
// the storage_account as input.
Expand Down