Skip to content

specify additional conditional headers for blob & container operations #951

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 21, 2022
Merged

specify additional conditional headers for blob & container operations #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
467661e
specify additional conditional headers for blob & container operations
Jul 20, 2022
434e2bc
fmt
Jul 20, 2022
097c55e
address clippy
Jul 20, 2022
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
2 changes: 1 addition & 1 deletion sdk/storage_blobs/examples/put_page_blob_00.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ async fn main() -> azure_core::Result<()> {
let res = blob_client
.put_page(BA512Range::new(512, 1023)?, slice)
.hash(digest)
.sequence_number_condition(SequenceNumberCondition::Equal(100))
.if_sequence_number(SequenceNumberCondition::Equal(100))
.into_future()
.await?;
println!("update sequence number condition == {:?}", res);
Expand Down
5 changes: 5 additions & 0 deletions sdk/storage_blobs/src/blob/operations/append_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ operation! {
?hash: Hash,
?condition_max_size: ConditionMaxSize,
?condition_append_position: ConditionAppendPosition,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tag: IfTagsCondition,
?lease_id: LeaseId
}

Expand All @@ -22,6 +25,8 @@ impl AppendBlockBuilder {
headers.add(self.hash);
headers.add(self.condition_max_size);
headers.add(self.condition_append_position);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.lease_id);

let mut request = self.client.finalize_request(
Expand Down
12 changes: 6 additions & 6 deletions sdk/storage_blobs/src/blob/operations/clear_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ operation! {
ClearPage,
client: BlobClient,
ba512_range: BA512Range,
?sequence_number_condition: SequenceNumberCondition,
?if_modified_since_condition: IfModifiedSinceCondition,
?if_match_condition: IfMatchCondition,
?if_sequence_number: SequenceNumberCondition,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?lease_id: LeaseId
}

Expand All @@ -27,9 +27,9 @@ impl ClearPageBuilder {
headers.insert(PAGE_WRITE, "clear");
headers.insert(BLOB_TYPE, "PageBlob");
headers.add(self.ba512_range);
headers.add(self.sequence_number_condition);
headers.add(self.if_modified_since_condition);
headers.add(self.if_match_condition);
headers.add(self.if_sequence_number);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if we could figure out how to apply these headers without having to write this code over and over in different operations.

headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.lease_id);

let mut request =
Expand Down
21 changes: 11 additions & 10 deletions sdk/storage_blobs/src/blob/operations/copy_blob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ operation! {
client: BlobClient,
source_url: Url,
?metadata: Metadata,
?sequence_number_condition: SequenceNumberCondition,
?if_modified_since_condition: IfModifiedSinceCondition,
?if_match_condition: IfMatchCondition,
?if_sequence_number: SequenceNumberCondition,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?access_tier: AccessTier,
?lease_id: LeaseId,
?if_source_since_condition: IfSourceModifiedSinceCondition,
?if_source_match_condition: IfSourceMatchCondition,
?if_source_since: IfSourceModifiedSinceCondition,
?if_source_match: IfSourceMatchCondition,
?source_lease_id: SourceLeaseId,
?rehydrate_priority: RehydratePriority
}
Expand All @@ -36,13 +37,13 @@ impl CopyBlobBuilder {
headers.add(m);
}
}
headers.add(self.sequence_number_condition);
headers.add(self.if_modified_since_condition);
headers.add(self.if_match_condition);
headers.add(self.if_sequence_number);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.access_tier);
headers.add(self.lease_id);
headers.add(self.if_source_since_condition);
headers.add(self.if_source_match_condition);
headers.add(self.if_source_since);
headers.add(self.if_source_match);
headers.add(self.source_lease_id);
headers.add(
self.rehydrate_priority
Expand Down
16 changes: 8 additions & 8 deletions sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ operation! {
source_url: Url,
?is_synchronous: bool,
?metadata: Metadata,
?if_modified_since_condition: IfModifiedSinceCondition,
?if_match_condition: IfMatchCondition,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_source_since: IfSourceModifiedSinceCondition,
?if_source_match: IfSourceMatchCondition,
?lease_id: LeaseId,
?if_source_since_condition: IfSourceModifiedSinceCondition,
?if_source_match_condition: IfSourceMatchCondition,
?source_content_md5: SourceContentMD5
}

Expand All @@ -42,11 +42,11 @@ impl CopyBlobFromUrlBuilder {
headers.add(m);
}
}
headers.add(self.if_modified_since_condition);
headers.add(self.if_match_condition);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.lease_id);
headers.add(self.if_source_since_condition);
headers.add(self.if_source_match_condition);
headers.add(self.if_source_since);
headers.add(self.if_source_match);
headers.add(self.source_content_md5);

