Fixed Regression where ETags which had quotes surrounding the value, … (

#23395)

sdk/storage/Azure.Storage.Blobs/CHANGELOG.md

@@ -7,6 +7,7 @@
 - Added support for generating SAS URLs with the Permanent Delete ('y') SAS permission.
 - Added support for SDK-calculated transactional hash checksums on data transfer.
 - Fixed bug where BlobContainerClient.GetBlobs() and .GetBlobsByHierarchyAsync() was not parsing the Object Replication Metadata correctly
+- Fixed bug / regression where the ETag values that had quotation marks surrounding it were being removed starting in version 12.9.0.
 
 ## 12.10.0 (2021-09-08)
 - Includes all features from 12.10.0-beta.1 and 12.10.0-beta.2.

sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs

@@ -2736,9 +2736,9 @@ internal async Task<Stream> OpenReadInternal(
                     }
 
                     // This also makes sure that we fail fast if file doesn't exist.
-                    var blobProperties = await GetPropertiesInternal(conditions: conditions, async, cancellationToken).ConfigureAwait(false);
+                    Response<BlobProperties> blobProperties = await GetPropertiesInternal(conditions: conditions, async, cancellationToken).ConfigureAwait(false);
 
-                    var etag = blobProperties.Value.ETag;
+                    ETag etag = blobProperties.Value.ETag;
                     var readConditions = conditions;
                     if (!allowModifications)
                     {

sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs

@@ -225,7 +225,8 @@ public async Task CreateAsync()
 
             // Assert
             Assert.IsNotNull(response.GetRawResponse().Headers.RequestId);
-
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
             IList<BlobItem> blobs = await test.Container.GetBlobsAsync().ToListAsync();
             Assert.AreEqual(1, blobs.Count);
             Assert.AreEqual(blobName, blobs.First().Name);
@@ -713,12 +714,18 @@ public async Task AppendBlockAsync()
             var data = GetRandomBuffer(blobSize);
 
             // Act
+            Response<BlobAppendInfo> response;
             using (var stream = new MemoryStream(data))
             {
-                await blob.AppendBlockAsync(stream);
+                response = await blob.AppendBlockAsync(stream);
             }
 
             // Assert
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
+
+            // Check if block was appeneded correctly by Downloading the block
             Response<BlobDownloadInfo> result = await blob.DownloadAsync(new HttpRange(0, data.Length));
             var dataResult = new MemoryStream();
             await result.Value.Content.CopyToAsync(dataResult);
@@ -1125,7 +1132,10 @@ public async Task AppendBlockFromUriAsync_Min()
                 };
 
                 // Act
-                await destBlob.AppendBlockFromUriAsync(sourceBlob.Uri, options);
+                Response<BlobAppendInfo> response = await destBlob.AppendBlockFromUriAsync(sourceBlob.Uri, options);
+
+                // Ensure that we grab the whole ETag value from the service without removing the quotes
+                Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
             }
         }
 
@@ -1684,12 +1694,17 @@ public async Task SealAsync()
             await appendBlob.CreateAsync();
 
             // Act
-            await appendBlob.SealAsync();
+            Response<BlobInfo> response = await appendBlob.SealAsync();
             Response<BlobProperties> propertiesResponse = await appendBlob.GetPropertiesAsync();
             Response<BlobDownloadInfo> downloadResponse = await appendBlob.DownloadAsync();
             IList<BlobItem> blobs = await test.Container.GetBlobsAsync().ToListAsync();
 
             // Assert
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
+
+            // Ensure the blob is correctly sealed
             Assert.IsTrue(propertiesResponse.Value.IsSealed);
             Assert.IsTrue(downloadResponse.Value.Details.IsSealed);
             Assert.IsTrue(blobs.First().Properties.IsSealed);

sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs

@@ -300,6 +300,10 @@ public async Task DownloadAsync_Streaming()
             Response<BlobDownloadStreamingResult> response = await blob.DownloadStreamingAsync();
 
             // Assert
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.Details.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag.ToString()}\"");
+
             Assert.AreEqual(data.Length, response.Value.Details.ContentLength);
             var actual = new MemoryStream();
             await response.Value.Content.CopyToAsync(actual);
