Skip to content
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
45 changes: 27 additions & 18 deletions sdk/storage_datalake/src/operations/path_delete.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::clients::PathClient;
use crate::request_options::*;
use azure_core::{prelude::*, Request};
use azure_core::{prelude::*, Pageable, Request};
use azure_core::{AppendToUrlQuery, Response as HttpResponse};
use azure_storage::headers::CommonStorageResponseHeaders;
use std::convert::TryInto;
Expand All @@ -15,27 +15,29 @@ operation! {
}

impl<C: PathClient + 'static> DeletePathBuilder<C> {
pub fn into_future(self) -> DeletePath {
Box::pin(async move {
let mut url = self.client.url()?;
pub fn into_stream(self) -> Pageable<DeletePathResponse, azure_core::error::Error> {
let make_request = move |continuation: Option<NextMarker>| {
let this = self.clone();
let mut ctx = self.context.clone();

if let Some(continuation) = self.continuation {
continuation.append_to_url_query_as_continuation(&mut url);
};
self.recursive.append_to_url_query(&mut url);
async move {
let mut url = this.client.url()?;

let mut request = Request::new(url, azure_core::Method::Delete);
let continuation = continuation.or_else(|| this.continuation.clone());
if let Some(continuation) = continuation {
continuation.append_to_url_query_as_continuation(&mut url);
};
this.recursive.append_to_url_query(&mut url);

request.insert_headers(&self.if_match_condition);
request.insert_headers(&self.if_modified_since);
let mut request = Request::new(url, azure_core::Method::Delete);

let response = self
.client
.send(&mut self.context.clone(), &mut request)
.await?;

DeletePathResponse::try_from(response).await
})
request.insert_headers(&this.if_match_condition);
request.insert_headers(&this.if_modified_since);
let response = this.client.send(&mut ctx, &mut request).await?;
DeletePathResponse::try_from(response).await
}
};
Pageable::new(make_request)
}
}

Expand All @@ -55,3 +57,10 @@ impl DeletePathResponse {
})
}
}

impl Continuable for DeletePathResponse {
type Continuation = NextMarker;
fn continuation(&self) -> Option<Self::Continuation> {
self.continuation.clone()
}
}
6 changes: 5 additions & 1 deletion sdk/storage_datalake/tests/files.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use azure_storage_datalake::Properties;
use futures::StreamExt;
use std::{assert_eq, assert_ne};

mod setup;
Expand Down Expand Up @@ -32,7 +33,10 @@ async fn file_create_delete() -> azure_core::Result<()> {

file_client.create().await?;

file_client.delete().await?;
let mut stream = file_client.delete().into_stream();
while let Some(result) = stream.next().await {
result?;
}

file_system_client.delete().await?;

Expand Down