let mut request =
Expand Down
6 changes: 6 additions & 0 deletions sdk/storage_blobs/src/blob/operations/delete_blob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ use chrono::{DateTime, Utc};
operation! {
DeleteBlob,
client: BlobClient,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?delete_snapshots_method: DeleteSnapshotsMethod,
?lease_id: LeaseId
}
Expand All @@ -20,6 +23,9 @@ impl DeleteBlobBuilder {
self.delete_snapshots_method
.unwrap_or(DeleteSnapshotsMethod::Include),
);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.if_tags);

let mut request =
self.client
Expand Down
8 changes: 7 additions & 1 deletion sdk/storage_blobs/src/blob/operations/get_blob.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ operation! {
?range: Range,
?blob_versioning: BlobVersioning,
?lease_id: LeaseId,
?chunk_size: u64
?chunk_size: u64,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
}

impl GetBlobBuilder {
Expand All @@ -41,6 +44,9 @@ impl GetBlobBuilder {
}

headers.add(this.lease_id);
headers.add(this.if_modified_since);
headers.add(this.if_match.clone());
headers.add(this.if_tags.clone());

let mut request =
this.client
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage_blobs/src/blob/operations/get_block_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use std::str::from_utf8;
operation! {
GetBlockList,
client: BlobClient,
?if_tags: IfTagsCondition,
?block_list_type: BlockListType,
?blob_versioning: BlobVersioning,
?lease_id: LeaseId
Expand All @@ -28,6 +29,7 @@ impl GetBlockListBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_tags);

let mut request =
self.client
Expand Down
6 changes: 6 additions & 0 deletions sdk/storage_blobs/src/blob/operations/get_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ use std::convert::{TryFrom, TryInto};
operation! {
GetMetadata,
client: BlobClient,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?blob_versioning: BlobVersioning,
?lease_id: LeaseId
}
Expand All @@ -20,6 +23,9 @@ impl GetMetadataBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.if_tags);

let mut request = self
.client
Expand Down
6 changes: 6 additions & 0 deletions sdk/storage_blobs/src/blob/operations/get_page_ranges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ use std::str::from_utf8;
operation! {
GetPageRanges,
client: BlobClient,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?blob_versioning: BlobVersioning,
?lease_id: LeaseId
}
Expand All @@ -20,6 +23,9 @@ impl GetPageRangesBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.if_tags);

let mut request =
self.client
Expand Down
6 changes: 6 additions & 0 deletions sdk/storage_blobs/src/blob/operations/get_properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ use chrono::{DateTime, Utc};
operation! {
GetProperties,
client: BlobClient,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?blob_versioning: BlobVersioning,
?lease_id: LeaseId
}
Expand All @@ -18,6 +21,9 @@ impl GetPropertiesBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.if_tags);

let mut request =
self.client
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage_blobs/src/blob/operations/get_tags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use chrono::{DateTime, Utc};
operation! {
GetTags,
client: BlobClient,
?if_tags: IfTagsCondition,
?blob_versioning: BlobVersioning,
?lease_id: LeaseId
}
Expand All @@ -21,6 +22,7 @@ impl GetTagsBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_tags);

let mut request =
self.client
Expand Down
14 changes: 8 additions & 6 deletions sdk/storage_blobs/src/blob/operations/put_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ operation! {
ba512_range: BA512Range,
content: Body,
?hash: Hash,
?sequence_number_condition: SequenceNumberCondition,
?if_modified_since_condition: IfModifiedSinceCondition,
?if_match_condition: IfMatchCondition,
?if_sequence_number: SequenceNumberCondition,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?lease_id: LeaseId
}