@@ -3119,7 +3123,8 @@ public async Task SyncCopyFromUriAsync()
             await destBlob.GetPropertiesAsync();
 
             // Assert
-            Assert.IsNotNull(copyResponse.Value.ETag);
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(copyResponse.Value.ETag.ToString(), $"\"{copyResponse.GetRawResponse().Headers.ETag.ToString()}\"");
             Assert.IsNotNull(copyResponse.Value.LastModified);
             Assert.IsNotNull(copyResponse.Value.CopyId);
             Assert.AreEqual(CopyStatus.Success, copyResponse.Value.CopyStatus);
@@ -4259,6 +4264,8 @@ public async Task GetPropertiesAsync()
 
             // Assert
             Assert.IsNotNull(response.GetRawResponse().Headers.RequestId);
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
         }
 
         [RecordedTest]
@@ -4858,7 +4865,7 @@ public async Task SetHttpHeadersAsync()
             BlobBaseClient blob = await GetNewBlobClient(test.Container);
 
             // Act
-            await blob.SetHttpHeadersAsync(new BlobHttpHeaders
+            Response<BlobInfo> response = await blob.SetHttpHeadersAsync(new BlobHttpHeaders
             {
                 CacheControl = constants.CacheControl,
                 ContentDisposition = constants.ContentDisposition,
@@ -4869,13 +4876,18 @@ await blob.SetHttpHeadersAsync(new BlobHttpHeaders
             });
 
             // Assert
-            Response<BlobProperties> response = await blob.GetPropertiesAsync();
-            Assert.AreEqual(constants.ContentType, response.Value.ContentType);
-            TestHelper.AssertSequenceEqual(constants.ContentMD5, response.Value.ContentHash);
-            Assert.AreEqual(constants.ContentEncoding, response.Value.ContentEncoding);
-            Assert.AreEqual(constants.ContentLanguage, response.Value.ContentLanguage);
-            Assert.AreEqual(constants.ContentDisposition, response.Value.ContentDisposition);
-            Assert.AreEqual(constants.CacheControl, response.Value.CacheControl);
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
+
+            // Ensure the values has been correctly set by doing a GetProperties call
+            Response<BlobProperties> propertiesResponse = await blob.GetPropertiesAsync();
+            Assert.AreEqual(constants.ContentType, propertiesResponse.Value.ContentType);
+            TestHelper.AssertSequenceEqual(constants.ContentMD5, propertiesResponse.Value.ContentHash);
+            Assert.AreEqual(constants.ContentEncoding, propertiesResponse.Value.ContentEncoding);
+            Assert.AreEqual(constants.ContentLanguage, propertiesResponse.Value.ContentLanguage);
+            Assert.AreEqual(constants.ContentDisposition, propertiesResponse.Value.ContentDisposition);
+            Assert.AreEqual(constants.CacheControl, propertiesResponse.Value.CacheControl);
         }
 
         [RecordedTest]
@@ -5022,11 +5034,16 @@ public async Task SetMetadataAsync()
             IDictionary<string, string> metadata = BuildMetadata();
 
             // Act
-            await blob.SetMetadataAsync(metadata);
+            Response<BlobInfo> response = await blob.SetMetadataAsync(metadata);
 
             // Assert
-            Response<BlobProperties> response = await blob.GetPropertiesAsync();
-            AssertDictionaryEquality(metadata, response.Value.Metadata);
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
+
+            // Ensure the value has been correctly set by doing a GetProperties call
+            Response<BlobProperties> getPropertiesResponse = await blob.GetPropertiesAsync();
+            AssertDictionaryEquality(metadata, getPropertiesResponse.Value.Metadata);
         }
 
         [RecordedTest]
@@ -5199,6 +5216,10 @@ public async Task CreateSnapshotAsync()
             Response<BlobSnapshotInfo> response = await blob.CreateSnapshotAsync();
 
             // Assert
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
+
             Assert.IsNotNull(response.GetRawResponse().Headers.RequestId);
         }
 
@@ -5368,6 +5389,8 @@ public async Task AcquireLeaseAsync()
             Response<BlobLease> response = await leaseClient.AcquireAsync(duration);
 
             // Assert
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
             Assert.IsNotNull(response.GetRawResponse().Headers.RequestId);
             Assert.AreEqual(response.Value.LeaseId, leaseClient.LeaseId);
         }
