resolve comments

apache · Feb 18, 2024 · 1269eea · 1269eea
1 parent 8fd8256
commit 1269eea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/core/Cargo.lock b/core/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -262,7 +262,6 @@ reqwest = { version = "0.11.18", features = [
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tokio = { version = "1.27", features = ["sync"] }
-url = "2.5.0"
 uuid = { version = "1", features = ["serde", "v4"] }
 
 # Test only dependencies

diff --git a/core/src/services/azblob/core.rs b/core/src/services/azblob/core.rs
@@ -35,7 +35,6 @@ use std::fmt::Debug;
 use std::fmt::Formatter;
 use std::fmt::Write;
 use std::time::Duration;
-use url::form_urlencoded::byte_serialize;
 use uuid::Uuid;
 
 use crate::raw::*;
@@ -385,8 +384,9 @@ impl AzblobCore {
         // To be written as part of a blob, a block must have been successfully written to the server in an earlier Put Block operation.
         // refer to https://learn.microsoft.com/en-us/rest/api/storageservices/put-block?tabs=microsoft-entra-id
         let p = build_abs_path(&self.root, path);
+
         let encoded_block_id: String =
-            byte_serialize(BASE64_STANDARD.encode(block_id.to_string()).as_bytes()).collect();
+            percent_encode_path(&BASE64_STANDARD.encode(block_id.simple().to_string()));
         let url = format!(
             "{}/{}/{}?comp=block&blockid={}",
             self.endpoint,
@@ -455,8 +455,7 @@ impl AzblobCore {
                 .into_iter()
                 .map(|block_id| {
                     let encoded_block_id: String =
-                        byte_serialize(BASE64_STANDARD.encode(block_id.to_string()).as_bytes())
-                            .collect();
+                        percent_encode_path(&BASE64_STANDARD.encode(block_id.simple().to_string()));
                     encoded_block_id
                 })
                 .collect(),