Skip to content

Commit a8bfa4c

Browse files
committed
Bump opendal to 0.56.0 and fix fallout
- Required bump of reqwest to 0.13.0 - Rename and remove features deprecated in that release - Update `Cargo.lock` file - Remove direct `reqsign` dependency that was not used in the code - Add new opendal-layer-logging dependency that was split out of opendal - Fix fallout in code from `LoggingLayer` split in opendal
1 parent 8825b4a commit a8bfa4c

11 files changed

Lines changed: 960 additions & 239 deletions

File tree

Cargo.lock

Lines changed: 930 additions & 212 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,17 @@ memmap2 = "0.9.4"
8080
mime = "0.3"
8181
number_prefix = "0.4"
8282
object = "0.37"
83-
opendal = { version = "0.55.0", optional = true, default-features = false }
83+
opendal = { version = "0.56.0", optional = true, default-features = false }
84+
opendal-layer-logging = { version = "0.56.0", optional = true }
8485
openssl = { version = "0.10.75", optional = true }
8586
rand = "0.8.4"
8687
regex = "1.10.3"
87-
reqsign = { version = "0.18.0", optional = true }
88-
reqwest = { version = "0.12", features = [
88+
reqwest = { version = "0.13", features = [
8989
"json",
9090
"blocking",
9191
"stream",
92-
"rustls-tls",
93-
"rustls-tls-native-roots",
94-
"trust-dns",
92+
"rustls",
93+
"hickory-dns",
9594
], optional = true }
9695
semver = "1.0"
9796
serde = { version = "1.0", features = ["derive"] }
@@ -179,17 +178,17 @@ all = [
179178
"oss",
180179
"cos",
181180
]
182-
azure = ["opendal/services-azblob", "reqsign", "reqwest"]
183-
cos = ["opendal/services-cos", "reqsign", "reqwest"]
181+
azure = ["opendal/services-azblob", "opendal-layer-logging", "reqwest"]
182+
cos = ["opendal/services-cos", "opendal-layer-logging", "reqwest"]
184183
default = ["all"]
185-
gcs = ["opendal/services-gcs", "reqsign", "url", "reqwest"]
186-
gha = ["opendal/services-ghac", "reqwest"]
187-
memcached = ["opendal/services-memcached"]
184+
gcs = ["opendal/services-gcs", "opendal-layer-logging", "url", "reqwest"]
185+
gha = ["opendal/services-ghac", "opendal-layer-logging", "reqwest"]
186+
memcached = ["opendal/services-memcached", "opendal-layer-logging"]
188187
native-zlib = []
189-
oss = ["opendal/services-oss", "reqsign", "reqwest"]
190-
redis = ["url", "opendal/services-redis"]
191-
s3 = ["opendal/services-s3", "reqsign", "reqwest"]
192-
webdav = ["opendal/services-webdav", "reqwest"]
188+
oss = ["opendal/services-oss", "opendal-layer-logging", "reqwest"]
189+
redis = ["url", "opendal/services-redis", "opendal-layer-logging"]
190+
s3 = ["opendal/services-s3", "opendal-layer-logging", "reqwest"]
191+
webdav = ["opendal/services-webdav", "opendal-layer-logging", "reqwest"]
193192
# Enable features that will build a vendored version of openssl and
194193
# statically linked with it, instead of linking against the system-wide openssl
195194
# dynamically or statically.

src/cache/azure.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515

1616
use opendal::Operator;
1717

18-
use opendal::layers::{HttpClientLayer, LoggingLayer};
18+
use opendal::layers::HttpClientLayer;
1919
use opendal::services::Azblob;
20+
use opendal_layer_logging::LoggingLayer;
2021

2122
use crate::errors::*;
2223

src/cache/cos.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
// limitations under the License.
1212

1313
use opendal::Operator;
14-
use opendal::layers::{HttpClientLayer, LoggingLayer};
14+
use opendal::layers::HttpClientLayer;
1515
use opendal::services::Cos;
16+
use opendal_layer_logging::LoggingLayer;
1617

1718
use crate::errors::*;
1819

src/cache/gcs.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
use crate::cache::CacheMode;
1717
use crate::errors::*;
1818
use opendal::Operator;
19-
use opendal::{
20-
layers::{HttpClientLayer, LoggingLayer},
21-
services::Gcs,
22-
};
19+
use opendal::{layers::HttpClientLayer, services::Gcs};
20+
use opendal_layer_logging::LoggingLayer;
2321
use reqwest::Client;
2422
use serde::Deserialize;
2523
use url::Url;

src/cache/gha.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
// limitations under the License.
1414

1515
use opendal::Operator;
16-
use opendal::layers::{HttpClientLayer, LoggingLayer};
16+
use opendal::layers::HttpClientLayer;
1717
use opendal::services::Ghac;
18+
use opendal_layer_logging::LoggingLayer;
1819

1920
use crate::VERSION;
2021
use crate::errors::*;

src/cache/memcached.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
use std::time::Duration;
1717

1818
use opendal::Operator;
19-
use opendal::layers::LoggingLayer;
2019
use opendal::services::Memcached;
20+
use opendal_layer_logging::LoggingLayer;
2121

2222
use crate::errors::*;
2323

src/cache/oss.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
// limitations under the License.
1212

1313
use opendal::Operator;
14-
use opendal::layers::{HttpClientLayer, LoggingLayer};
14+
use opendal::layers::HttpClientLayer;
1515
use opendal::services::Oss;
16+
use opendal_layer_logging::LoggingLayer;
1617

1718
use crate::errors::*;
1819

src/cache/redis.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
use crate::errors::*;
1717
use opendal::Operator;
18-
use opendal::layers::LoggingLayer;
1918
use opendal::services::Redis;
19+
use opendal_layer_logging::LoggingLayer;
2020
use std::collections::HashMap;
2121
use std::time::Duration;
2222
use url::Url;

src/cache/s3.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
// limitations under the License.
1212

1313
use opendal::Operator;
14-
use opendal::layers::{HttpClientLayer, LoggingLayer};
14+
use opendal::layers::HttpClientLayer;
1515
use opendal::services::S3;
16+
use opendal_layer_logging::LoggingLayer;
1617

1718
use crate::errors::*;
1819

0 commit comments

Comments
 (0)