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 0d5691fd7 refactor(services/koofr): split koofr into separate crate
(#7043)
0d5691fd7 is described below
commit 0d5691fd7efc1985aefeb678cdc9f0a24227fd76
Author: Jintao Zhang <[email protected]>
AuthorDate: Wed Dec 17 16:57:35 2025 +0800
refactor(services/koofr): split koofr into separate crate (#7043)
This PR splits the koofr service into its own crate `opendal-service-koofr`.
- Create new crate at `core/services/koofr`
- Update feature flag to use the new crate
- Remove koofr from `opendal-core`
- Re-export from facade crate
Closes #6904
---
core/Cargo.lock | 15 ++++++++
core/Cargo.toml | 3 +-
core/core/Cargo.toml | 1 -
core/core/src/services/mod.rs | 5 ---
core/services/koofr/Cargo.toml | 42 ++++++++++++++++++++++
.../koofr => services/koofr/src}/backend.rs | 4 +--
.../koofr => services/koofr/src}/config.rs | 16 ++++-----
.../services/koofr => services/koofr/src}/core.rs | 4 +--
.../koofr => services/koofr/src}/deleter.rs | 4 +--
.../services/koofr => services/koofr/src}/docs.md | 0
.../services/koofr => services/koofr/src}/error.rs | 4 +--
.../koofr/mod.rs => services/koofr/src/lib.rs} | 2 +-
.../koofr => services/koofr/src}/lister.rs | 10 +++---
.../koofr => services/koofr/src}/writer.rs | 4 +--
core/src/lib.rs | 2 ++
15 files changed, 85 insertions(+), 31 deletions(-)
diff --git a/core/Cargo.lock b/core/Cargo.lock
index 40b3416a4..a569cf6b3 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -5575,6 +5575,7 @@ dependencies = [
"opendal-service-hdfs-native",
"opendal-service-huggingface",
"opendal-service-ipfs",
+ "opendal-service-koofr",
"opendal-service-memcached",
"opendal-service-mini-moka",
"opendal-service-moka",
@@ -6240,6 +6241,20 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "opendal-service-koofr"
+version = "0.55.0"
+dependencies = [
+ "bytes",
+ "ctor",
+ "http 1.4.0",
+ "log",
+ "mea",
+ "opendal-core",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "opendal-service-memcached"
version = "0.55.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 9babb1ec6..8192a1284 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -130,7 +130,7 @@ services-http = ["opendal-core/services-http"]
services-huggingface = ["dep:opendal-service-huggingface"]
services-ipfs = ["dep:opendal-service-ipfs"]
services-ipmfs = ["opendal-core/services-ipmfs"]
-services-koofr = ["opendal-core/services-koofr"]
+services-koofr = ["dep:opendal-service-koofr"]
services-lakefs = ["opendal-core/services-lakefs"]
services-memcached = ["dep:opendal-service-memcached"]
services-memory = ["opendal-core/services-memory"]
@@ -227,6 +227,7 @@ opendal-service-github = { path = "services/github",
version = "0.55.0", optiona
opendal-service-hdfs-native = { path = "services/hdfs-native", version =
"0.55.0", optional = true, default-features = false }
opendal-service-huggingface = { path = "services/huggingface", version =
"0.55.0", optional = true, default-features = false }
opendal-service-ipfs = { path = "services/ipfs", version = "0.55.0", optional
= true, default-features = false }
+opendal-service-koofr = { path = "services/koofr", version = "0.55.0",
optional = true, default-features = false }
opendal-service-memcached = { path = "services/memcached", version = "0.55.0",
optional = true, default-features = false }
opendal-service-mini-moka = { path = "services/mini_moka", version = "0.55.0",
optional = true, default-features = false }
opendal-service-moka = { path = "services/moka", version = "0.55.0", optional
= true, default-features = false }
diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml
index 344094058..9325f56bc 100644
--- a/core/core/Cargo.toml
+++ b/core/core/Cargo.toml
@@ -62,7 +62,6 @@ services-gridfs = ["dep:mongodb",
"dep:mongodb-internal-macros"]
services-hdfs = ["dep:hdrs"]
services-http = []
services-ipmfs = []
-services-koofr = []
services-lakefs = []
services-memory = []
services-mongodb = ["dep:mongodb", "dep:mongodb-internal-macros"]
diff --git a/core/core/src/services/mod.rs b/core/core/src/services/mod.rs
index 04f7328ae..8aaafc2fa 100644
--- a/core/core/src/services/mod.rs
+++ b/core/core/src/services/mod.rs
@@ -44,11 +44,6 @@ mod ipmfs;
#[cfg(feature = "services-ipmfs")]
pub use ipmfs::*;
-#[cfg(feature = "services-koofr")]
-mod koofr;
-#[cfg(feature = "services-koofr")]
-pub use koofr::*;
-
#[cfg(feature = "services-lakefs")]
mod lakefs;
#[cfg(feature = "services-lakefs")]
diff --git a/core/services/koofr/Cargo.toml b/core/services/koofr/Cargo.toml
new file mode 100644
index 000000000..9627c0e36
--- /dev/null
+++ b/core/services/koofr/Cargo.toml
@@ -0,0 +1,42 @@
+# 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 koofr service implementation"
+name = "opendal-service-koofr"
+
+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 }
+mea = "0.5.1"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
diff --git a/core/core/src/services/koofr/backend.rs
b/core/services/koofr/src/backend.rs
similarity index 99%
rename from core/core/src/services/koofr/backend.rs
rename to core/services/koofr/src/backend.rs
index 5b3497a0a..f43fe69fc 100644
--- a/core/core/src/services/koofr/backend.rs
+++ b/core/services/koofr/src/backend.rs
@@ -35,8 +35,8 @@ use super::error::parse_error;
use super::lister::KoofrLister;
use super::writer::KoofrWriter;
use super::writer::KoofrWriters;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// [Koofr](https://app.koofr.net/) services support.
#[doc = include_str!("docs.md")]
diff --git a/core/core/src/services/koofr/config.rs
b/core/services/koofr/src/config.rs
similarity index 89%
rename from core/core/src/services/koofr/config.rs
rename to core/services/koofr/src/config.rs
index 1443a5687..9de91ff6b 100644
--- a/core/core/src/services/koofr/config.rs
+++ b/core/services/koofr/src/config.rs
@@ -49,13 +49,13 @@ impl Debug for KoofrConfig {
}
}
-impl crate::Configurator for KoofrConfig {
+impl opendal_core::Configurator for KoofrConfig {
type Builder = KoofrBuilder;
- fn from_uri(uri: &crate::types::OperatorUri) -> crate::Result<Self> {
+ fn from_uri(uri: &opendal_core::OperatorUri) -> opendal_core::Result<Self>
{
let raw_path = uri.root().ok_or_else(|| {
- crate::Error::new(
- crate::ErrorKind::ConfigInvalid,
+ opendal_core::Error::new(
+ opendal_core::ErrorKind::ConfigInvalid,
"uri path must contain email",
)
.with_context("service", KOOFR_SCHEME)
@@ -63,8 +63,8 @@ impl crate::Configurator for KoofrConfig {
let mut segments = raw_path.splitn(2, '/');
let email = segments.next().filter(|s| !s.is_empty()).ok_or_else(|| {
- crate::Error::new(
- crate::ErrorKind::ConfigInvalid,
+ opendal_core::Error::new(
+ opendal_core::ErrorKind::ConfigInvalid,
"email is required in uri path",
)
.with_context("service", KOOFR_SCHEME)
@@ -93,8 +93,8 @@ impl crate::Configurator for KoofrConfig {
#[cfg(test)]
mod tests {
use super::*;
- use crate::Configurator;
- use crate::types::OperatorUri;
+ use opendal_core::Configurator;
+ use opendal_core::types::OperatorUri;
#[test]
fn from_uri_sets_endpoint_email_and_root() {
diff --git a/core/core/src/services/koofr/core.rs
b/core/services/koofr/src/core.rs
similarity index 99%
rename from core/core/src/services/koofr/core.rs
rename to core/services/koofr/src/core.rs
index 83c42f163..0bcbab0c6 100644
--- a/core/core/src/services/koofr/core.rs
+++ b/core/services/koofr/src/core.rs
@@ -32,8 +32,8 @@ use serde::Deserialize;
use serde_json::json;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
#[derive(Clone)]
pub struct KoofrCore {
diff --git a/core/core/src/services/koofr/deleter.rs
b/core/services/koofr/src/deleter.rs
similarity index 96%
rename from core/core/src/services/koofr/deleter.rs
rename to core/services/koofr/src/deleter.rs
index 7b6b9c38b..0fd2c7773 100644
--- a/core/core/src/services/koofr/deleter.rs
+++ b/core/services/koofr/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 KoofrDeleter {
core: Arc<KoofrCore>,
diff --git a/core/core/src/services/koofr/docs.md
b/core/services/koofr/src/docs.md
similarity index 100%
rename from core/core/src/services/koofr/docs.md
rename to core/services/koofr/src/docs.md
diff --git a/core/core/src/services/koofr/error.rs
b/core/services/koofr/src/error.rs
similarity index 97%
rename from core/core/src/services/koofr/error.rs
rename to core/services/koofr/src/error.rs
index 760f20119..ea49423a2 100644
--- a/core/core/src/services/koofr/error.rs
+++ b/core/services/koofr/src/error.rs
@@ -17,8 +17,8 @@
use http::Response;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
/// Parse error response into Error.
pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
diff --git a/core/core/src/services/koofr/mod.rs
b/core/services/koofr/src/lib.rs
similarity index 96%
rename from core/core/src/services/koofr/mod.rs
rename to core/services/koofr/src/lib.rs
index fe86028e4..163181ac1 100644
--- a/core/core/src/services/koofr/mod.rs
+++ b/core/services/koofr/src/lib.rs
@@ -18,7 +18,7 @@
/// Default scheme for koofr service.
pub const KOOFR_SCHEME: &str = "koofr";
-use crate::types::DEFAULT_OPERATOR_REGISTRY;
+use opendal_core::DEFAULT_OPERATOR_REGISTRY;
mod backend;
mod config;
diff --git a/core/core/src/services/koofr/lister.rs
b/core/services/koofr/src/lister.rs
similarity index 94%
rename from core/core/src/services/koofr/lister.rs
rename to core/services/koofr/src/lister.rs
index 1e00b043e..88c565ff8 100644
--- a/core/core/src/services/koofr/lister.rs
+++ b/core/services/koofr/src/lister.rs
@@ -22,11 +22,11 @@ use bytes::Buf;
use super::core::KoofrCore;
use super::core::ListResponse;
use super::error::parse_error;
-use crate::EntryMode;
-use crate::Metadata;
-use crate::Result;
-use crate::raw::oio::Entry;
-use crate::raw::*;
+use opendal_core::EntryMode;
+use opendal_core::Metadata;
+use opendal_core::Result;
+use opendal_core::raw::oio::Entry;
+use opendal_core::raw::*;
pub struct KoofrLister {
core: Arc<KoofrCore>,
diff --git a/core/core/src/services/koofr/writer.rs
b/core/services/koofr/src/writer.rs
similarity index 97%
rename from core/core/src/services/koofr/writer.rs
rename to core/services/koofr/src/writer.rs
index b7ec5ef83..adf7a240f 100644
--- a/core/core/src/services/koofr/writer.rs
+++ b/core/services/koofr/src/writer.rs
@@ -23,8 +23,8 @@ use http::StatusCode;
use super::core::File;
use super::core::KoofrCore;
use super::error::parse_error;
-use crate::raw::*;
-use crate::*;
+use opendal_core::raw::*;
+use opendal_core::*;
pub type KoofrWriters = oio::OneShotWriter<KoofrWriter>;
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 8de04ff1e..67a025d44 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -78,6 +78,8 @@ pub mod services {
pub use opendal_service_huggingface::*;
#[cfg(feature = "services-ipfs")]
pub use opendal_service_ipfs::*;
+ #[cfg(feature = "services-koofr")]
+ pub use opendal_service_koofr::*;
#[cfg(feature = "services-memcached")]
pub use opendal_service_memcached::*;
#[cfg(feature = "services-mini-moka")]
