Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
154 changes: 111 additions & 43 deletions Cargo.lock

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

22 changes: 14 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,16 @@ aws-smithy-runtime-api = { version = "1.7.3", default-features = false, optional
aws-smithy-types = { version = "1.2.11", default-features = false, features = ["rt-tokio"], optional = true }

# Azure
azure_core = { version = "0.17", default-features = false, features = ["enable_reqwest"], optional = true }
azure_identity = { version = "0.17", default-features = false, features = ["enable_reqwest"], optional = true }
azure_storage = { version = "0.17", default-features = false, optional = true }
azure_storage_blobs = { version = "0.17", default-features = false, optional = true }
azure_core = { version = "0.25", default-features = false, features = ["reqwest", "hmac_openssl"], optional = true }
azure_identity = { version = "0.25", default-features = false, features = ["reqwest"], optional = true }

# Azure Storage
azure_storage = { version = "0.21", default-features = false, optional = true }
azure_storage_blobs = { version = "0.21", default-features = false, optional = true }

# Needed to bridge with outdated version of azure_core used in azure_storage*
azure_core_for_storage = { package = "azure_core", version = "0.21.0", default-features = false, features = ["reqwest", "hmac_openssl"] }


# OpenDAL
opendal = { version = "0.53", default-features = false, features = ["services-webhdfs"], optional = true }
Expand Down Expand Up @@ -432,10 +438,10 @@ openssl-src = { version = "300", default-features = false, features = ["force-en
approx = "0.5.1"
assert_cmd = { version = "2.0.17", default-features = false }
aws-smithy-runtime = { version = "1.8.3", default-features = false, features = ["tls-rustls"] }
azure_core = { version = "0.17", default-features = false, features = ["enable_reqwest", "azurite_workaround"] }
azure_identity = { version = "0.17", default-features = false, features = ["enable_reqwest"] }
azure_storage_blobs = { version = "0.17", default-features = false, features = ["azurite_workaround"] }
azure_storage = { version = "0.17", default-features = false }
azure_core = { version = "0.25", default-features = false, features = ["reqwest", "hmac_openssl", "azurite_workaround"] }
azure_identity = { version = "0.25", default-features = false, features = ["reqwest"] }
azure_storage_blobs = { version = "0.21", default-features = false, features = ["enable_reqwest", "hmac_openssl", "azurite_workaround"] }
azure_storage = { version = "0.21", default-features = false, features = ["enable_reqwest", "hmac_openssl"] }
base64 = "0.22.1"
criterion = { version = "0.6.0", features = ["html_reports", "async_tokio"] }
itertools = { version = "0.14.0", default-features = false, features = ["use_alloc"] }
Expand Down
10 changes: 7 additions & 3 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,12 @@ aws-smithy-xml,https://github.com/smithy-lang/smithy-rs,Apache-2.0,"AWS Rust SDK
aws-types,https://github.com/smithy-lang/smithy-rs,Apache-2.0,"AWS Rust SDK Team <[email protected]>, Russell Cohen <[email protected]>"
axum,https://github.com/tokio-rs/axum,MIT,The axum Authors
axum-core,https://github.com/tokio-rs/axum,MIT,The axum-core Authors
azure_core,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
azure_core,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
azure_identity,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
azure_identity,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
azure_storage,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
azure_storage_blobs,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft Corp.
azure_svc_blobstorage,https://github.com/azure/azure-sdk-for-rust,MIT,The azure_svc_blobstorage Authors
backoff,https://github.com/ihrwein/backoff,MIT OR Apache-2.0,Tibor Benke <[email protected]>
backon,https://github.com/Xuanwo/backon,Apache-2.0,The backon Authors
backtrace,https://github.com/rust-lang/backtrace-rs,MIT OR Apache-2.0,The Rust Project Developers
Expand Down Expand Up @@ -144,7 +146,6 @@ community-id,https://github.com/traceflight/rs-community-id,MIT OR Apache-2.0,Ju
compact_str,https://github.com/ParkMyCar/compact_str,MIT,Parker Timmerman <[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,https://github.com/SergioBenitez/cookie-rs,MIT OR Apache-2.0,"Sergio Benitez <[email protected]>, Alex Crichton <[email protected]>"
Expand Down Expand Up @@ -549,6 +550,7 @@ rust_decimal,https://github.com/paupino/rust-decimal,MIT,Paul Mason <paul@form1.
rustc-demangle,https://github.com/alexcrichton/rustc-demangle,MIT OR Apache-2.0,Alex Crichton <[email protected]>
rustc-hash,https://github.com/rust-lang/rustc-hash,Apache-2.0 OR MIT,The Rust Project Developers
rustc_version,https://github.com/Kimundi/rustc-version-rs,MIT OR Apache-2.0,Marvin Löbel <[email protected]>
rustc_version,https://github.com/djc/rustc-version-rs,MIT OR Apache-2.0,The rustc_version Authors
rustc_version_runtime,https://github.com/seppo0010/rustc-version-runtime-rs,MIT,Sebastian Waisbrot <[email protected]>
rustix,https://github.com/bytecodealliance/rustix,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,"Dan Gohman <[email protected]>, Jakub Konka <[email protected]>"
rustls,https://github.com/rustls/rustls,Apache-2.0 OR ISC OR MIT,The rustls Authors
Expand Down Expand Up @@ -683,8 +685,10 @@ tungstenite,https://github.com/snapview/tungstenite-rs,MIT OR Apache-2.0,"Alexey
twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding <[email protected]>
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]>"
typespec,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
typespec_client_core,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
typespec_macros,https://github.com/azure/azure-sdk-for-rust,MIT,Microsoft
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
ua-parser,https://github.com/ua-parser/uap-rust,Apache-2.0,The ua-parser Authors
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
5 changes: 3 additions & 2 deletions src/sinks/azure_blob/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use std::{
num::NonZeroU32,
};

use azure_core::{error::HttpError, prelude::Range};
use azure_core::error::HttpError;
use azure_core_for_storage::prelude::Range;
use azure_storage_blobs::prelude::*;
use bytes::{Buf, BytesMut};
use flate2::read::GzDecoder;
Expand Down Expand Up @@ -347,7 +348,7 @@ impl AzureBlobSinkConfig {
Ok(StatusCode::CONFLICT) => Ok(()),
_ => Err(format!("Unexpected status code {}", err.status())),
},
_ => Err(format!("Unexpected error {}", reason)),
_ => Err(format!("Unexpected error {:#?}", reason)),
},
};

Expand Down
Loading
Loading