@@ -5530,6 +5553,9 @@ public async Task RenewLeaseAsync()
             // Assert
             Assert.IsNotNull(response.GetRawResponse().Headers.RequestId);
             Assert.AreEqual(response.Value.LeaseId, lease.LeaseId);
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
         }
 
         [RecordedTest]
@@ -5671,6 +5697,8 @@ public async Task ReleaseLeaseAsync()
 
             // Assert
             Assert.IsNotNull(response.GetRawResponse().Headers.RequestId);
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
         }
 
         [RecordedTest]
@@ -5976,6 +6004,9 @@ public async Task ChangeLeaseAsync()
             Assert.IsNotNull(response.GetRawResponse().Headers.RequestId);
             Assert.AreEqual(newLeaseId, response.Value.LeaseId);
             Assert.AreEqual(response.Value.LeaseId, lease.LeaseId);
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
         }
 
         [RecordedTest]

sdk/storage/Azure.Storage.Blobs/tests/BlobQuickQueryTests.cs

@@ -45,6 +45,9 @@ public async Task QueryAsync_Min()
 
             // Assert
             Assert.AreEqual("400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n400\n", s);
+
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.Details.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag.ToString()}\"");
         }
 
         [RecordedTest]

sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs

@@ -455,7 +455,7 @@ public async Task<string> SetupBlobMatchCondition(BlobBaseClient blob, string ma
             if (match == ReceivedETag)
             {
                 Response<BlobProperties> headers = await blob.GetPropertiesAsync();
-                return headers.Value.ETag.ToString();
+                return headers.GetRawResponse().Headers.ETag.ToString();
             }
             else
             {

sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs

@@ -1091,7 +1091,7 @@ public async Task CommitBlockListAsync()
                     ToBase64(secondBlockName)
             };
 
-            await blob.CommitBlockListAsync(commitList);
+            Response<BlobContentInfo> response = await blob.CommitBlockListAsync(commitList);
 
             // Stage 3rd Block
             using (var stream = new MemoryStream(data))
@@ -1100,6 +1100,8 @@ public async Task CommitBlockListAsync()
             }
 
             // Assert
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
             Response<BlockList> blobList = await blob.GetBlockListAsync(BlockListTypes.All);
             Assert.AreEqual(2, blobList.Value.CommittedBlocks.Count());
             Assert.AreEqual(ToBase64(firstBlockName), blobList.Value.CommittedBlocks.First().Name);
@@ -1718,6 +1720,8 @@ public async Task GetBlockListAsync()
             Response<BlockList> response = await blob.GetBlockListAsync();
 
             // Assert
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
             Assert.AreEqual(1, response.Value.CommittedBlocks.Count());
             Assert.AreEqual(blockId0, response.Value.CommittedBlocks.First().Name);
             Assert.AreEqual(1, response.Value.UncommittedBlocks.Count());
@@ -1967,13 +1971,16 @@ public async Task UploadAsync()
             var data = GetRandomBuffer(Size);
 
             // Act
+            Response<BlobContentInfo> response;
             using (var stream = new MemoryStream(data))
             {
-                await blob.UploadAsync(
+                response = await blob.UploadAsync(
                     content: stream);
             }
 
             // Assert
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(response.Value.ETag.ToString(), $"\"{response.GetRawResponse().Headers.ETag}\"");
             IList<BlobItem> blobs = await test.Container.GetBlobsAsync().ToListAsync();
             Assert.AreEqual(1, blobs.Count);
             Assert.AreEqual(blockBlobName, blobs.First().Name);
@@ -3132,6 +3139,8 @@ public async Task SyncUploadFromUriAsync()
 
             // Assert
             Assert.AreNotEqual(default(ETag), uploadResponse.Value.ETag);
+            // Ensure that we grab the whole ETag value from the service without removing the quotes
+            Assert.AreEqual(uploadResponse.Value.ETag.ToString(), $"\"{uploadResponse.GetRawResponse().Headers.ETag.ToString()}\"");
             Assert.AreNotEqual(DateTimeOffset.MinValue, uploadResponse.Value.LastModified);
 
             // Validate source and destination blob content matches