add OpendalStore::new_from_aws_s3_builder

Author: meteorgan

integrations/object_store/Cargo.toml

@@ -29,7 +29,7 @@ version = "0.51.0"
 
 [features]
 send_wrapper = ["dep:send_wrapper"]
-services-s3 = ["opendal/services-s3"]
+services-s3 = ["opendal/services-s3", "object_store/aws"]
 
 [[test]]
 harness = false
@@ -39,9 +39,7 @@ path = "tests/behavior/main.rs"
 [dependencies]
 async-trait = "0.1"
 bytes = "1"
-flagset = "0.4"
 futures = "0.3"
-futures-util = "0.3"
 object_store = "0.11"
 opendal = { version = "0.53.0", path = "../../core", default-features = false }
 pin-project = "1.1"

integrations/object_store/examples/basic.rs

@@ -1,16 +1,13 @@
-use std::sync::Arc;
-
 use bytes::Bytes;
 use object_store::path::Path;
 use object_store::ObjectStore;
-
 #[cfg(feature = "services-s3")]
-use object_store_opendal::AmazonS3Builder;
+use object_store_opendal::S3Builder;
 
 #[cfg(feature = "services-s3")]
 #[tokio::main]
 async fn main() {
-    let s3_store = AmazonS3Builder::new()
+    let s3_store = S3Builder::new()
         .with_access_key_id("my_access_key")
         .with_secret_access_key("my_secret_key")
         .with_endpoint("my_endpoint")
@@ -19,14 +16,12 @@ async fn main() {
         .build()
         .unwrap();
 
-    let object_store = Arc::new(s3_store);
-
     let path = Path::from("data/nested/test.txt");
     let bytes = Bytes::from_static(b"hello, world! I am nested.");
 
-    object_store.put(&path, bytes.clone().into()).await.unwrap();
+    s3_store.put(&path, bytes.clone().into()).await.unwrap();
 
-    let content = object_store
+    let content = s3_store
         .get(&path)
         .await
         .unwrap()

integrations/object_store/src/lib.rs

@@ -68,7 +68,7 @@ mod utils;
 #[cfg(feature = "services-s3")]
 mod s3_builder;
 #[cfg(feature = "services-s3")]
-pub use s3_builder::AmazonS3Builder;
+pub use s3_builder::S3Builder;
 
 // Make sure `send_wrapper` works as expected
 #[cfg(all(feature = "send_wrapper", test))]

integrations/object_store/src/s3_builder.rs

@@ -17,22 +17,23 @@
 
 use crate::utils::format_object_store_error;
 use crate::OpendalStore;
+use object_store::aws::AmazonS3ConfigKey;
 use opendal::services::S3;
 use opendal::Operator;
 
-pub struct AmazonS3Builder {
+pub struct S3Builder {
     builder: S3,
 }
 
-impl Default for AmazonS3Builder {
+impl Default for S3Builder {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl AmazonS3Builder {
+impl S3Builder {
     pub fn new() -> Self {
-        AmazonS3Builder {
+        S3Builder {
             builder: S3::default(),
         }
     }
@@ -87,6 +88,7 @@ impl AmazonS3Builder {
         }
         self
     }
+
     pub fn build(self) -> object_store::Result<OpendalStore> {
         let op = Operator::new(self.builder)
             .map_err(|err| format_object_store_error(err, ""))?
@@ -95,3 +97,52 @@ impl AmazonS3Builder {
         Ok(OpendalStore::new(op))
     }
 }
+impl OpendalStore {
+    pub fn new_from_aws_s3_builder(
+        builder: object_store::aws::AmazonS3Builder,
+    ) -> object_store::Result<OpendalStore> {
+        let mut s3 = S3Builder::new();
+        if let Some(endpoint) = builder.get_config_value(&AmazonS3ConfigKey::Endpoint) {
+            s3 = s3.with_endpoint(endpoint.as_str());
+        }
+        if let Some(region) = builder.get_config_value(&AmazonS3ConfigKey::Region) {
+            s3 = s3.with_region(region.as_str());
+        }
+        if let Some(bucket_name) = builder.get_config_value(&AmazonS3ConfigKey::Bucket) {
+            s3 = s3.with_bucket_name(bucket_name.as_str());
+        }
+        if let Some(access_key_id) = builder.get_config_value(&AmazonS3ConfigKey::AccessKeyId) {
+            s3 = s3.with_access_key_id(access_key_id.as_str());
+        }
+        if let Some(secret_access_key) =
+            builder.get_config_value(&AmazonS3ConfigKey::SecretAccessKey)
+        {
+            s3 = s3.with_secret_access_key(secret_access_key.as_str());
+        }
+        if let Some(token) = builder.get_config_value(&AmazonS3ConfigKey::Token) {
+            s3 = s3.with_token(token.as_str());
+        }
+        if let Some(virtual_hosted_style_request) =
+            builder.get_config_value(&AmazonS3ConfigKey::VirtualHostedStyleRequest)
+        {
+            let r = virtual_hosted_style_request
+                .parse::<bool>()
+                .map_err(|err| object_store::Error::Generic {
+                    store: "s3",
+                    source: Box::new(err),
+                })?;
+            s3 = s3.with_virtual_hosted_style_request(r);
+        }
+        if let Some(skip_signature) = builder.get_config_value(&AmazonS3ConfigKey::SkipSignature) {
+            let r = skip_signature
+                .parse::<bool>()
+                .map_err(|err| object_store::Error::Generic {
+                    store: "s3",
+                    source: Box::new(err),
+                })?;
+            s3 = s3.with_skip_signature(r);
+        }
+
+        s3.build()
+    }
+}