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 3142b76fa refactor(services/obs): split obs service into standalone
crate (#6977)
3142b76fa is described below
commit 3142b76fa15ac9eed15db2b7a0bdeab5be184734
Author: kenwoodjw <[email protected]>
AuthorDate: Fri Dec 12 18:37:16 2025 +0800
refactor(services/obs): split obs service into standalone crate (#6977)
---
core/Cargo.lock | 15 ++++++++
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 5 ---
core/core/src/services/mod.rs | 5 ---
core/services/obs/Cargo.toml | 45 ++++++++++++++++++++++
.../services/obs => services/obs/src}/backend.rs | 8 +++-
.../services/obs => services/obs/src}/config.rs | 8 ++--
.../src/services/obs => services/obs/src}/core.rs | 4 +-
.../services/obs => services/obs/src}/deleter.rs | 4 +-
.../src/services/obs => services/obs/src}/docs.md | 2 +-
.../src/services/obs => services/obs/src}/error.rs | 4 +-
.../obs/mod.rs => services/obs/src/lib.rs} | 2 +-
.../services/obs => services/obs/src}/lister.rs | 8 ++--
.../services/obs => services/obs/src}/writer.rs | 6 +--
core/src/lib.rs | 2 +
15 files changed, 89 insertions(+), 32 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index ca3723756..59d3fd5b3 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5505,6 +5505,7 @@ dependencies = [
"opendal-service-hdfs-native",
"opendal-service-moka",
"opendal-service-mysql",
+ "opendal-service-obs",
"opendal-service-postgresql",
"opendal-service-s3",
"opendal-service-vercel-blob",
@@ -5943,6 +5944,20 @@ dependencies = [
"sqlx",
]
+[[package]]
+name = "opendal-service-obs"
+version = "0.55.0"
+dependencies = [
+ "bytes",
+ "ctor",
+ "http 1.4.0",
+ "log",
+ "opendal-core",
+ "quick-xml",
+ "reqsign",
+ "serde",
+]
+
[[package]]
name = "opendal-service-postgresql"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 9fff946ec..31a4b9fde 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -142,7 +142,7 @@ services-moka = ["dep:opendal-service-moka"]
services-mongodb = ["opendal-core/services-mongodb"]
services-monoiofs = ["opendal-core/services-monoiofs"]
services-mysql = ["dep:opendal-service-mysql"]
-services-obs = ["opendal-core/services-obs"]
+services-obs = ["dep:opendal-service-obs"]
services-onedrive = ["opendal-core/services-onedrive"]
services-opfs = ["opendal-core/services-opfs"]
services-oss = ["opendal-core/services-oss"]
@@ -213,6 +213,7 @@ opendal-service-ghac = { path = "services/ghac", version =
"0.55.0", optional =
opendal-service-hdfs-native = { path = "services/hdfs-native", version =
"0.55.0", optional = true, default-features = false }
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-obs = { path = "services/obs", version = "0.55.0", optional =
true, default-features = false }
opendal-service-postgresql = { path = "services/postgresql", 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 }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 265f78f88..916d76519 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -119,11 +119,6 @@ services-memory = []
services-mini-moka = ["dep:mini-moka"]
services-mongodb = ["dep:mongodb", "dep:mongodb-internal-macros"]
services-monoiofs = ["dep:monoio", "dep:flume"]
-services-obs = [
- "dep:reqsign",
- "reqsign?/services-huaweicloud",
- "reqsign?/reqwest_request",
-]
services-onedrive = []
services-opfs = [
"dep:js-sys",
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index 74f0473e3..766d4c99e 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -164,11 +164,6 @@ mod monoiofs;
#[cfg(feature = "services-monoiofs")]
pub use monoiofs::*;
-#[cfg(feature = "services-obs")]
-mod obs;
-#[cfg(feature = "services-obs")]
-pub use obs::*;
-
#[cfg(feature = "services-onedrive")]
mod onedrive;
#[cfg(feature = "services-onedrive")]
diff --git a/core/services/obs/Cargo.toml b/core/services/obs/Cargo.toml
new file mode 100644
index 000000000..fbd4292e5
--- /dev/null
+++ b/core/services/obs/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 Huawei Cloud OBS service implementation"
+name = "opendal-service-obs"
+
+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"] }
+reqsign = { workspace = true, default-features = false, features = [
+ "services-huaweicloud",
+ "reqwest_request",
+] }
+serde = { workspace = true, features = ["derive"] }
diff --git a/core/core/src/services/obs/backend.rs
b/core/services/obs/src/backend.rs
similarity index 98%
rename from core/core/src/services/obs/backend.rs
rename to core/services/obs/src/backend.rs
index 940eecad2..a4aef9b4f 100644
--- a/core/core/src/services/obs/backend.rs
+++ b/core/services/obs/src/backend.rs
@@ -36,8 +36,8 @@ use super::error::parse_error;
use super::lister::ObsLister;
use super::writer::ObsWriter;
use super::writer::ObsWriters;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// Huawei-Cloud Object Storage Service (OBS) support
#[doc = include_str!("docs.md")]
@@ -385,6 +385,10 @@ impl Access for ObsBackend {
ErrorKind::Unsupported,
"operation is not supported",
)),
+ _ => Err(Error::new(
+ ErrorKind::Unsupported,
+ "operation is not supported",
+ )),
};
let mut req = req?;
self.core.sign_query(&mut req, args.expire()).await?;
diff --git a/core/core/src/services/obs/config.rs
b/core/services/obs/src/config.rs
similarity index 93%
rename from core/core/src/services/obs/config.rs
rename to core/services/obs/src/config.rs
index 6d9ea1a2f..1efa2cc0a 100644
--- a/core/core/src/services/obs/config.rs
+++ b/core/services/obs/src/config.rs
@@ -52,10 +52,10 @@ impl Debug for ObsConfig {
}
}
-impl crate::Configurator for ObsConfig {
+impl opendal_core::Configurator for ObsConfig {
type Builder = ObsBuilder;
- 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(name) = uri.name() {
@@ -77,8 +77,8 @@ impl crate::Configurator for ObsConfig {
#[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_extracts_bucket_and_root() {
diff --git a/core/core/src/services/obs/core.rs b/core/services/obs/src/core.rs
similarity index 99%
rename from core/core/src/services/obs/core.rs
rename to core/services/obs/src/core.rs
index 9ed33e905..2b754ff70 100644
--- a/core/core/src/services/obs/core.rs
+++ b/core/services/obs/src/core.rs
@@ -33,8 +33,8 @@ use reqsign::HuaweicloudObsSigner;
use serde::Deserialize;
use serde::Serialize;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
pub mod constants {
pub const X_OBS_META_PREFIX: &str = "x-obs-meta-";
diff --git a/core/core/src/services/obs/deleter.rs
b/core/services/obs/src/deleter.rs
similarity index 96%
rename from core/core/src/services/obs/deleter.rs
rename to core/services/obs/src/deleter.rs
index 034073a56..535029936 100644
--- a/core/core/src/services/obs/deleter.rs
+++ b/core/services/obs/src/deleter.rs
@@ -21,8 +21,8 @@ use http::StatusCode;
use super::core::*;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
pub struct ObsDeleter {
core: Arc<ObsCore>,
diff --git a/core/core/src/services/obs/docs.md b/core/services/obs/src/docs.md
similarity index 97%
rename from core/core/src/services/obs/docs.md
rename to core/services/obs/src/docs.md
index 021049ab4..0b83fcc6f 100644
--- a/core/core/src/services/obs/docs.md
+++ b/core/services/obs/src/docs.md
@@ -28,8 +28,8 @@ You can refer to [`ObsBuilder`]'s docs for more information
```rust,no_run
use anyhow::Result;
-use opendal_core::services::Obs;
use opendal_core::Operator;
+use opendal_service_obs::Obs;
#[tokio::main]
async fn main() -> Result<()> {
diff --git a/core/core/src/services/obs/error.rs
b/core/services/obs/src/error.rs
similarity index 98%
rename from core/core/src/services/obs/error.rs
rename to core/services/obs/src/error.rs
index 21ddd5f97..758daa639 100644
--- a/core/core/src/services/obs/error.rs
+++ b/core/services/obs/src/error.rs
@@ -21,8 +21,8 @@ use http::StatusCode;
use quick_xml::de;
use serde::Deserialize;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// ObsError is the error returned by obs service.
#[derive(Default, Debug, Deserialize)]
diff --git a/core/core/src/services/obs/mod.rs b/core/services/obs/src/lib.rs
similarity index 96%
rename from core/core/src/services/obs/mod.rs
rename to core/services/obs/src/lib.rs
index b9be65574..aa60f8e09 100644
--- a/core/core/src/services/obs/mod.rs
+++ b/core/services/obs/src/lib.rs
@@ -18,7 +18,7 @@
/// Default scheme for obs service.
pub const OBS_SCHEME: &str = "obs";
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+use opendal_core::DEFAULT_OPERATOR_REGISTRY;
mod backend;
mod config;
diff --git a/core/core/src/services/obs/lister.rs
b/core/services/obs/src/lister.rs
similarity index 96%
rename from core/core/src/services/obs/lister.rs
rename to core/services/obs/src/lister.rs
index 9ef03e0f2..a1b80329f 100644
--- a/core/core/src/services/obs/lister.rs
+++ b/core/services/obs/src/lister.rs
@@ -22,10 +22,10 @@ use quick_xml::de;
use super::core::*;
use super::error::parse_error;
-use crate::EntryMode;
-use crate::Metadata;
-use crate::Result;
-use crate::raw::*;
+use opendal_core::EntryMode;
+use opendal_core::Metadata;
+use opendal_core::Result;
+use opendal_core::raw::*;
pub struct ObsLister {
core: Arc<ObsCore>,
diff --git a/core/core/src/services/obs/writer.rs
b/core/services/obs/src/writer.rs
similarity index 98%
rename from core/core/src/services/obs/writer.rs
rename to core/services/obs/src/writer.rs
index b26768f73..6deaf6462 100644
--- a/core/core/src/services/obs/writer.rs
+++ b/core/services/obs/src/writer.rs
@@ -24,9 +24,9 @@ use http::StatusCode;
use super::core::*;
use super::error::parse_error;
-use crate::raw::oio::MultipartPart;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::oio::MultipartPart;
+use opendal_core::raw::*;
+use opendal_core::*;
pub type ObsWriters = TwoWays<oio::MultipartWriter<ObsWriter>,
oio::AppendWriter<ObsWriter>>;
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 609052e02..e65dd6e51 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -45,6 +45,8 @@ pub mod services {
pub use opendal_service_moka::*;
#[cfg(feature = "services-mysql")]
pub use opendal_service_mysql::*;
+ #[cfg(feature = "services-obs")]
+ pub use opendal_service_obs::*;
#[cfg(feature = "services-postgresql")]
pub use opendal_service_postgresql::*;
#[cfg(feature = "services-s3")]
