This is an automated email from the ASF dual-hosted git repository. asukaminato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/opendal.git
The following commit(s) were added to refs/heads/main by this push: new 9943495db chore(deps): bump the http-serialization-utils group in /core with 6 updates (#6414) 9943495db is described below commit 9943495dbc599ccec0133ac9f9ad019223c3a035 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 15 20:36:35 2025 +0900 chore(deps): bump the http-serialization-utils group in /core with 6 updates (#6414) * chore(deps): bump the http-serialization-utils group Bumps the http-serialization-utils group in /core with 6 updates: | Package | From | To | | --- | --- | --- | | [backon](https://github.com/Xuanwo/backon) | `1.5.0` | `1.5.1` | | [quick-xml](https://github.com/tafia/quick-xml) | `0.37.5` | `0.38.0` | | [reqwest](https://github.com/seanmonstar/reqwest) | `0.12.15` | `0.12.22` | | [uuid](https://github.com/uuid-rs/uuid) | `1.16.0` | `1.17.0` | | [reqsign](https://github.com/Xuanwo/reqsign) | `0.16.3` | `0.16.5` | | [prometheus](https://github.com/tikv/rust-prometheus) | `0.13.4` | `0.14.0` | Updates `backon` from 1.5.0 to 1.5.1 - [Release notes](https://github.com/Xuanwo/backon/releases) - [Commits](https://github.com/Xuanwo/backon/compare/v1.5.0...v1.5.1) Updates `quick-xml` from 0.37.5 to 0.38.0 - [Release notes](https://github.com/tafia/quick-xml/releases) - [Changelog](https://github.com/tafia/quick-xml/blob/master/Changelog.md) - [Commits](https://github.com/tafia/quick-xml/compare/v0.37.5...v0.38.0) Updates `reqwest` from 0.12.15 to 0.12.22 - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.15...v0.12.22) Updates `uuid` from 1.16.0 to 1.17.0 - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/v1.16.0...v1.17.0) Updates `reqsign` from 0.16.3 to 0.16.5 - [Release notes](https://github.com/Xuanwo/reqsign/releases) - [Commits](https://github.com/Xuanwo/reqsign/compare/v0.16.3...v0.16.5) Updates `prometheus` from 0.13.4 to 0.14.0 - [Changelog](https://github.com/tikv/rust-prometheus/blob/master/CHANGELOG.md) - [Commits](https://github.com/tikv/rust-prometheus/compare/v0.13.4...v0.14.0) --- updated-dependencies: - dependency-name: backon dependency-version: 1.5.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: http-serialization-utils - dependency-name: quick-xml dependency-version: 0.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: http-serialization-utils - dependency-name: reqwest dependency-version: 0.12.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: http-serialization-utils - dependency-name: uuid dependency-version: 1.17.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: http-serialization-utils - dependency-name: reqsign dependency-version: 0.16.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: http-serialization-utils - dependency-name: prometheus dependency-version: 0.14.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: http-serialization-utils ... Signed-off-by: dependabot[bot] <supp...@github.com> * trim * trim all --------- Signed-off-by: dependabot[bot] <supp...@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Asuka Minato <i...@asukaminato.eu.org> --- core/Cargo.lock | 139 +++++++++++++++++++++++++++-------------- core/Cargo.toml | 12 ++-- core/src/services/oss/error.rs | 11 ++-- 3 files changed, 105 insertions(+), 57 deletions(-) diff --git a/core/Cargo.lock b/core/Cargo.lock index 67abeceb7..c33f067ac 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -1129,9 +1129,9 @@ dependencies = [ [[package]] name = "backon" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0b50b1b78dbadd44ab18b3c794e496f3a139abb9fbc27d9c94c4eebbb96496" +checksum = "302eaff5357a264a2c42f127ecb8bac761cf99749fc3dc95677e2743991f99e7" dependencies = [ "fastrand", "gloo-timers", @@ -3982,13 +3982,16 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710" dependencies = [ + "base64 0.22.1", "bytes", "futures-channel", "futures-util", "http 1.3.1", "http-body 1.0.1", "hyper 1.6.0", + "ipnet", "libc", + "percent-encoding", "pin-project-lite", "socket2", "tokio", @@ -4248,6 +4251,16 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "is-terminal" version = "0.4.16" @@ -5418,10 +5431,10 @@ dependencies = [ "persy", "pretty_assertions", "probe", - "prometheus", + "prometheus 0.14.0", "prometheus-client", "prost 0.13.5", - "quick-xml", + "quick-xml 0.38.0", "rand 0.8.5", "redb", "redis", @@ -6305,22 +6318,21 @@ dependencies = [ [[package]] name = "procfs" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" dependencies = [ "bitflags 2.9.1", "hex", - "lazy_static", "procfs-core", "rustix 0.38.44", ] [[package]] name = "procfs-core" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" dependencies = [ "bitflags 2.9.1", "hex", @@ -6331,6 +6343,20 @@ name = "prometheus" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot 0.12.3", + "thiserror 1.0.69", +] + +[[package]] +name = "prometheus" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a" dependencies = [ "cfg-if", "fnv", @@ -6340,7 +6366,7 @@ dependencies = [ "parking_lot 0.12.3", "procfs", "protobuf", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -6443,9 +6469,23 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.28.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4" +dependencies = [ + "once_cell", + "protobuf-support", + "thiserror 1.0.69", +] + +[[package]] +name = "protobuf-support" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6" +dependencies = [ + "thiserror 1.0.69", +] [[package]] name = "psl-types" @@ -6518,6 +6558,16 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8927b0664f5c5a98265138b7e3f90aa19a6b21353182469ace36d4ac527b7b1b" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quick_cache" version = "0.5.2" @@ -6922,9 +6972,9 @@ dependencies = [ [[package]] name = "reqsign" -version = "0.16.3" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9323c0afb30e54f793f4705b10c890395bccc87c6e6ea62c4e7e82d09a380dc6" +checksum = "43451dbf3590a7590684c25fb8d12ecdcc90ed3ac123433e500447c7d77ed701" dependencies = [ "anyhow", "async-trait", @@ -6940,7 +6990,7 @@ dependencies = [ "log", "once_cell", "percent-encoding", - "quick-xml", + "quick-xml 0.37.5", "rand 0.8.5", "reqwest", "rsa", @@ -6949,13 +6999,14 @@ dependencies = [ "serde_json", "sha1", "sha2", + "tokio", ] [[package]] name = "reqwest" -version = "0.12.15" +version = "0.12.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" +checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" dependencies = [ "base64 0.22.1", "bytes", @@ -6968,17 +7019,13 @@ dependencies = [ "hyper 1.6.0", "hyper-rustls 0.27.5", "hyper-util", - "ipnet", "js-sys", "log", - "mime", "mime_guess", - "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls 0.23.27", - "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", @@ -6988,14 +7035,14 @@ dependencies = [ "tokio-rustls 0.26.2", "tokio-util", "tower 0.5.2", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.11", - "windows-registry", + "webpki-roots 1.0.0", ] [[package]] @@ -8599,7 +8646,7 @@ dependencies = [ "lazy_static", "log", "pin-project", - "prometheus", + "prometheus 0.13.4", "prost 0.12.6", "rand 0.8.5", "regex", @@ -8966,6 +9013,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags 2.9.1", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "iri-string", + "pin-project-lite", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -9282,9 +9347,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" dependencies = [ "getrandom 0.3.3", "js-sys", @@ -9699,7 +9764,7 @@ dependencies = [ "windows-interface 0.59.1", "windows-link", "windows-result 0.3.4", - "windows-strings 0.4.2", + "windows-strings", ] [[package]] @@ -9773,17 +9838,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-registry" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" -dependencies = [ - "windows-result 0.3.4", - "windows-strings 0.3.1", - "windows-targets 0.53.0", -] - [[package]] name = "windows-result" version = "0.1.2" @@ -9802,15 +9856,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-strings" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-strings" version = "0.4.2" diff --git a/core/Cargo.toml b/core/Cargo.toml index 559d7001c..494acb158 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -239,7 +239,7 @@ required-features = ["tests"] [dependencies] # Required dependencies anyhow = { version = "1.0.30", features = ["std"] } -backon = { version = "1.2", features = ["tokio-sleep"] } +backon = { version = "1.5", features = ["tokio-sleep"] } base64 = "0.22" bytes = "1.6" chrono = { version = "0.4.28", default-features = false, features = [ @@ -255,8 +255,8 @@ http-body = "1" log = "0.4" md-5 = "0.10" percent-encoding = "2" -quick-xml = { version = "0.37", features = ["serialize", "overlapped-lists"] } -reqwest = { version = "0.12.8", features = [ +quick-xml = { version = "0.38", features = ["serialize", "overlapped-lists"] } +reqwest = { version = "0.12.22", features = [ "stream", ], default-features = false } serde = { version = "1", features = ["derive"] } @@ -281,7 +281,7 @@ sqlx = { version = "0.8.0", features = [ ], optional = true } # For http based services. -reqsign = { version = "0.16.3", default-features = false, optional = true } +reqsign = { version = "0.16.5", default-features = false, optional = true } # for self-referencing structs ouroboros = { version = "0.18.4", optional = true } @@ -396,7 +396,7 @@ fastrace = { version = "0.7.1", optional = true } # for layers-opentelemetry opentelemetry = { version = "0.30.0", optional = true } # for layers-prometheus -prometheus = { version = "0.13", features = ["process"], optional = true } +prometheus = { version = "0.14", features = ["process"], optional = true } # for layers-prometheus-client prometheus-client = { version = "0.23.1", optional = true } # for fastmetrics @@ -410,7 +410,7 @@ probe = { version = "0.5.1", optional = true } backon = { version = "1.2", features = ["gloo-timers-sleep"] } getrandom = { version = "0.2", features = ["js"] } tokio = { version = "1.46", features = ["time"] } -uuid = { version = "1.14", features = ["serde", "v4", "js"] } +uuid = { version = "1.17", features = ["serde", "v4", "js"] } [dev-dependencies] criterion = { version = "0.5", features = ["async", "async_tokio"] } diff --git a/core/src/services/oss/error.rs b/core/src/services/oss/error.rs index 9173d5026..7ca0fdde9 100644 --- a/core/src/services/oss/error.rs +++ b/core/src/services/oss/error.rs @@ -98,9 +98,12 @@ mod tests { let out: OssError = de::from_reader(bs.reader()).expect("must success"); println!("{out:?}"); - assert_eq!(out.code, "AccessDenied"); - assert_eq!(out.message, "Query-string authentication requires the Signature, Expires and OSSAccessKeyId parameters"); - assert_eq!(out.request_id, "1D842BC54255****"); - assert_eq!(out.host_id, "oss-cn-hangzhou.aliyuncs.com"); + assert_eq!(out.code.trim(), "AccessDenied"); + assert_eq!( + out.message.trim(), + "Query-string authentication requires the Signature, Expires and OSSAccessKeyId parameters" + ); + assert_eq!(out.request_id.trim(), "1D842BC54255****"); + assert_eq!(out.host_id.trim(), "oss-cn-hangzhou.aliyuncs.com"); } }