Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Context setters in storage_queues crate #866

Merged
merged 1 commit into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions sdk/storage/src/core/clients/storage_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<url::Url>
where
I: IntoIterator<Item = &'a str>,
{
{
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<url::Url>
where
I: IntoIterator<Item = &'a str>,
Expand Down Expand Up @@ -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<url::Url>
where
I: IntoIterator<Item = &'a str>,
{
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)
}
}
1 change: 0 additions & 1 deletion sdk/storage_queues/src/clients/queue_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ impl QueueClient {
}

/// Get the queue metadata.

pub fn get_metadata(&self) -> GetQueueMetadataBuilder {
GetQueueMetadataBuilder::new(self.clone())
}
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage_queues/src/clients/queue_service_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
/// <https://docs.microsoft.com/rest/api/storageservices/set-queue-service-properties>
pub fn set_queue_service_properties(
&self,
properties: QueueServiceProperties,
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/clear_messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ impl ClearMessagesBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/create_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/delete_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ impl DeleteMessageBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/delete_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ impl DeleteQueueBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/get_messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/get_queue_acl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ impl GetQueueACLBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/get_queue_metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ impl GetQueueMetadataBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ impl GetQueueServicePropertiesBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ impl GetQueueServiceStatsBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/list_queues.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<ListQueuesResponse, Error> {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/peek_messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/put_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/set_queue_acl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ impl SetQueueACLBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/set_queue_metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ impl SetQueueMetadataBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ impl SetQueueServicePropertiesBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down
1 change: 1 addition & 0 deletions sdk/storage_queues/src/operations/update_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ impl UpdateMessageBuilder {

setters! {
timeout: Timeout => Some(timeout),
context: Context => context,
}

pub fn into_future(mut self) -> Response {
Expand Down