This is an automated email from the ASF dual-hosted git repository.
xuanwo 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 2b4b7cdcb refactor(services/vercel-blob): split crate from core (#6971)
2b4b7cdcb is described below
commit 2b4b7cdcb82d66c2288441b22212f9ecf3f2224a
Author: kenwoodjw <[email protected]>
AuthorDate: Thu Dec 11 18:32:08 2025 +0800
refactor(services/vercel-blob): split crate from core (#6971)
* chore(services/vercel-blob): split crate from core
* chore(services/vercel-blob): fix fmt imports
* chore(core): remove vercel-blob module sources
* cargo fmt
Signed-off-by: kenwoodjw <[email protected]>
---------
Signed-off-by: kenwoodjw <[email protected]>
---
core/Cargo.lock | 16 ++++++++
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 1 -
core/core/src/services/mod.rs | 5 ---
core/services/vercel-blob/Cargo.toml | 45 ++++++++++++++++++++++
.../vercel-blob/src}/backend.rs | 6 +--
.../vercel-blob/src}/config.rs | 8 ++--
.../vercel-blob/src}/core.rs | 4 +-
.../vercel-blob/src}/deleter.rs | 4 +-
.../vercel-blob/src}/docs.md | 2 +-
.../vercel-blob/src}/error.rs | 4 +-
.../mod.rs => services/vercel-blob/src/lib.rs} | 2 +-
.../vercel-blob/src}/lister.rs | 6 +--
.../vercel-blob/src}/writer.rs | 4 +-
core/src/lib.rs | 2 +
15 files changed, 85 insertions(+), 27 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 48508609e..d8b928875 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5504,6 +5504,7 @@ dependencies = [
"opendal-service-moka",
"opendal-service-mysql",
"opendal-service-s3",
+ "opendal-service-vercel-blob",
"opentelemetry",
"opentelemetry-otlp",
"opentelemetry_sdk",
@@ -5939,6 +5940,21 @@ dependencies = [
"tracing-subscriber",
]
+[[package]]
+name = "opendal-service-vercel-blob"
+version = "0.55.0"
+dependencies = [
+ "bytes",
+ "ctor",
+ "http 1.4.0",
+ "log",
+ "opendal-core",
+ "quick-xml",
+ "serde",
+ "serde_json",
+ "tokio",
+]
+
[[package]]
name = "openssh"
version = "0.11.6"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index c6e90b433..b39ba8aaf 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -162,7 +162,7 @@ services-swift = ["opendal-core/services-swift"]
services-tikv = ["opendal-core/services-tikv"]
services-upyun = ["opendal-core/services-upyun"]
services-vercel-artifacts = ["opendal-core/services-vercel-artifacts"]
-services-vercel-blob = ["opendal-core/services-vercel-blob"]
+services-vercel-blob = ["dep:opendal-service-vercel-blob"]
services-webdav = ["opendal-core/services-webdav"]
services-webhdfs = ["opendal-core/services-webhdfs"]
services-yandex-disk = ["opendal-core/services-yandex-disk"]
@@ -211,6 +211,7 @@ opendal-service-hdfs-native = { path =
"services/hdfs-native", version = "0.55.0
opendal-service-moka = { path = "services/moka", version = "0.55.0", optional
= true, default-features = false }
opendal-service-mysql = { path = "services/mysql", version = "0.55.0",
optional = true, default-features = false }
opendal-service-s3 = { path = "services/s3", version = "0.55.0", optional =
true, default-features = false }
+opendal-service-vercel-blob = { path = "services/vercel-blob", version =
"0.55.0", optional = true, default-features = false }
[dev-dependencies]
anyhow = { version = "1.0.100", features = ["std"] }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index d9aab3d1f..d17af9395 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -153,7 +153,6 @@ services-swift = []
services-tikv = ["tikv-client"]
services-upyun = ["dep:hmac", "dep:sha1"]
services-vercel-artifacts = []
-services-vercel-blob = []
services-webdav = []
services-webhdfs = []
services-yandex-disk = []
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index da251f280..55f38c22c 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -259,11 +259,6 @@ mod vercel_artifacts;
#[cfg(feature = "services-vercel-artifacts")]
pub use vercel_artifacts::*;
-#[cfg(feature = "services-vercel-blob")]
-mod vercel_blob;
-#[cfg(feature = "services-vercel-blob")]
-pub use vercel_blob::*;
-
#[cfg(feature = "services-webdav")]
mod webdav;
#[cfg(feature = "services-webdav")]
diff --git a/core/services/vercel-blob/Cargo.toml
b/core/services/vercel-blob/Cargo.toml
new file mode 100644
index 000000000..d7ff7eb75
--- /dev/null
+++ b/core/services/vercel-blob/Cargo.toml
@@ -0,0 +1,45 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[package]
+description = "Apache OpenDAL Vercel Blob service implementation"
+name = "opendal-service-vercel-blob"
+
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+version = { workspace = true }
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+opendal-core = { path = "../../core", version = "0.55.0", default-features =
false }
+
+bytes = { workspace = true }
+ctor = { workspace = true }
+http = { workspace = true }
+log = { workspace = true }
+quick-xml = { workspace = true, features = ["serialize", "overlapped-lists"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+
+[dev-dependencies]
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
diff --git a/core/core/src/services/vercel_blob/backend.rs
b/core/services/vercel-blob/src/backend.rs
similarity index 98%
rename from core/core/src/services/vercel_blob/backend.rs
rename to core/services/vercel-blob/src/backend.rs
index ba3eae581..264b56271 100644
--- a/core/core/src/services/vercel_blob/backend.rs
+++ b/core/services/vercel-blob/src/backend.rs
@@ -24,6 +24,7 @@ use http::StatusCode;
use log::debug;
use super::VERCEL_BLOB_SCHEME;
+use super::config::VercelBlobConfig;
use super::core::Blob;
use super::core::VercelBlobCore;
use super::core::parse_blob;
@@ -32,9 +33,8 @@ use super::error::parse_error;
use super::lister::VercelBlobLister;
use super::writer::VercelBlobWriter;
use super::writer::VercelBlobWriters;
-use crate::raw::*;
-use crate::services::VercelBlobConfig;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// [VercelBlob](https://vercel.com/docs/storage/vercel-blob) services support.
#[doc = include_str!("docs.md")]
diff --git a/core/core/src/services/vercel_blob/config.rs
b/core/services/vercel-blob/src/config.rs
similarity index 91%
rename from core/core/src/services/vercel_blob/config.rs
rename to core/services/vercel-blob/src/config.rs
index 73fbba7b1..57f7c8ce5 100644
--- a/core/core/src/services/vercel_blob/config.rs
+++ b/core/services/vercel-blob/src/config.rs
@@ -43,10 +43,10 @@ impl Debug for VercelBlobConfig {
}
}
-impl crate::Configurator for VercelBlobConfig {
+impl opendal_core::Configurator for VercelBlobConfig {
type Builder = VercelBlobBuilder;
- fn from_uri(uri: &crate::types::OperatorUri) -> crate::Result<Self> {
+ fn from_uri(uri: &opendal_core::OperatorUri) -> opendal_core::Result<Self>
{
let mut map = uri.options().clone();
if let Some(root) = uri.root() {
@@ -66,8 +66,8 @@ impl crate::Configurator for VercelBlobConfig {
#[cfg(test)]
mod tests {
use super::*;
- use crate::Configurator;
- use crate::types::OperatorUri;
+ use opendal_core::Configurator;
+ use opendal_core::OperatorUri;
#[test]
fn from_uri_sets_root() {
diff --git a/core/core/src/services/vercel_blob/core.rs
b/core/services/vercel-blob/src/core.rs
similarity index 99%
rename from core/core/src/services/vercel_blob/core.rs
rename to core/services/vercel-blob/src/core.rs
index 87bcb8fd9..a20ee80d4 100644
--- a/core/core/src/services/vercel_blob/core.rs
+++ b/core/services/vercel-blob/src/core.rs
@@ -31,8 +31,8 @@ use serde_json::json;
use self::constants::*;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
pub(super) mod constants {
// https://github.com/vercel/storage/blob/main/packages/blob/src/put.ts#L16
diff --git a/core/core/src/services/vercel_blob/deleter.rs
b/core/services/vercel-blob/src/deleter.rs
similarity index 94%
rename from core/core/src/services/vercel_blob/deleter.rs
rename to core/services/vercel-blob/src/deleter.rs
index 77f67c3b5..578ca9bc2 100644
--- a/core/core/src/services/vercel_blob/deleter.rs
+++ b/core/services/vercel-blob/src/deleter.rs
@@ -18,8 +18,8 @@
use std::sync::Arc;
use super::core::VercelBlobCore;
-use crate::Result;
-use crate::raw::{OpDelete, oio};
+use opendal_core::Result;
+use opendal_core::raw::{OpDelete, oio};
pub struct VercelBlobDeleter {
core: Arc<VercelBlobCore>,
diff --git a/core/core/src/services/vercel_blob/docs.md
b/core/services/vercel-blob/src/docs.md
similarity index 94%
rename from core/core/src/services/vercel_blob/docs.md
rename to core/services/vercel-blob/src/docs.md
index c466fa630..067972ac3 100644
--- a/core/core/src/services/vercel_blob/docs.md
+++ b/core/services/vercel-blob/src/docs.md
@@ -25,8 +25,8 @@ You can refer to [`VercelBlobBuilder`]'s docs for more
information
```rust,no_run
use anyhow::Result;
-use opendal_core::services::VercelBlob;
use opendal_core::Operator;
+use opendal_service_vercel_blob::VercelBlob;
#[tokio::main]
async fn main() -> Result<()> {
diff --git a/core/core/src/services/vercel_blob/error.rs
b/core/services/vercel-blob/src/error.rs
similarity index 98%
rename from core/core/src/services/vercel_blob/error.rs
rename to core/services/vercel-blob/src/error.rs
index 58f9420a1..ca52886a4 100644
--- a/core/core/src/services/vercel_blob/error.rs
+++ b/core/services/vercel-blob/src/error.rs
@@ -20,8 +20,8 @@ use http::Response;
use quick_xml::de;
use serde::Deserialize;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// VercelBlobError is the error returned by VercelBlob service.
#[derive(Default, Debug, Deserialize)]
diff --git a/core/core/src/services/vercel_blob/mod.rs
b/core/services/vercel-blob/src/lib.rs
similarity index 96%
rename from core/core/src/services/vercel_blob/mod.rs
rename to core/services/vercel-blob/src/lib.rs
index 684eab202..495297e0b 100644
--- a/core/core/src/services/vercel_blob/mod.rs
+++ b/core/services/vercel-blob/src/lib.rs
@@ -18,7 +18,7 @@
/// Default scheme for vercel-blob service.
pub const VERCEL_BLOB_SCHEME: &str = "vercel-blob";
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+use opendal_core::DEFAULT_OPERATOR_REGISTRY;
mod backend;
mod config;
diff --git a/core/core/src/services/vercel_blob/lister.rs
b/core/services/vercel-blob/src/lister.rs
similarity index 95%
rename from core/core/src/services/vercel_blob/lister.rs
rename to core/services/vercel-blob/src/lister.rs
index 10c2d8668..9508f0980 100644
--- a/core/core/src/services/vercel_blob/lister.rs
+++ b/core/services/vercel-blob/src/lister.rs
@@ -19,9 +19,9 @@ use std::sync::Arc;
use super::core::VercelBlobCore;
use super::core::parse_blob;
-use crate::Result;
-use crate::raw::oio::Entry;
-use crate::raw::*;
+use opendal_core::Result;
+use opendal_core::raw::oio::Entry;
+use opendal_core::raw::*;
pub struct VercelBlobLister {
core: Arc<VercelBlobCore>,
diff --git a/core/core/src/services/vercel_blob/writer.rs
b/core/services/vercel-blob/src/writer.rs
similarity index 98%
rename from core/core/src/services/vercel_blob/writer.rs
rename to core/services/vercel-blob/src/writer.rs
index d33a74489..b4bc8eefd 100644
--- a/core/core/src/services/vercel_blob/writer.rs
+++ b/core/services/vercel-blob/src/writer.rs
@@ -25,8 +25,8 @@ use super::core::Part;
use super::core::UploadPartResponse;
use super::core::VercelBlobCore;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
pub type VercelBlobWriters = oio::MultipartWriter<VercelBlobWriter>;
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 1ca809f09..454dedfbb 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -45,6 +45,8 @@ pub mod services {
pub use opendal_service_mysql::*;
#[cfg(feature = "services-s3")]
pub use opendal_service_s3::*;
+ #[cfg(feature = "services-vercel-blob")]
+ pub use opendal_service_vercel_blob::*;
}
/// Re-export of layers.
