From 467661e48e2352b8de179d3d7b91e6a6e04732de Mon Sep 17 00:00:00 2001 From: Brian Caswell Date: Wed, 20 Jul 2022 14:22:27 -0400 Subject: [PATCH 1/3] specify additional conditional headers for blob & container operations Ref: https://docs.microsoft.com/en-us/rest/api/storageservices/specifying-conditional-headers-for-blob-service-operations --- .../examples/put_page_blob_00.rs | 2 +- .../src/blob/operations/append_block.rs | 5 ++++ .../src/blob/operations/clear_page.rs | 12 ++++----- .../src/blob/operations/copy_blob.rs | 21 ++++++++------- .../src/blob/operations/copy_blob_from_url.rs | 16 ++++++------ .../src/blob/operations/delete_blob.rs | 6 +++++ .../src/blob/operations/get_blob.rs | 8 +++++- .../src/blob/operations/get_block_list.rs | 2 ++ .../src/blob/operations/get_metadata.rs | 6 +++++ .../src/blob/operations/get_page_ranges.rs | 6 +++++ .../src/blob/operations/get_properties.rs | 6 +++++ .../src/blob/operations/get_tags.rs | 2 ++ .../src/blob/operations/put_page.rs | 14 +++++----- .../src/blob/operations/set_metadata.rs | 6 +++++ .../src/blob/operations/set_properties.rs | 6 +++++ .../src/blob/operations/set_tags.rs | 2 ++ .../src/container/operations/acquire_lease.rs | 2 ++ .../src/container/operations/delete.rs | 4 ++- .../src/container/operations/set_acl.rs | 2 ++ .../src/options/condition_tags.rs | 26 +++++++++++++++++++ sdk/storage_blobs/src/options/mod.rs | 2 ++ 21 files changed, 123 insertions(+), 33 deletions(-) create mode 100644 sdk/storage_blobs/src/options/condition_tags.rs diff --git a/sdk/storage_blobs/examples/put_page_blob_00.rs b/sdk/storage_blobs/examples/put_page_blob_00.rs index 269b21ce9e..c51c01dfe7 100644 --- a/sdk/storage_blobs/examples/put_page_blob_00.rs +++ b/sdk/storage_blobs/examples/put_page_blob_00.rs @@ -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); diff --git a/sdk/storage_blobs/src/blob/operations/append_block.rs b/sdk/storage_blobs/src/blob/operations/append_block.rs index c1c410396f..15ebe4ed28 100644 --- a/sdk/storage_blobs/src/blob/operations/append_block.rs +++ b/sdk/storage_blobs/src/blob/operations/append_block.rs @@ -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 } @@ -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( diff --git a/sdk/storage_blobs/src/blob/operations/clear_page.rs b/sdk/storage_blobs/src/blob/operations/clear_page.rs index 9c3167ae03..2b68cc621a 100644 --- a/sdk/storage_blobs/src/blob/operations/clear_page.rs +++ b/sdk/storage_blobs/src/blob/operations/clear_page.rs @@ -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 } @@ -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); + headers.add(self.if_modified_since); + headers.add(self.if_match); headers.add(self.lease_id); let mut request = diff --git a/sdk/storage_blobs/src/blob/operations/copy_blob.rs b/sdk/storage_blobs/src/blob/operations/copy_blob.rs index b584e2c19d..6ef87606f6 100644 --- a/sdk/storage_blobs/src/blob/operations/copy_blob.rs +++ b/sdk/storage_blobs/src/blob/operations/copy_blob.rs @@ -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 } @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs b/sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs index d06a407a5f..422f0ecfd0 100644 --- a/sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs +++ b/sdk/storage_blobs/src/blob/operations/copy_blob_from_url.rs @@ -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 } @@ -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 = diff --git a/sdk/storage_blobs/src/blob/operations/delete_blob.rs b/sdk/storage_blobs/src/blob/operations/delete_blob.rs index 3cc9636891..df0894b47a 100644 --- a/sdk/storage_blobs/src/blob/operations/delete_blob.rs +++ b/sdk/storage_blobs/src/blob/operations/delete_blob.rs @@ -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 } @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/get_blob.rs b/sdk/storage_blobs/src/blob/operations/get_blob.rs index 323c0302fe..e03faef2cf 100644 --- a/sdk/storage_blobs/src/blob/operations/get_blob.rs +++ b/sdk/storage_blobs/src/blob/operations/get_blob.rs @@ -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 { @@ -41,6 +44,9 @@ impl GetBlobBuilder { } headers.add(this.lease_id); + headers.add(this.if_modified_since.clone()); + headers.add(this.if_match.clone()); + headers.add(this.if_tags.clone()); let mut request = this.client diff --git a/sdk/storage_blobs/src/blob/operations/get_block_list.rs b/sdk/storage_blobs/src/blob/operations/get_block_list.rs index e8f36ccf05..a13a090fba 100644 --- a/sdk/storage_blobs/src/blob/operations/get_block_list.rs +++ b/sdk/storage_blobs/src/blob/operations/get_block_list.rs @@ -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 @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/get_metadata.rs b/sdk/storage_blobs/src/blob/operations/get_metadata.rs index cc092efb4c..507381ce9c 100644 --- a/sdk/storage_blobs/src/blob/operations/get_metadata.rs +++ b/sdk/storage_blobs/src/blob/operations/get_metadata.rs @@ -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 } @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/get_page_ranges.rs b/sdk/storage_blobs/src/blob/operations/get_page_ranges.rs index 9f68f04493..448dbc4d60 100644 --- a/sdk/storage_blobs/src/blob/operations/get_page_ranges.rs +++ b/sdk/storage_blobs/src/blob/operations/get_page_ranges.rs @@ -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 } @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/get_properties.rs b/sdk/storage_blobs/src/blob/operations/get_properties.rs index eeb1d3ffc8..81145b811d 100644 --- a/sdk/storage_blobs/src/blob/operations/get_properties.rs +++ b/sdk/storage_blobs/src/blob/operations/get_properties.rs @@ -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 } @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/get_tags.rs b/sdk/storage_blobs/src/blob/operations/get_tags.rs index 519a5210d9..cba733d9c9 100644 --- a/sdk/storage_blobs/src/blob/operations/get_tags.rs +++ b/sdk/storage_blobs/src/blob/operations/get_tags.rs @@ -6,6 +6,7 @@ use chrono::{DateTime, Utc}; operation! { GetTags, client: BlobClient, + ?if_tags: IfTagsCondition, ?blob_versioning: BlobVersioning, ?lease_id: LeaseId } @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/put_page.rs b/sdk/storage_blobs/src/blob/operations/put_page.rs index 328d0880fc..ae039f9ed2 100644 --- a/sdk/storage_blobs/src/blob/operations/put_page.rs +++ b/sdk/storage_blobs/src/blob/operations/put_page.rs @@ -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 } @@ -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( diff --git a/sdk/storage_blobs/src/blob/operations/set_metadata.rs b/sdk/storage_blobs/src/blob/operations/set_metadata.rs index f29555e87b..3e904d442f 100644 --- a/sdk/storage_blobs/src/blob/operations/set_metadata.rs +++ b/sdk/storage_blobs/src/blob/operations/set_metadata.rs @@ -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 } @@ -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); diff --git a/sdk/storage_blobs/src/blob/operations/set_properties.rs b/sdk/storage_blobs/src/blob/operations/set_properties.rs index 636e4d73c6..a0075cd50c 100644 --- a/sdk/storage_blobs/src/blob/operations/set_properties.rs +++ b/sdk/storage_blobs/src/blob/operations/set_properties.rs @@ -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, @@ -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 diff --git a/sdk/storage_blobs/src/blob/operations/set_tags.rs b/sdk/storage_blobs/src/blob/operations/set_tags.rs index f23fa1bc87..6349013afd 100644 --- a/sdk/storage_blobs/src/blob/operations/set_tags.rs +++ b/sdk/storage_blobs/src/blob/operations/set_tags.rs @@ -11,6 +11,7 @@ operation! { SetTags, client: BlobClient, tags: Tags, + ?if_tags: IfTagsCondition, ?lease_id: LeaseId } @@ -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 = diff --git a/sdk/storage_blobs/src/container/operations/acquire_lease.rs b/sdk/storage_blobs/src/container/operations/acquire_lease.rs index ba8325b62c..80557acd4e 100644 --- a/sdk/storage_blobs/src/container/operations/acquire_lease.rs +++ b/sdk/storage_blobs/src/container/operations/acquire_lease.rs @@ -7,6 +7,7 @@ operation! { AcquireLease, client: ContainerClient, lease_duration: LeaseDuration, + ?if_modified_since: IfModifiedSinceCondition, ?lease_id: LeaseId, ?proposed_lease_id: ProposedLeaseId } @@ -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 diff --git a/sdk/storage_blobs/src/container/operations/delete.rs b/sdk/storage_blobs/src/container/operations/delete.rs index 71587dcd1a..49436eba54 100644 --- a/sdk/storage_blobs/src/container/operations/delete.rs +++ b/sdk/storage_blobs/src/container/operations/delete.rs @@ -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 { @@ -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 diff --git a/sdk/storage_blobs/src/container/operations/set_acl.rs b/sdk/storage_blobs/src/container/operations/set_acl.rs index 1e5e5fa611..5da31d8937 100644 --- a/sdk/storage_blobs/src/container/operations/set_acl.rs +++ b/sdk/storage_blobs/src/container/operations/set_acl.rs @@ -6,6 +6,7 @@ operation! { SetACL, client: ContainerClient, public_access: PublicAccess, + ?if_modified_since: IfModifiedSinceCondition, ?stored_access_policy_list: StoredAccessPolicyList, ?lease_id: LeaseId } @@ -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 diff --git a/sdk/storage_blobs/src/options/condition_tags.rs b/sdk/storage_blobs/src/options/condition_tags.rs new file mode 100644 index 0000000000..4f62ae75ff --- /dev/null +++ b/sdk/storage_blobs/src/options/condition_tags.rs @@ -0,0 +1,26 @@ +use azure_core::headers::{Header, HeaderName, HeaderValue}; + +#[derive(Debug, Clone)] +pub struct IfTagsCondition(String); + +impl IfTagsCondition { + pub fn new(value: String) -> Self { + Self(value) + } +} + +impl From for IfTagsCondition { + fn from(n: String) -> Self { + Self(n) + } +} + +impl Header for IfTagsCondition { + fn name(&self) -> HeaderName { + "x-ms-if-tags".into() + } + + fn value(&self) -> HeaderValue { + self.0.clone().into() + } +} diff --git a/sdk/storage_blobs/src/options/mod.rs b/sdk/storage_blobs/src/options/mod.rs index 0b6fd177ec..577fcba25d 100644 --- a/sdk/storage_blobs/src/options/mod.rs +++ b/sdk/storage_blobs/src/options/mod.rs @@ -13,6 +13,7 @@ mod blob_versioning; mod block_id; mod condition_append_position; mod condition_max_size; +mod condition_tags; mod delete_snapshot_method; mod hash; mod rehydrate_policy; @@ -33,6 +34,7 @@ pub use blob_versioning::BlobVersioning; pub use block_id::BlockId; pub use condition_append_position::ConditionAppendPosition; pub use condition_max_size::ConditionMaxSize; +pub use condition_tags::IfTagsCondition; pub use delete_snapshot_method::DeleteSnapshotsMethod; pub use hash::Hash; pub use rehydrate_policy::RehydratePriority; From 434e2bcfa90402ac2cb1a3be4b3c5e8625928f0b Mon Sep 17 00:00:00 2001 From: Brian Caswell Date: Wed, 20 Jul 2022 14:25:20 -0400 Subject: [PATCH 2/3] fmt --- sdk/storage_blobs/src/blob/operations/get_properties.rs | 2 +- sdk/storage_blobs/src/blob/operations/set_metadata.rs | 2 +- sdk/storage_blobs/src/blob/operations/set_properties.rs | 2 +- sdk/storage_blobs/src/container/operations/acquire_lease.rs | 2 +- sdk/storage_blobs/src/container/operations/set_acl.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/storage_blobs/src/blob/operations/get_properties.rs b/sdk/storage_blobs/src/blob/operations/get_properties.rs index 81145b811d..af7a2218f9 100644 --- a/sdk/storage_blobs/src/blob/operations/get_properties.rs +++ b/sdk/storage_blobs/src/blob/operations/get_properties.rs @@ -5,7 +5,7 @@ use chrono::{DateTime, Utc}; operation! { GetProperties, client: BlobClient, - ?if_modified_since: IfModifiedSinceCondition, + ?if_modified_since: IfModifiedSinceCondition, ?if_match: IfMatchCondition, ?if_tags: IfTagsCondition, ?blob_versioning: BlobVersioning, diff --git a/sdk/storage_blobs/src/blob/operations/set_metadata.rs b/sdk/storage_blobs/src/blob/operations/set_metadata.rs index 3e904d442f..4fdd0454c0 100644 --- a/sdk/storage_blobs/src/blob/operations/set_metadata.rs +++ b/sdk/storage_blobs/src/blob/operations/set_metadata.rs @@ -6,7 +6,7 @@ use std::convert::{TryFrom, TryInto}; operation! { SetMetadata, client: BlobClient, - ?if_modified_since: IfModifiedSinceCondition, + ?if_modified_since: IfModifiedSinceCondition, ?if_match: IfMatchCondition, ?if_tags: IfTagsCondition, ?lease_id: LeaseId, diff --git a/sdk/storage_blobs/src/blob/operations/set_properties.rs b/sdk/storage_blobs/src/blob/operations/set_properties.rs index a0075cd50c..1d107b8e28 100644 --- a/sdk/storage_blobs/src/blob/operations/set_properties.rs +++ b/sdk/storage_blobs/src/blob/operations/set_properties.rs @@ -12,7 +12,7 @@ use std::convert::{TryFrom, TryInto}; operation! { SetProperties, client: BlobClient, - ?if_modified_since: IfModifiedSinceCondition, + ?if_modified_since: IfModifiedSinceCondition, ?if_match: IfMatchCondition, ?if_tags: IfTagsCondition, ?lease_id: LeaseId, diff --git a/sdk/storage_blobs/src/container/operations/acquire_lease.rs b/sdk/storage_blobs/src/container/operations/acquire_lease.rs index 80557acd4e..f305fa32f0 100644 --- a/sdk/storage_blobs/src/container/operations/acquire_lease.rs +++ b/sdk/storage_blobs/src/container/operations/acquire_lease.rs @@ -7,7 +7,7 @@ operation! { AcquireLease, client: ContainerClient, lease_duration: LeaseDuration, - ?if_modified_since: IfModifiedSinceCondition, + ?if_modified_since: IfModifiedSinceCondition, ?lease_id: LeaseId, ?proposed_lease_id: ProposedLeaseId } diff --git a/sdk/storage_blobs/src/container/operations/set_acl.rs b/sdk/storage_blobs/src/container/operations/set_acl.rs index 5da31d8937..164dfb416e 100644 --- a/sdk/storage_blobs/src/container/operations/set_acl.rs +++ b/sdk/storage_blobs/src/container/operations/set_acl.rs @@ -6,7 +6,7 @@ operation! { SetACL, client: ContainerClient, public_access: PublicAccess, - ?if_modified_since: IfModifiedSinceCondition, + ?if_modified_since: IfModifiedSinceCondition, ?stored_access_policy_list: StoredAccessPolicyList, ?lease_id: LeaseId } From 097c55ebfb1da4ddfeb92f67952b2a481ea795c8 Mon Sep 17 00:00:00 2001 From: Brian Caswell Date: Wed, 20 Jul 2022 14:33:09 -0400 Subject: [PATCH 3/3] address clippy --- sdk/storage_blobs/src/blob/operations/get_blob.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage_blobs/src/blob/operations/get_blob.rs b/sdk/storage_blobs/src/blob/operations/get_blob.rs index e03faef2cf..709d1f3f58 100644 --- a/sdk/storage_blobs/src/blob/operations/get_blob.rs +++ b/sdk/storage_blobs/src/blob/operations/get_blob.rs @@ -44,7 +44,7 @@ impl GetBlobBuilder { } headers.add(this.lease_id); - headers.add(this.if_modified_since.clone()); + headers.add(this.if_modified_since); headers.add(this.if_match.clone()); headers.add(this.if_tags.clone());