Storage: Use RequestConditions and return exploding responses

sdk/storage/Azure.Storage.Blobs.Batching/src/BatchErrors.cs

@@ -47,7 +47,7 @@ public static InvalidOperationException InvalidHttpHeaderLine(string headerLine)
             new InvalidOperationException($"Expected an HTTP header line, not {headerLine}");
 
         public static RequestFailedException InvalidResponse(Response response, Exception innerException) =>
-            StorageRequestFailedExceptionHelpers.CreateException(response, "Invalid response", innerException);
+            StorageExceptionExtensions.CreateException(response, "Invalid response", innerException);
 
     }
 }

sdk/storage/Azure.Storage.Blobs.Batching/src/BlobBatch.cs

@@ -99,7 +99,7 @@ private void SetBatchOperationType(BlobBatchOperationType operationType)
 
         #region DeleteBlob
         /// <summary>
-        /// The <see cref="DeleteBlob(string, string, DeleteSnapshotsOption, BlobAccessConditions?)"/>
+        /// The <see cref="DeleteBlob(string, string, DeleteSnapshotsOption, BlobRequestConditions)"/>
         /// operation marks the specified blob or snapshot for  deletion. The
         /// blob is later deleted during garbage collection.
         ///
@@ -119,8 +119,8 @@ private void SetBatchOperationType(BlobBatchOperationType operationType)
         /// <param name="snapshotsOption">
         /// Specifies options for deleting blob snapshots.
         /// </param>
-        /// <param name="accessConditions">
-        /// Optional <see cref="BlobAccessConditions"/> to add conditions on
+        /// <param name="conditions">
+        /// Optional <see cref="BlobRequestConditions"/> to add conditions on
         /// deleting this blob.
         /// </param>
         /// <returns>
