specify additional conditional headers for blob & container operations (#951)

bmc-msft · Brian Caswell · web-flow · commit 1b51eedeb2c8 · 2022-07-21T10:53:42.000+02:00
* 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 * fmt * address clippy Co-authored-by: Brian Caswell <bcaswell@microsoft.com>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
+                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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/sdk/storage_blobs/src/options/mod.rs b/sdk/storage_blobs/src/options/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ operation! {`
`6`	`6`	`SetACL,`
`7`	`7`	`client: ContainerClient,`
`8`	`8`	`public_access: PublicAccess,`
	`9`	`+ ?if_modified_since: IfModifiedSinceCondition,`
`9`	`10`	`?stored_access_policy_list: StoredAccessPolicyList,`
`10`	`11`	`?lease_id: LeaseId`
`11`	`12`	`}`
`@@ -25,6 +26,7 @@ impl SetACLBuilder {`
`25`	`26`	`headers.insert(name, value);`
`26`	`27`	`}`
`27`	`28`	`headers.add(self.lease_id);`
	`29`	`+ headers.add(self.if_modified_since);`
`28`	`30`
`29`	`31`	`let mut request =`
`30`	`32`	`self.client`