topaLE
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

chore(deps): bump opendal from 0.57.0 to 0.58.1 

Update Apache OpenDAL to the latest stable release. Operator::new now
returns a finished Operator, so drop the obsolete finish() calls. Also
recognize skip_signature alongside the deprecated allow_anonymous URI
option when deciding whether to inject the AWS SDK credential chain.
pull/7551/head
Xuanwo 2 months ago
parent
2629bcbe13
commit
45ab505888
No known key found for this signature in database GPG Key ID: 9872165BC0E1683C
3 changed files with 64 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 98
      Cargo.lock
  2. 2
      Cargo.toml
  3. 10
      src/storage.rs

98
Cargo.lock
View File

@ -714,6 +714,12 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "base64"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b25655df2c3cdd83c5e5b293b88acd880332b2ddadd7c30ac43144fdc0033da9"
[[package]]
name = "base64-simd"
version = "0.8.0"
@ -1129,12 +1135,13 @@ dependencies = [
]
[[package]]
name = "crc32c"
version = "0.6.8"
name = "crc-fast"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
checksum = "e75b2483e97a5a7da73ac68a05b629f9c53cff58d8ed1c77866079e18b00dba5"
dependencies = [
"rustc_version",
"digest 0.10.7",
"spin 0.10.1",
]
[[package]]
@ -2943,7 +2950,7 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
dependencies = [
"spin",
"spin 0.9.9",
]
[[package]]
@ -3198,7 +3205,7 @@ dependencies = [
"httparse",
"memchr",
"mime",
"spin",
"spin 0.9.9",
"tokio",
"tokio-util",
"version_check",
@ -3401,9 +3408,9 @@ dependencies = [
[[package]]
name = "opendal"
version = "0.57.0"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c9c85ce253ff87225e7669979d877a20c98a06604ec9d6dd5f4473e08f1ae1"
checksum = "4f20562cc7447fcc915fc5c23df305a412ea80a733c9f2fd9e2d267e2815be6d"
dependencies = [
"opendal-core",
"opendal-service-fs",
@ -3412,24 +3419,22 @@ dependencies = [
[[package]]
name = "opendal-core"
version = "0.57.0"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4f8607c90e2c963a91467f50fb49fbc7fb3d573f88cea219ca59ccd3740b309"
checksum = "ec75551ff4cf3e57da98979f6a937aaa9ddb3915bf68cc17d03df733be6646ed"
dependencies = [
"anyhow",
"base64 0.22.1",
"base64 0.23.0",
"bytes",
"futures",
"http 1.4.2",
"http-body 1.1.0",
"jiff",
"log",
"md-5",
"mea",
"percent-encoding",
"quick-xml 0.39.4",
"quick-xml",
"reqsign-core",
"reqwest",
"serde",
"serde_json",
"tokio",
@ -3440,9 +3445,9 @@ dependencies = [
[[package]]
name = "opendal-service-fs"
version = "0.57.0"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22e89a665fef0e6bd249cf5ea47fc174b7ba892159bee4b9382528b1ca873a2c"
checksum = "826c4e17a30643b888fe983897f9a4b23b07066e1d069727a923cc8fb419a702"
dependencies = [
"bytes",
"log",
@ -3454,18 +3459,18 @@ dependencies = [
[[package]]
name = "opendal-service-s3"
version = "0.57.0"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "313d46c9f5ae70bca26b7c3e3fbb9b639292625f28af73aa016f47e788af9deb"
checksum = "58e80cdf192d7eff05feed747894d64f81905ac4eaf132edf7ea270abdd2d663"
dependencies = [
"base64 0.22.1",
"base64 0.23.0",
"bytes",
"crc32c",
"crc-fast",
"http 1.4.2",
"log",
"md-5",
"opendal-core",
"quick-xml 0.39.4",
"quick-xml",
"reqsign-aws-v4",
"reqsign-core",
"reqsign-file-read-tokio",
@ -4007,16 +4012,6 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
version = "0.39.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
dependencies = [
"memchr",
"serde",
]
[[package]]
name = "quick-xml"
version = "0.41.0"
@ -4226,19 +4221,18 @@ dependencies = [
]
[[package]]
name = "reqsign-aws-v4"
version = "3.0.2"
name = "reqsign-aws-core"
version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e9e1168fab3883ec6afed1c2e20c25b2a09f366cdb662ac3e0878ae0332d63e"
checksum = "e4af084e1f3cbf3e67e0c972765399bce54ecec804cceba46b39a8331f3c1bff"
dependencies = [
"anyhow",
"bytes",
"form_urlencoded",
"hex",
"http 1.4.2",
"log",
"percent-encoding",
"quick-xml 0.41.0",
"quick-xml",
"reqsign-core",
"rust-ini",
"serde",
@ -4248,15 +4242,29 @@ dependencies = [
]
[[package]]
name = "reqsign-core"
name = "reqsign-aws-v4"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "514a1e0b4aa288652a3fdbda4f0a610f379cdf5374e55a37c9edd03d57ed856b"
checksum = "4ac5b3b7cefa28933792b439186459f77f19f9b6edbeab41b8b187150361a206"
dependencies = [
"bytes",
"http 1.4.2",
"log",
"quick-xml",
"reqsign-aws-core",
"reqsign-core",
"serde",
]
[[package]]
name = "reqsign-core"
version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07dd510b1e1b9b241883e483358147fb2ed2d497a7b39b065ba61eb93deceb0"
dependencies = [
"anyhow",
"base64 0.22.1",
"base64 0.23.0",
"bytes",
"form_urlencoded",
"futures",
"hex",
"hmac 0.13.0",
@ -4271,9 +4279,9 @@ dependencies = [
[[package]]
name = "reqsign-file-read-tokio"
version = "3.0.2"
version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b472a8d1f2e5a4be8ce13bb7bdf4b59e9bee613ce124aca23959ddb42176b39"
checksum = "663d9d55abd0df0830ef0ae43708297cc1371cf4e8ca91f3ac813c309cca8c98"
dependencies = [
"anyhow",
"reqsign-core",
@ -5107,6 +5115,12 @@ version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e"
[[package]]
name = "spin"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
[[package]]
name = "spinning_top"
version = "0.3.0"

2
Cargo.toml
View File

@ -256,7 +256,7 @@ rpassword = "7.5.4"
grass_compiler = { version = "0.13.4", default-features = false }
# File are accessed through Apache OpenDAL
opendal = { version = "0.57.0", default-features = false, features = ["services-fs"] }
opendal = { version = "0.58.1", default-features = false, features = ["services-fs"] }
# For retrieving AWS credentials, including temporary SSO credentials
aws-config = { version = "1.10.0", optional = true, default-features = false, features = [

10
src/storage.rs
View File

@ -67,7 +67,7 @@ pub(crate) fn operator_for_path(path: &str) -> Result<opendal::Operator, crate::
s3::operator_for_path(path)?
} else {
let builder = opendal::services::Fs::default().root(path);
opendal::Operator::new(builder)?.finish()
opendal::Operator::new(builder)?
};
OPERATORS_BY_PATH.insert(path.to_owned(), operator.clone());
@ -236,7 +236,7 @@ mod s3 {
builder.credential_provider_chain(ProvideCredentialChain::new().push(OpenDALS3CredentialProvider));
}
Ok(opendal::Operator::new(builder)?.finish())
Ok(opendal::Operator::new(builder)?)
}
fn uri_has_option(uri: &opendal::OperatorUri, names: &[&str]) -> bool {
@ -250,7 +250,11 @@ mod s3 {
|| config.role_arn.is_some()
|| config.external_id.is_some()
|| config.role_session_name.is_some()
|| uri_has_option(uri, &["allow_anonymous", "disable_config_load", "disable_ec2_metadata"])
// OpenDAL 0.58: allow_anonymous is deprecated in favor of skip_signature.
|| uri_has_option(
uri,
&["skip_signature", "allow_anonymous", "disable_config_load", "disable_ec2_metadata"],
)
}
}

Write Preview
Loading…
Cancel
Save