@@ -132,7 +132,7 @@ public virtual Response DeleteBlob(
             string blobContainerName,
             string blobName,
             DeleteSnapshotsOption snapshotsOption = default,
-            BlobAccessConditions? accessConditions = default)
+            BlobRequestConditions conditions = default)
         {
             var blobUri = new BlobUriBuilder(_client.Uri)
             {
@@ -142,11 +142,11 @@ public virtual Response DeleteBlob(
             return DeleteBlob(
                 blobUri.ToUri(),
                 snapshotsOption,
-                accessConditions);
+                conditions);
         }
 
         /// <summary>
-        /// The <see cref="DeleteBlob(Uri, DeleteSnapshotsOption, BlobAccessConditions?)"/>
+        /// The <see cref="DeleteBlob(Uri, DeleteSnapshotsOption, BlobRequestConditions)"/>
         /// operation marks the specified blob or snapshot for deletion. The
         /// blob is later deleted during garbage collection.
         ///
@@ -163,8 +163,8 @@ public virtual Response DeleteBlob(
         /// <param name="snapshotsOption">
         /// Specifies options for deleting blob snapshots.
         /// </param>
-        /// <param name="accessConditions">
-        /// Optional <see cref="BlobAccessConditions"/> to add conditions on
+        /// <param name="conditions">
+        /// Optional <see cref="BlobRequestConditions"/> to add conditions on
         /// deleting this blob.
         /// </param>
         /// <returns>
@@ -175,26 +175,26 @@ public virtual Response DeleteBlob(
         public virtual Response DeleteBlob(
             Uri blobUri,
             DeleteSnapshotsOption snapshotsOption = default,
-            BlobAccessConditions? accessConditions = default)
+            BlobRequestConditions conditions = default)
         {
             SetBatchOperationType(BlobBatchOperationType.Delete);
             HttpMessage message = BlobRestClient.Blob.DeleteAsync_CreateMessage(
                 _client.BatchOperationPipeline,
                 blobUri,
                 deleteSnapshots: snapshotsOption == DeleteSnapshotsOption.None ? null : (DeleteSnapshotsOption?)snapshotsOption,
-                leaseId: accessConditions?.LeaseAccessConditions?.LeaseId,
-                ifModifiedSince: accessConditions?.HttpAccessConditions?.IfModifiedSince,
-                ifUnmodifiedSince: accessConditions?.HttpAccessConditions?.IfUnmodifiedSince,
-                ifMatch: accessConditions?.HttpAccessConditions?.IfMatch,
-                ifNoneMatch: accessConditions?.HttpAccessConditions?.IfNoneMatch);
+                leaseId: conditions?.LeaseId,
+                ifModifiedSince: conditions?.IfModifiedSince,
+                ifUnmodifiedSince: conditions?.IfUnmodifiedSince,
+                ifMatch: conditions?.IfMatch,
+                ifNoneMatch: conditions?.IfNoneMatch);
             _messages.Add(message);
             return new DelayedResponse(message, BlobRestClient.Blob.DeleteAsync_CreateResponse);
         }
         #endregion DeleteBlob
 
         #region SetBlobAccessTier
         /// <summary>
-        /// The <see cref="SetBlobAccessTier(string, string, AccessTier, RehydratePriority?, LeaseAccessConditions?)"/>
+        /// The <see cref="SetBlobAccessTier(string, string, AccessTier, RehydratePriority?, BlobRequestConditions)"/>
         /// operation sets the tier on a blob.  The operation is allowed on
         /// block blobs in a blob storage or general purpose v2 account.
         ///
@@ -213,7 +213,7 @@ public virtual Response DeleteBlob(
         /// Indicates the tier to be set on the blob.
         /// </param>
         /// <param name="leaseAccessConditions">
-        /// Optional <see cref="LeaseAccessConditions"/> to add conditions on
+        /// Optional <see cref="BlobRequestConditions"/> to add conditions on
         /// setting the access tier.
         /// </param>
         /// <param name="rehydratePriority">
@@ -230,7 +230,7 @@ public virtual Response SetBlobAccessTier(
             string blobName,
             AccessTier accessTier,
             RehydratePriority? rehydratePriority = default,
-            LeaseAccessConditions? leaseAccessConditions = default)
+            BlobRequestConditions leaseAccessConditions = default)
         {
             var blobUri = new BlobUriBuilder(_client.Uri)
             {
@@ -245,7 +245,7 @@ public virtual Response SetBlobAccessTier(
         }
 
         /// <summary>
-        /// The <see cref="SetBlobAccessTier(Uri, AccessTier, RehydratePriority?, LeaseAccessConditions?)"/>
+        /// The <see cref="SetBlobAccessTier(Uri, AccessTier, RehydratePriority?, BlobRequestConditions)"/>
         /// operation sets the tier on a blob.  The operation is allowed on
         /// block blobs in a blob storage or general purpose v2 account.
         ///
@@ -265,7 +265,7 @@ public virtual Response SetBlobAccessTier(
         /// Indicates the priority with which to rehydrate an archived blob.
         /// </param>
         /// <param name="leaseAccessConditions">
-        /// Optional <see cref="LeaseAccessConditions"/> to add conditions on
+        /// Optional <see cref="BlobRequestConditions"/> to add conditions on
         /// setting the access tier.
         /// </param>
         /// <returns>
@@ -277,7 +277,7 @@ public virtual Response SetBlobAccessTier(
             Uri blobUri,
             AccessTier accessTier,
             RehydratePriority? rehydratePriority = default,
-            LeaseAccessConditions? leaseAccessConditions = default)
+            BlobRequestConditions leaseAccessConditions = default)
         {
             SetBatchOperationType(BlobBatchOperationType.SetAccessTier);
             HttpMessage message = BlobRestClient.Blob.SetAccessTierAsync_CreateMessage(

sdk/storage/Azure.Storage.Blobs.Batching/src/DelayedResponse.cs

@@ -85,7 +85,10 @@ public override string ToString()
         // We directly forward the entire Response interface to LiveResponse
         #region forward Response members to Live
         /// <inheritdoc />
-        public override int Status => LiveResponse.Status;
+        public override int Status =>
+            _live == null ?
+                BatchConstants.NoStatusCode : // Give users a hint that this is an exploding Response
+                LiveResponse.Status;
 
         /// <inheritdoc />
         public override string ReasonPhrase => LiveResponse.ReasonPhrase;

sdk/storage/Azure.Storage.Blobs.Batching/tests/BlobBatchClientTests.cs

@@ -100,6 +100,19 @@ public void Batch_Homogenous_SetTier()
             StringAssert.Contains("already being used for SetAccessTier operations", ex.Message);
         }
 
+        [Test]
+        public void Batch_StatusIndicatesCannotRead()
+        {
+            using TestScenario scenario = Scenario();
+            Uri uri = scenario.GetInvalidBlobUris(1)[0];
+
+            BlobBatchClient client = scenario.GetBlobBatchClient();
+            BlobBatch batch = client.CreateBatch();
+            Response response = batch.DeleteBlob(uri);
+
+            Assert.AreEqual(0, response.Status);
+        }
+
         [Test]
         public void Batch_CannotReadBeforeSubmit()
         {
@@ -110,7 +123,7 @@ public void Batch_CannotReadBeforeSubmit()
             BlobBatch batch = client.CreateBatch();
             Response response = batch.DeleteBlob(uri);
             InvalidOperationException ex = Assert.Throws<InvalidOperationException>(
-                () => { int status = response.Status; });
+                () => { var _ = response.ClientRequestId; });
 
             StringAssert.Contains("Cannot use the Response before calling BlobBatchClient.SubmitBatch", ex.Message);
         }