From 249f53bb0e9e07378fb119e8aed8a3f47083b76e Mon Sep 17 00:00:00 2001 From: Ryan Levick Date: Tue, 28 Jun 2022 15:01:18 +0200 Subject: [PATCH] Context setters in storage_queues crate --- .../src/core/clients/storage_client.rs | 33 +++++++++---------- .../src/clients/queue_client.rs | 1 - .../src/clients/queue_service_client.rs | 4 +-- .../src/operations/clear_messages.rs | 1 + .../src/operations/create_queue.rs | 1 + .../src/operations/delete_message.rs | 1 + .../src/operations/delete_queue.rs | 1 + .../src/operations/get_messages.rs | 1 + .../src/operations/get_queue_acl.rs | 1 + .../src/operations/get_queue_metadata.rs | 1 + .../get_queue_service_properties.rs | 1 + .../src/operations/get_queue_service_stats.rs | 1 + .../src/operations/list_queues.rs | 1 + sdk/storage_queues/src/operations/mod.rs | 1 + .../src/operations/peek_messages.rs | 1 + .../src/operations/put_message.rs | 1 + .../src/operations/set_queue_acl.rs | 1 + .../src/operations/set_queue_metadata.rs | 1 + .../set_queue_service_properties.rs | 1 + .../src/operations/update_message.rs | 1 + 20 files changed, 34 insertions(+), 21 deletions(-) diff --git a/sdk/storage/src/core/clients/storage_client.rs b/sdk/storage/src/core/clients/storage_client.rs index b2b6d67fee..1fe393d6c2 100644 --- a/sdk/storage/src/core/clients/storage_client.rs +++ b/sdk/storage/src/core/clients/storage_client.rs @@ -40,24 +40,6 @@ impl StorageClient { self.storage_account_client.http_client() } - fn url_with_segments<'a, I>(mut url: url::Url, segments: I) -> azure_core::Result - where - I: IntoIterator, - { - { - let original_url = url.clone(); - let mut segs = url.path_segments_mut().map_err(|_| { - Error::with_message(ErrorKind::DataConversion, || { - format!("failed to parse url path segments. url: {original_url}") - }) - })?; - for segment in segments.into_iter() { - segs.push(segment); - } - } - Ok(url) - } - pub fn blob_url_with_segments<'a, I>(&'a self, segments: I) -> azure_core::Result where I: IntoIterator, @@ -107,4 +89,19 @@ impl StorageClient { .send(context, request, service_type) .await } + + fn url_with_segments<'a, I>(mut url: url::Url, new_segements: I) -> azure_core::Result + where + I: IntoIterator, + { + let original_url = url.clone(); + { + let mut segements = url.path_segments_mut().map_err(|_| { + let message = format!("failed to parse url path segments from '{original_url}'"); + Error::message(ErrorKind::DataConversion, message) + })?; + segements.extend(new_segements); + } + Ok(url) + } } diff --git a/sdk/storage_queues/src/clients/queue_client.rs b/sdk/storage_queues/src/clients/queue_client.rs index 4b317503fb..deee7ffaf2 100644 --- a/sdk/storage_queues/src/clients/queue_client.rs +++ b/sdk/storage_queues/src/clients/queue_client.rs @@ -84,7 +84,6 @@ impl QueueClient { } /// Get the queue metadata. - pub fn get_metadata(&self) -> GetQueueMetadataBuilder { GetQueueMetadataBuilder::new(self.clone()) } diff --git a/sdk/storage_queues/src/clients/queue_service_client.rs b/sdk/storage_queues/src/clients/queue_service_client.rs index 3a91463460..a7470332fb 100644 --- a/sdk/storage_queues/src/clients/queue_service_client.rs +++ b/sdk/storage_queues/src/clients/queue_service_client.rs @@ -41,8 +41,8 @@ impl QueueServiceClient { /// Set queue service properties. /// - /// More info here - /// [https://docs.microsoft.com/rest/api/storageservices/set-queue-service-properties](https://docs.microsoft.com/rest/api/storageservices/set-queue-service-properties). + /// More info here: + /// pub fn set_queue_service_properties( &self, properties: QueueServiceProperties, diff --git a/sdk/storage_queues/src/operations/clear_messages.rs b/sdk/storage_queues/src/operations/clear_messages.rs index f925d71e4a..6f2bd38474 100644 --- a/sdk/storage_queues/src/operations/clear_messages.rs +++ b/sdk/storage_queues/src/operations/clear_messages.rs @@ -21,6 +21,7 @@ impl ClearMessagesBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/create_queue.rs b/sdk/storage_queues/src/operations/create_queue.rs index 210081f6de..ed5c7b656d 100644 --- a/sdk/storage_queues/src/operations/create_queue.rs +++ b/sdk/storage_queues/src/operations/create_queue.rs @@ -24,6 +24,7 @@ impl CreateQueueBuilder { setters! { metadata: Metadata => Some(metadata), timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/delete_message.rs b/sdk/storage_queues/src/operations/delete_message.rs index c239d9b137..99b4f66f8c 100644 --- a/sdk/storage_queues/src/operations/delete_message.rs +++ b/sdk/storage_queues/src/operations/delete_message.rs @@ -21,6 +21,7 @@ impl DeleteMessageBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/delete_queue.rs b/sdk/storage_queues/src/operations/delete_queue.rs index 2efcbf2286..5eb1b1f2d3 100644 --- a/sdk/storage_queues/src/operations/delete_queue.rs +++ b/sdk/storage_queues/src/operations/delete_queue.rs @@ -21,6 +21,7 @@ impl DeleteQueueBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/get_messages.rs b/sdk/storage_queues/src/operations/get_messages.rs index 4eb05113af..6af49c82f8 100644 --- a/sdk/storage_queues/src/operations/get_messages.rs +++ b/sdk/storage_queues/src/operations/get_messages.rs @@ -29,6 +29,7 @@ impl GetMessagesBuilder { number_of_messages: NumberOfMessages => Some(number_of_messages), visibility_timeout: VisibilityTimeout => Some(visibility_timeout), timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/get_queue_acl.rs b/sdk/storage_queues/src/operations/get_queue_acl.rs index cc62b28838..a0d66ddc19 100644 --- a/sdk/storage_queues/src/operations/get_queue_acl.rs +++ b/sdk/storage_queues/src/operations/get_queue_acl.rs @@ -21,6 +21,7 @@ impl GetQueueACLBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/get_queue_metadata.rs b/sdk/storage_queues/src/operations/get_queue_metadata.rs index 0056778f81..bbb97ff8a5 100644 --- a/sdk/storage_queues/src/operations/get_queue_metadata.rs +++ b/sdk/storage_queues/src/operations/get_queue_metadata.rs @@ -21,6 +21,7 @@ impl GetQueueMetadataBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/get_queue_service_properties.rs b/sdk/storage_queues/src/operations/get_queue_service_properties.rs index c48fdb12fc..f1fb627644 100644 --- a/sdk/storage_queues/src/operations/get_queue_service_properties.rs +++ b/sdk/storage_queues/src/operations/get_queue_service_properties.rs @@ -21,6 +21,7 @@ impl GetQueueServicePropertiesBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/get_queue_service_stats.rs b/sdk/storage_queues/src/operations/get_queue_service_stats.rs index c7deee6a3c..3ae311ae8b 100644 --- a/sdk/storage_queues/src/operations/get_queue_service_stats.rs +++ b/sdk/storage_queues/src/operations/get_queue_service_stats.rs @@ -27,6 +27,7 @@ impl GetQueueServiceStatsBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/list_queues.rs b/sdk/storage_queues/src/operations/list_queues.rs index 0812f81157..739dd8830f 100644 --- a/sdk/storage_queues/src/operations/list_queues.rs +++ b/sdk/storage_queues/src/operations/list_queues.rs @@ -33,6 +33,7 @@ impl ListQueuesBuilder { max_results: MaxResults => Some(max_results), include_metadata: bool => include_metadata, timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_stream(self) -> Pageable { diff --git a/sdk/storage_queues/src/operations/mod.rs b/sdk/storage_queues/src/operations/mod.rs index 1fc90e2aa2..74fe7d37a4 100644 --- a/sdk/storage_queues/src/operations/mod.rs +++ b/sdk/storage_queues/src/operations/mod.rs @@ -14,6 +14,7 @@ mod set_queue_acl; mod set_queue_metadata; mod set_queue_service_properties; mod update_message; + pub use clear_messages::ClearMessagesBuilder; pub use create_queue::CreateQueueBuilder; pub use delete_message::DeleteMessageBuilder; diff --git a/sdk/storage_queues/src/operations/peek_messages.rs b/sdk/storage_queues/src/operations/peek_messages.rs index f49d46bc6e..3e5d6fec8a 100644 --- a/sdk/storage_queues/src/operations/peek_messages.rs +++ b/sdk/storage_queues/src/operations/peek_messages.rs @@ -28,6 +28,7 @@ impl PeekMessagesBuilder { setters! { number_of_messages: NumberOfMessages => Some(number_of_messages), timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/put_message.rs b/sdk/storage_queues/src/operations/put_message.rs index 0f62b3762d..dfc9badc19 100644 --- a/sdk/storage_queues/src/operations/put_message.rs +++ b/sdk/storage_queues/src/operations/put_message.rs @@ -33,6 +33,7 @@ impl PutMessageBuilder { visibility_timeout: VisibilityTimeout => Some(visibility_timeout), ttl: MessageTTL => Some(ttl), timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/set_queue_acl.rs b/sdk/storage_queues/src/operations/set_queue_acl.rs index ec55d4789b..77f5ef7cf5 100644 --- a/sdk/storage_queues/src/operations/set_queue_acl.rs +++ b/sdk/storage_queues/src/operations/set_queue_acl.rs @@ -23,6 +23,7 @@ impl SetQueueACLBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/set_queue_metadata.rs b/sdk/storage_queues/src/operations/set_queue_metadata.rs index 2a3cdc43c0..14914ade89 100644 --- a/sdk/storage_queues/src/operations/set_queue_metadata.rs +++ b/sdk/storage_queues/src/operations/set_queue_metadata.rs @@ -23,6 +23,7 @@ impl SetQueueMetadataBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/set_queue_service_properties.rs b/sdk/storage_queues/src/operations/set_queue_service_properties.rs index 2c70ec03d8..40a55c4d4e 100644 --- a/sdk/storage_queues/src/operations/set_queue_service_properties.rs +++ b/sdk/storage_queues/src/operations/set_queue_service_properties.rs @@ -30,6 +30,7 @@ impl SetQueueServicePropertiesBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response { diff --git a/sdk/storage_queues/src/operations/update_message.rs b/sdk/storage_queues/src/operations/update_message.rs index e2a079ea01..d0d48a200c 100644 --- a/sdk/storage_queues/src/operations/update_message.rs +++ b/sdk/storage_queues/src/operations/update_message.rs @@ -35,6 +35,7 @@ impl UpdateMessageBuilder { setters! { timeout: Timeout => Some(timeout), + context: Context => context, } pub fn into_future(mut self) -> Response {