fix blob_storage_request

sdk/data_tables/src/clients/entity_client.rs

@@ -100,7 +100,7 @@ impl EntityClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/clients/partition_key_client.rs

@@ -2,6 +2,7 @@ use crate::{prelude::*, requests::*};
 
 use azure_core::Method;
 use azure_core::Request;
+use azure_core::Url;
 use azure_storage::core::clients::StorageAccountClient;
 use bytes::Bytes;
 use std::sync::Arc;
@@ -55,7 +56,7 @@ impl PartitionKeyClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/clients/table_client.rs

@@ -1,6 +1,7 @@
 use crate::{clients::TableServiceClient, requests::*};
 use azure_core::Method;
 use azure_core::Request;
+use azure_core::Url;
 use azure_storage::core::clients::StorageAccountClient;
 use bytes::Bytes;
 use std::sync::Arc;
@@ -66,7 +67,7 @@ impl TableClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/clients/table_service_client.rs

@@ -57,7 +57,7 @@ impl TableServiceClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/requests/create_table_builder.rs

@@ -22,7 +22,7 @@ impl<'a> CreateTableBuilder<'a> {
     }
 
     pub async fn execute(&self) -> azure_core::Result<CreateTableResponse> {
-        let url = self.table_client.url();
+        let url = self.table_client.url().clone();
 
         #[derive(Debug, Clone, Serialize)]
         struct RequestBody<'a> {
@@ -35,7 +35,7 @@ impl<'a> CreateTableBuilder<'a> {
         })?;
 
         let mut request = self.table_client.prepare_request(
-            url.as_str(),
+            url,
             Method::POST,
             Some(bytes::Bytes::from(request_body_serialized)),
         )?;

sdk/data_tables/src/requests/delete_entity_builder.rs

