refactor: remove custom oss impl (#720)

* refactor: remove custom oss impl * fix endpoint * add region issue
apache · Mar 10, 2023 · a803efc · a803efc
1 parent 11a3b5c
commit a803efc
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 254 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/analytic_engine/src/setup.rs b/analytic_engine/src/setup.rs
@@ -9,7 +9,7 @@ use common_util::define_result;
 use futures::Future;
 use message_queue::kafka::kafka_impl::KafkaImpl;
 use object_store::{
-    aliyun::AliyunOSS,
+    aliyun,
     disk_cache::DiskCacheStore,
     mem_cache::{MemCache, MemCacheStore},
     metrics::StoreWithMetrics,
@@ -443,14 +443,17 @@ fn open_storage(
                 Arc::new(store) as _
             }
             ObjectStoreOptions::Aliyun(aliyun_opts) => {
-                let oss = Arc::new(AliyunOSS::new(
-                    aliyun_opts.key_id,
-                    aliyun_opts.key_secret,
-                    aliyun_opts.endpoint,
-                    aliyun_opts.bucket,
-                    aliyun_opts.pool_max_idle_per_host,
-                    aliyun_opts.timeout,
-                ));
+                let oss: ObjectStoreRef = Arc::new(
+                    aliyun::try_new(
+                        aliyun_opts.key_id,
+                        aliyun_opts.key_secret,
+                        aliyun_opts.endpoint,
+                        aliyun_opts.bucket,
+                        aliyun_opts.pool_max_idle_per_host,
+                        aliyun_opts.timeout.0,
+                    )
+                    .context(OpenObjectStore)?,
+                );
                 let oss_with_metrics = Arc::new(StoreWithMetrics::new(oss));
                 Arc::new(
                     StoreWithPrefix::new(aliyun_opts.prefix, oss_with_metrics)

diff --git a/components/object_store/Cargo.toml b/components/object_store/Cargo.toml
@@ -30,7 +30,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 snafu = { workspace = true }
 tokio = { workspace = true }
-upstream = { package = "object_store", version = "0.5.3" }
+upstream = { package = "object_store", version = "0.5.5", features = [ "aws" ] }
 
 [dev-dependencies]
 tempfile = { workspace = true }