Skip to content

Commit

Permalink
chore(deps): Bump the azure group with 4 updates (vectordotdev#18773)
Browse files Browse the repository at this point in the history
* chore(deps): Bump the azure group with 4 updates

Bumps the azure group with 4 updates: [azure_core](https://github.com/azure/azure-sdk-for-rust), [azure_identity](https://github.com/azure/azure-sdk-for-rust), [azure_storage](https://github.com/azure/azure-sdk-for-rust) and [azure_storage_blobs](https://github.com/azure/azure-sdk-for-rust).


Updates `azure_core` from 0.15.0 to 0.16.0
- [Release notes](https://github.com/azure/azure-sdk-for-rust/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md)
- [Commits](https://github.com/azure/azure-sdk-for-rust/commits)

Updates `azure_identity` from 0.15.0 to 0.16.2
- [Release notes](https://github.com/azure/azure-sdk-for-rust/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md)
- [Commits](https://github.com/azure/azure-sdk-for-rust/commits)

Updates `azure_storage` from 0.15.0 to 0.16.0
- [Release notes](https://github.com/azure/azure-sdk-for-rust/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md)
- [Commits](https://github.com/azure/azure-sdk-for-rust/commits)

Updates `azure_storage_blobs` from 0.15.0 to 0.16.0
- [Release notes](https://github.com/azure/azure-sdk-for-rust/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-rust/blob/main/HISTORY.md)
- [Commits](https://github.com/azure/azure-sdk-for-rust/commits)

---
updated-dependencies:
- dependency-name: azure_core
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: azure
- dependency-name: azure_identity
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: azure
- dependency-name: azure_storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: azure
- dependency-name: azure_storage_blobs
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: azure
...

Signed-off-by: dependabot[bot] <[email protected]>

* updates from API

* update licenses

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: neuronull <[email protected]>
  • Loading branch information
dependabot[bot] and neuronull authored Oct 18, 2023
1 parent 3ca32b8 commit 0e61acc
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 49 deletions.
55 changes: 25 additions & 30 deletions Cargo.lock

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
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
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 <[email protected]>
concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,"Stjepan Glavina <[email protected]>, Taiki Endo <[email protected]>, John Nunley <[email protected]>"
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 <[email protected]>
convert_case,https://github.com/rutrum/convert-case,MIT,Rutrum <[email protected]>
cookie-factory,https://github.com/rust-bakery/cookie-factory,MIT,"Geoffroy Couprie <[email protected]>, Pierre Chifflier <[email protected]>"
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 <[email protected]>
fiat-crypto,https://github.com/mit-plv/fiat-crypto,MIT OR Apache-2.0 OR BSD-1-Clause,Fiat Crypto library authors <[email protected]>
filetime,https://github.com/alexcrichton/filetime,MIT OR Apache-2.0,Alex Crichton <[email protected]>
fix-hidden-lifetime-bug,https://github.com/danielhenrymantilla/fix-hidden-lifetime-bug.rs,Zlib OR MIT OR Apache-2.0,Daniel Henry-Mantilla <[email protected]>
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 <[email protected]>
flagset,https://github.com/enarx/flagset,Apache-2.0,Nathaniel McCallum <[email protected]>
flate2,https://github.com/rust-lang/flate2-rs,MIT OR Apache-2.0,"Alex Crichton <[email protected]>, Josh Triplett <[email protected]>"
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 <[email protected]>, Chris Morgan <[email protected]>"
typenum,https://github.com/paholg/typenum,MIT OR Apache-2.0,"Paho Lurie-Gregg <[email protected]>, Andre Bogus <[email protected]>"
typetag,https://github.com/dtolnay/typetag,MIT OR Apache-2.0,David Tolnay <[email protected]>
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 <[email protected]>
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
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

0 comments on commit 0e61acc

Please sign in to comment.