Merge branch 'main' into wip_opfs_3

Author: jccampagne

.github/services/swift/swift/action.yml

@@ -34,6 +34,8 @@ runs:
         token=$(echo "$response" | grep X-Auth-Token | head -n1 | awk '{print $2}' | tr -d '[:space:]')
         endpoint=$(echo "$response" | grep X-Storage-Url | head -n1 | awk '{print $2}' | tr -d '[:space:]')
         curl --location --request PUT "${endpoint}/testing" --header "X-Auth-Token: $token"
+        # Configure TempURL key on the account for presigned URL tests
+        curl -s -X POST -H "X-Auth-Token: $token" -H "X-Account-Meta-Temp-URL-Key: opendal-swift-test-key" "${endpoint}"
         echo "OPENDAL_SWIFT_TOKEN=${token}" >> $GITHUB_ENV
         echo "OPENDAL_SWIFT_ENDPOINT=${endpoint}" >> $GITHUB_ENV
 
@@ -42,5 +44,6 @@ runs:
       run: |
         cat << EOF >> $GITHUB_ENV
         OPENDAL_SWIFT_CONTAINER=testing
+        OPENDAL_SWIFT_TEMP_URL_KEY=opendal-swift-test-key
         OPENDAL_SWIFT_ROOT=/
         EOF

core/Cargo.lock

@@ -36,10 +36,10 @@ http = { workspace = true }
 log = { workspace = true }
 opendal-core = { path = "../../core", version = "0.55.0", default-features = false }
 quick-xml = { workspace = true, features = ["serialize", "overlapped-lists"] }
-reqsign = { workspace = true, features = [
-  "services-huaweicloud",
-  "reqwest_request",
-] }
+reqsign-core = "2.0.2"
+reqsign-file-read-tokio = "2.0.2"
+reqsign-http-send-reqwest = "2.0.1"
+reqsign-huaweicloud-obs = "2.0.2"
 serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]

core/services/obs/Cargo.toml

@@ -23,9 +23,17 @@ use http::Response;
 use http::StatusCode;
 use http::Uri;
 use log::debug;
-use reqsign::HuaweicloudObsConfig;
-use reqsign::HuaweicloudObsCredentialLoader;
-use reqsign::HuaweicloudObsSigner;
+use opendal_core::raw::*;
+use opendal_core::*;
+use reqsign_core::Context;
+use reqsign_core::OsEnv;
+use reqsign_core::ProvideCredentialChain;
+use reqsign_core::Signer;
+use reqsign_file_read_tokio::TokioFileRead;
+use reqsign_http_send_reqwest::ReqwestHttpSend;
+use reqsign_huaweicloud_obs::EnvCredentialProvider;
+use reqsign_huaweicloud_obs::RequestSigner;
+use reqsign_huaweicloud_obs::StaticCredentialProvider;
 
 use super::OBS_SCHEME;
 use super::config::ObsConfig;
@@ -36,8 +44,6 @@ use super::error::parse_error;
 use super::lister::ObsLister;
 use super::writer::ObsWriter;
 use super::writer::ObsWriters;
-use opendal_core::raw::*;
-use opendal_core::*;
 
 /// Huawei-Cloud Object Storage Service (OBS) support
 #[doc = include_str!("docs.md")]
@@ -169,28 +175,27 @@ impl Builder for ObsBuilder {
         };
         debug!("backend use endpoint {}", &endpoint);
 
-        let mut cfg = HuaweicloudObsConfig::default();
-        // Load cfg from env first.
-        cfg = cfg.from_env();
+        let ctx = Context::new()
+            .with_file_read(TokioFileRead)
+            .with_http_send(ReqwestHttpSend::new(GLOBAL_REQWEST_CLIENT.clone()))
+            .with_env(OsEnv);
 
-        if let Some(v) = self.config.access_key_id {
-            cfg.access_key_id = Some(v);
-        }
+        let mut provider = ProvideCredentialChain::new().push(EnvCredentialProvider::new());
 
-        if let Some(v) = self.config.secret_access_key {
-            cfg.secret_access_key = Some(v);
+        if let (Some(ak), Some(sk)) = (&self.config.access_key_id, &self.config.secret_access_key) {
+            let static_provider = StaticCredentialProvider::new(ak, sk);
+            provider = provider.push_front(static_provider);
         }
 
-        let loader = HuaweicloudObsCredentialLoader::new(cfg);
-
         // Set the bucket name in CanonicalizedResource.
         // 1. If the bucket is bound to a user domain name, use the user domain name as the bucket name,
         // for example, `/obs.ccc.com/object`. `obs.ccc.com` is the user domain name bound to the bucket.
         // 2. If you do not access OBS using a user domain name, this field is in the format of `/bucket/object`.
         //
         // Please refer to this doc for more details:
         // https://support.huaweicloud.com/intl/en-us/api-obs/obs_04_0010.html
-        let signer = HuaweicloudObsSigner::new(if is_obs_default { &bucket } else { &endpoint });
+        let request_signer = RequestSigner::new(if is_obs_default { &bucket } else { &endpoint });
+        let signer = Signer::new(ctx, provider, request_signer);
 
         debug!("backend build finished");
         Ok(ObsBackend {
@@ -252,7 +257,6 @@ impl Builder for ObsBuilder {
                 root,
                 endpoint: format!("{}://{}", &scheme, &endpoint),
                 signer,
-                loader,
             }),
         })
     }
@@ -390,8 +394,8 @@ impl Access for ObsBackend {
                 "operation is not supported",
             )),
         };
-        let mut req = req?;
-        self.core.sign_query(&mut req, args.expire()).await?;
+        let req = req?;
+        let req = self.core.sign_query(req, args.expire()).await?;
 
         // We don't need this request anymore, consume it directly.
         let (parts, _) = req.into_parts();