Expand All @@ -26,10 +27,11 @@ impl PutPageBuilder {
headers.insert(PAGE_WRITE, "update");
headers.insert(BLOB_TYPE, "PageBlob");
headers.add(self.ba512_range);
headers.add(self.sequence_number_condition);
headers.add(self.hash);
headers.add(self.if_modified_since_condition);
headers.add(self.if_match_condition);
headers.add(self.if_sequence_number);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.if_tags);
headers.add(self.lease_id);

let mut request = self.client.finalize_request(
Expand Down
6 changes: 6 additions & 0 deletions sdk/storage_blobs/src/blob/operations/set_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ use std::convert::{TryFrom, TryInto};
operation! {
SetMetadata,
client: BlobClient,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?lease_id: LeaseId,
?metadata: Metadata
}
Expand All @@ -19,6 +22,9 @@ impl SetMetadataBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.if_tags);
if let Some(metadata) = &self.metadata {
for m in metadata.iter() {
headers.add(m);
Expand Down
6 changes: 6 additions & 0 deletions sdk/storage_blobs/src/blob/operations/set_properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ use std::convert::{TryFrom, TryInto};
operation! {
SetProperties,
client: BlobClient,
?if_modified_since: IfModifiedSinceCondition,
?if_match: IfMatchCondition,
?if_tags: IfTagsCondition,
?lease_id: LeaseId,
?cache_control: BlobCacheControl,
?content_type: BlobContentType,
Expand Down Expand Up @@ -60,6 +63,9 @@ impl SetPropertiesBuilder {
headers.add(self.content_language);
headers.add(self.content_disposition);
headers.add(self.content_md5);
headers.add(self.if_modified_since);
headers.add(self.if_match);
headers.add(self.if_tags);

let mut request = self
.client
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage_blobs/src/blob/operations/set_tags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ operation! {
SetTags,
client: BlobClient,
tags: Tags,
?if_tags: IfTagsCondition,
?lease_id: LeaseId
}

Expand All @@ -23,6 +24,7 @@ impl SetTagsBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_tags);
let body = self.tags.to_xml()?;

let mut request =
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage_blobs/src/container/operations/acquire_lease.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ operation! {
AcquireLease,
client: ContainerClient,
lease_duration: LeaseDuration,
?if_modified_since: IfModifiedSinceCondition,
?lease_id: LeaseId,
?proposed_lease_id: ProposedLeaseId
}
Expand All @@ -24,6 +25,7 @@ impl AcquireLeaseBuilder {
headers.add(self.lease_duration);
headers.add(self.lease_id);
headers.add(self.proposed_lease_id);
headers.add(self.if_modified_since);

let mut request = self
.client
Expand Down
4 changes: 3 additions & 1 deletion sdk/storage_blobs/src/container/operations/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ use azure_core::{headers::Headers, prelude::*, Method};
operation! {
Delete,
client: ContainerClient,
?lease_id: LeaseId
?lease_id: LeaseId,
?if_modified_since: IfModifiedSinceCondition
}

impl DeleteBuilder {
Expand All @@ -16,6 +17,7 @@ impl DeleteBuilder {

let mut headers = Headers::new();
headers.add(self.lease_id);
headers.add(self.if_modified_since);

let mut request = self
.client
Expand Down
2 changes: 2 additions & 0 deletions sdk/storage_blobs/src/container/operations/set_acl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ operation! {
SetACL,
client: ContainerClient,
public_access: PublicAccess,
?if_modified_since: IfModifiedSinceCondition,
?stored_access_policy_list: StoredAccessPolicyList,
?lease_id: LeaseId
}
Expand All @@ -25,6 +26,7 @@ impl SetACLBuilder {
headers.insert(name, value);
}
headers.add(self.lease_id);
headers.add(self.if_modified_since);

let mut request =
self.client
Expand Down
Loading