@@ -38,7 +38,7 @@ impl<'a> DeleteEntityBuilder<'a> {
 
         let mut request = self
             .entity_client
-            .prepare_request(url.as_str(), Method::DELETE, None)?;
+            .prepare_request(url, Method::DELETE, None)?;
         request.add_optional_header(&self.client_request_id);
         request.add_mandatory_header(&self.if_match);
 

sdk/data_tables/src/requests/delete_table_builder.rs

@@ -33,7 +33,7 @@ impl<'a> DeleteTableBuilder<'a> {
 
         let mut request = self
             .table_client
-            .prepare_request(url.as_str(), Method::DELETE, None)?;
+            .prepare_request(url, Method::DELETE, None)?;
         request.add_optional_header(&self.client_request_id);
         request.insert_header("Accept", "application/json");
 

sdk/data_tables/src/requests/get_entity_builder.rs

@@ -33,9 +33,7 @@ impl<'a> GetEntityBuilder<'a> {
 
         self.select.append_to_url_query(&mut url);
 
-        let mut request = self
-            .entity_client
-            .prepare_request(url.as_str(), Method::GET, None)?;
+        let mut request = self.entity_client.prepare_request(url, Method::GET, None)?;
         request.add_optional_header(&self.client_request_id);
         request.insert_header("Accept", "application/json;odata=fullmetadata");
 

sdk/data_tables/src/requests/insert_entity_builder.rs

@@ -47,7 +47,7 @@ impl<'a> InsertEntityBuilder<'a> {
         let request_body_serialized = serde_json::to_string(entity)?;
 
         let mut request = self.table_client.prepare_request(
-            url.as_str(),
+            url,
             Method::POST,
             Some(bytes::Bytes::from(request_body_serialized)),
         )?;

sdk/data_tables/src/requests/insert_or_replace_or_merge_entity_builder.rs

@@ -44,7 +44,7 @@ impl<'a> InsertOrReplaceOrMergeEntityBuilder<'a> {
         let request_body_serialized = serde_json::to_string(entity)?;
 
         let mut request = self.entity_client.prepare_request(
-            url.as_str(),
+            url,
             match self.operation {
                 Operation::InsertOrMerge => crate::MERGE.to_owned(),
                 Operation::InsertOrReplace => Method::PUT,

sdk/data_tables/src/requests/list_tables_builder.rs

@@ -46,9 +46,9 @@ impl<'a> ListTablesBuilder<'a> {
         self.continuation_next_table_name
             .append_to_url_query(&mut url);
 
-        let mut request =
-            self.table_service_client
-                .prepare_request(url.as_str(), Method::GET, None)?;
+        let mut request = self
+            .table_service_client
+            .prepare_request(url, Method::GET, None)?;
         request.add_optional_header(&self.client_request_id);
         request.insert_header("Accept", "application/json;odata=fullmetadata");
 

sdk/data_tables/src/requests/query_entity_builder.rs

@@ -55,9 +55,7 @@ impl<'a> QueryEntityBuilder<'a> {
         self.continuation_next_partition_and_row_key
             .append_to_url_query(&mut url);
 
-        let mut request = self
-            .table_client
-            .prepare_request(url.as_str(), Method::GET, None)?;
+        let mut request = self.table_client.prepare_request(url, Method::GET, None)?;
         request.add_optional_header(&self.client_request_id);
         request.insert_header("Accept", "application/json;odata=fullmetadata");
 

sdk/data_tables/src/requests/submit_transaction_builder.rs

@@ -42,7 +42,7 @@ impl<'a> SubmitTransactionBuilder<'a> {
         let payload = batch.to_string()?;
 
         let mut request = self.partition_key_client.prepare_request(
-            url.as_str(),
+            url,
             Method::POST,
             Some(bytes::Bytes::from(payload)),
         )?;

sdk/data_tables/src/requests/update_or_merge_entity_builder.rs

@@ -42,12 +42,12 @@ impl<'a> UpdateOrMergeEntityBuilder<'a> {
     where
         E: Serialize,
     {
-        let url = self.entity_client.url();
+        let url = self.entity_client.url().clone();
 
         let request_body_serialized = serde_json::to_string(entity)?;
 
         let mut request = self.entity_client.prepare_request(
-            url.as_str(),
+            url,
             match self.operation {
                 Operation::Merge => crate::MERGE.to_owned(),
                 Operation::Update => Method::PUT,

sdk/storage/src/account/operations/find_blobs_by_tags.rs

@@ -41,7 +41,7 @@ impl FindBlobsByTagsBuilder {
             let mut request = self
                 .client
                 .storage_account_client()
-                .blob_storage_request(azure_core::Method::GET);
+                .blob_storage_request(azure_core::Method::GET)?;
 
             self.timeout.append_to_url_query(request.url_mut());
             request

sdk/storage/src/account/operations/get_account_information.rs

@@ -29,7 +29,7 @@ impl GetAccountInformationBuilder {
             let mut request = self
                 .client
                 .storage_account_client()
-                .blob_storage_request(azure_core::Method::GET);
+                .blob_storage_request(azure_core::Method::GET)?;
 
             for (k, v) in [("restype", "account"), ("comp", "properties")].iter() {
                 request.url_mut().query_pairs_mut().append_pair(k, v);

sdk/storage/src/authorization_policy.rs

@@ -42,8 +42,7 @@ impl Policy for AuthorizationPolicy {
                         request.method(),
                         account,
                         key,
-                        ctx.get()
-                            .expect("ServiceType must be in the Context at this point"),
+                        ctx.get().unwrap_or(&ServiceType::default()),
                     );
                     request.insert_header(AUTHORIZATION, auth)
                 }

sdk/storage/src/core/clients/storage_account_client.rs

@@ -59,6 +59,12 @@ pub enum ServiceType {
     Table,
 }
 
+impl Default for ServiceType {
+    fn default() -> Self {
+        Self::Blob
+    }
+}
+
 #[derive(Debug)]
 pub struct StorageAccountClient {
     storage_credentials: StorageCredentials,
@@ -178,14 +184,10 @@ impl StorageAccountClient {
         let key = key.into();
         let storage_credentials = StorageCredentials::Key(account.clone(), key.clone());
         let pipeline = new_pipeline_from_options(StorageOptions::new(), storage_credentials);
-        let blob_storage_url =
-            Url::parse(&format!("{}{}", blob_storage_url.as_str(), account)).unwrap();
-        let table_storage_url =
-            Url::parse(&format!("{}{}", table_storage_url.as_str(), account)).unwrap();
-        let queue_storage_url =
-            Url::parse(&format!("{}{}", queue_storage_url.as_str(), account)).unwrap();
-        let filesystem_url =
-            Url::parse(&format!("{}{}", filesystem_url.as_str(), account)).unwrap();
+        let blob_storage_url = Url::parse(&format!("{}{}", blob_storage_url, account)).unwrap();
+        let table_storage_url = Url::parse(&format!("{}{}", table_storage_url, account)).unwrap();
+        let queue_storage_url = Url::parse(&format!("{}{}", queue_storage_url, account)).unwrap();
+        let filesystem_url = Url::parse(&format!("{}{}", filesystem_url, account)).unwrap();
 
         Arc::new(Self {
             blob_storage_url,
@@ -420,27 +422,23 @@ impl StorageAccountClient {
 
     pub fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         service_type: ServiceType,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {
         let dt = chrono::Utc::now();
         let time = format!("{}", dt.format("%a, %d %h %Y %T GMT"));
 
-        let mut url = url::Url::parse(url).with_context(ErrorKind::DataConversion, || {
-            format!("failed to parse request url: {url}")
-        })?;
+        let mut request = Request::new(url, method);
 
         // if we have a SAS token (in form of query pairs), let's add it to the url here
         if let StorageCredentials::SASToken(query_pairs) = &self.storage_credentials {
             for (k, v) in query_pairs {
-                url.query_pairs_mut().append_pair(k, v);
+                request.url_mut().query_pairs_mut().append_pair(k, v);
             }
         }
 
-        let mut request = Request::new(url, method);
-
         // let's add content length to avoid "chunking" errors.
         match request_body {
             Some(ref b) => request.insert_header(CONTENT_LENGTH, b.len().to_string()),
@@ -509,8 +507,16 @@ impl StorageAccountClient {
     }
 
     /// Prepares' an `azure_core::Request`.
-    pub(crate) fn blob_storage_request(&self, http_method: azure_core::Method) -> Request {
-        Request::new(self.blob_storage_url().clone(), http_method)
+    pub(crate) fn blob_storage_request(
+        &self,
+        http_method: azure_core::Method,
+    ) -> azure_core::Result<Request> {
+        self.prepare_request(
+            self.blob_storage_url().clone(),
+            http_method,
+            ServiceType::Blob,
+            None,
+        )
     }
 }
 
@@ -544,7 +550,6 @@ fn add_if_exists<'a>(headers: &'a Headers, key: &HeaderName) -> &'a str {
     headers.get_as_str(key).unwrap_or_default()
 }
 
-#[allow(unknown_lints)]
 fn string_to_sign(
     headers: &Headers,
     url: &url::Url,

sdk/storage/src/core/clients/storage_client.rs

@@ -1,10 +1,10 @@
 use crate::core::clients::{ServiceType, StorageAccountClient};
 use crate::operations::*;
-use azure_core::Method;
 use azure_core::{
     error::{Error, ErrorKind},
     Context, Request, Response,
 };
+use azure_core::{Method, Url};
 use bytes::Bytes;
 use std::sync::Arc;
 
@@ -89,7 +89,7 @@ impl StorageClient {
 
     pub fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/storage_blobs/src/blob/operations/acquire_lease.rs

@@ -46,7 +46,7 @@ impl AcquireLeaseBuilder {
 
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::PUT, None)?;
+                    .prepare_request(url, azure_core::Method::PUT, None)?;
             request.insert_header(LEASE_ACTION, "acquire");
             request.add_mandatory_header(&self.lease_duration);
             request.add_optional_header(&self.proposed_lease_id);

sdk/storage_blobs/src/blob/operations/append_block.rs

@@ -44,7 +44,7 @@ impl AppendBlockBuilder {
             url.query_pairs_mut().append_pair("comp", "appendblock");
 
             let mut request = self.blob_client.prepare_request(
-                url.as_str(),
+                url,
                 azure_core::Method::PUT,
                 Some(self.body.clone()),
             )?;

sdk/storage_blobs/src/blob/operations/break_lease.rs

@@ -37,7 +37,7 @@ impl BreakLeaseBuilder {
 
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::PUT, None)?;
+                    .prepare_request(url, azure_core::Method::PUT, None)?;
             request.insert_header(LEASE_ACTION, "break");
             request.add_optional_header(&self.lease_break_period);
             request.add_optional_header(&self.lease_id);

sdk/storage_blobs/src/blob/operations/change_lease.rs

@@ -34,11 +34,9 @@ impl ChangeLeaseBuilder {
             url.query_pairs_mut().append_pair("comp", "lease");
             self.timeout.append_to_url_query(&mut url);
 
-            let mut request = self.blob_lease_client.prepare_request(
-                url.as_str(),
-                azure_core::Method::PUT,
-                None,
-            )?;
+            let mut request =
+                self.blob_lease_client
+                    .prepare_request(url, azure_core::Method::PUT, None)?;
             request.insert_header(LEASE_ACTION, "change");
             request.add_mandatory_header(self.blob_lease_client.lease_id());
             request.add_mandatory_header(&self.proposed_lease_id);

sdk/storage_blobs/src/blob/operations/clear_page.rs

@@ -49,7 +49,7 @@ impl ClearPageBuilder {
 
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::PUT, None)?;
+                    .prepare_request(url, azure_core::Method::PUT, None)?;
 
             request.insert_header(PAGE_WRITE, "clear");
             request.insert_header(BLOB_TYPE, "PageBlob");

sdk/storage_blobs/src/blob/operations/copy_blob.rs

@@ -68,7 +68,7 @@ impl CopyBlobBuilder {
             self.timeout.append_to_url_query(&mut url);
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::PUT, None)?;
+                    .prepare_request(url, azure_core::Method::PUT, None)?;
             request.insert_header(COPY_SOURCE, self.source_url.as_str().to_owned());
             if let Some(metadata) = &self.metadata {
                 for m in metadata.iter() {

sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs

@@ -72,7 +72,7 @@ impl CopyBlobFromUrlBuilder {
 
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::PUT, None)?;
+                    .prepare_request(url, azure_core::Method::PUT, None)?;
             request.insert_header(COPY_SOURCE, self.source_url.to_string());
             request.insert_header(REQUIRES_SYNC, format!("{}", self.is_synchronous));
             if let Some(metadata) = &self.metadata {

sdk/storage_blobs/src/blob/operations/delete_blob.rs

@@ -36,7 +36,7 @@ impl DeleteBlobBuilder {
 
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::DELETE, None)?;
+                    .prepare_request(url, azure_core::Method::DELETE, None)?;
             request.add_optional_header(&self.lease_id);
             request.add_mandatory_header(&self.delete_snapshots_method);
 

sdk/storage_blobs/src/blob/operations/delete_blob_snapshot.rs

@@ -41,7 +41,7 @@ impl DeleteBlobSnapshotBuilder {
 
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::DELETE, None)?;
+                    .prepare_request(url, azure_core::Method::DELETE, None)?;
             request.add_optional_header(&self.lease_id);
 
             let response = self

sdk/storage_blobs/src/blob/operations/delete_blob_version.rs

@@ -41,7 +41,7 @@ impl DeleteBlobVersionBuilder {
 
             let mut request =
                 self.blob_client
-                    .prepare_request(url.as_str(), azure_core::Method::DELETE, None)?;
+                    .prepare_request(url, azure_core::Method::DELETE, None)?;
             request.add_optional_header(&self.lease_id);
 
             let response = self