Fix Monitoring2Monitoring blob name generation, handle size mismatch when checking if blobs are synchronized (#10123)

joelverhagen · web-flow · commit 843a4eb33d82 · 2024-08-13T18:43:07.000-04:00
* Handle blob name generate when base URI scheme does not match

This was causing monitoring2monitoring to fail with an invalid blob name (double slashes).
Scrub blob URL for logging

* Do not consider a blob as synchronize if the size is difference
* Add UTs
diff --git a/src/Catalog/Persistence/AzureStorage.cs b/src/Catalog/Persistence/AzureStorage.cs
@@ -454,15 +454,21 @@ public async Task<bool> AreSynchronized(ICloudBlockBlob sourceBlockBlob, ICloudB
             {
                 if (await sourceBlockBlob.ExistsAsync(CancellationToken.None))
                 {
-                    var sourceBlobMetadata = await sourceBlockBlob.GetMetadataAsync(CancellationToken.None);
-                    var destinationBlobMetadata = await destinationBlockBlob.GetMetadataAsync(CancellationToken.None);
-                    if (sourceBlobMetadata == null || destinationBlobMetadata == null)
+                    BlobProperties sourceBlobAttributes = await sourceBlockBlob.FetchAttributesAsync(CancellationToken.None);
+                    BlobProperties destinationBlobAttributes = await destinationBlockBlob.FetchAttributesAsync(CancellationToken.None);
+                    if (sourceBlobAttributes?.Metadata == null || destinationBlobAttributes?.Metadata == null)
                     {
                         return false;
                     }
 
-                    var sourceBlobHasSha512Hash = sourceBlobMetadata.TryGetValue(Sha512HashAlgorithmId, out var sourceBlobSha512Hash);
-                    var destinationBlobHasSha512Hash = destinationBlobMetadata.TryGetValue(Sha512HashAlgorithmId, out var destinationBlobSha512Hash);
+                    if (sourceBlobAttributes.ContentLength !=  destinationBlobAttributes.ContentLength)
+                    {
+                        Trace.WriteLine($"The source blob ({RemoveQueryString(sourceBlockBlob.Uri)}) and destination blob ({RemoveQueryString(destinationBlockBlob.Uri)}) have different sizes.");
+                        return false;
+                    }
+
+                    var sourceBlobHasSha512Hash = sourceBlobAttributes.Metadata.TryGetValue(Sha512HashAlgorithmId, out var sourceBlobSha512Hash);
+                    var destinationBlobHasSha512Hash = destinationBlobAttributes.Metadata.TryGetValue(Sha512HashAlgorithmId, out var destinationBlobSha512Hash);
                     if (!sourceBlobHasSha512Hash)
                     {
                         Trace.TraceWarning($"The source blob ({RemoveQueryString(sourceBlockBlob.Uri)}) doesn't have the SHA512 hash.");
diff --git a/src/Catalog/Persistence/Storage.cs b/src/Catalog/Persistence/Storage.cs
@@ -199,15 +199,19 @@ protected string GetName(Uri uri)
             {
                 address += "/";
             }
-            var uriString = uri.ToString();
+            var uriString = uri.GetLeftPart(UriPartial.Path);
 
             int baseAddressLength = address.Length;
 
-            var name = uriString.Substring(baseAddressLength);
+            // handle mismatched scheme (http vs https)
+            var schemeLengthDifference = uri.Scheme.Length - BaseAddress.Scheme.Length;
+
+            var name = uriString.Substring(baseAddressLength + schemeLengthDifference);
             if (name.Contains("#"))
             {
                 name = name.Substring(0, name.IndexOf("#"));
             }
+
             return name;
         }
 
@@ -229,7 +233,7 @@ protected void TraceMethod(string method, Uri resourceUri)
             {
                 //The Uri depends on the storage implementation.
                 Uri storageUri = GetUri(GetName(resourceUri));
-                Trace.WriteLine(String.Format("{0} {1}", method, storageUri));
+                Trace.WriteLine(String.Format("{0} {1}", method, RemoveQueryString(storageUri)));
             }
         }
 
@@ -240,7 +244,7 @@ public static string RemoveQueryString(Uri storageUri)
 
         private string TraceException(string method, Uri resourceUri, Exception exception)
         {
-            string message = $"{method} EXCEPTION: {GetUri(GetName(resourceUri))} {exception.ToString()}";
+            string message = $"{method} EXCEPTION: {RemoveQueryString(GetUri(GetName(resourceUri)))} {exception.ToString()}";
             Trace.WriteLine(message);
             return message;
         }
diff --git a/tests/CatalogMetadataTests/AzureStorageFacts.cs b/tests/CatalogMetadataTests/AzureStorageFacts.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -9,6 +9,7 @@
 using Xunit;
 using NuGet.Services.Metadata.Catalog.Persistence;
 using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
 
 namespace CatalogMetadataTests
 {
@@ -19,25 +20,29 @@ public AzureStorageFacts() : base()
         }
 
         [Theory]
-        [InlineData(true, true, "SHA512Value1", true, true, "SHA512Value1", true)]
-        [InlineData(true, true, "SHA512Value1", true, true, "SHA512Value2", false)]
-        [InlineData(false, false, null, true, true, "SHA512Value1", true)]
-        [InlineData(true, true, "SHA512Value1", false, false, null, false)]
-        [InlineData(false, false, null, false, false, null, true)]
-        [InlineData(true, false, null, true, true, "SHA512Value1", false)]
-        [InlineData(true, true, "SHA512Value1", true, false, null, false)]
-        [InlineData(true, false, null, true, false, null, false)]
-        public async Task ValidateAreSynchronizedmethod(bool sourceBlobExists,
+        [InlineData(true, true, "SHA512Value1", 10, true, true, "SHA512Value1", 10, true)]
+        [InlineData(true, true, "SHA512Value1", 10, true, true, "SHA512Value2", 10, false)]
+        [InlineData(false, false, null, 10, true, true, "SHA512Value1", 10, true)]
+        [InlineData(true, true, "SHA512Value1", 10, false, false, null, 10, false)]
+        [InlineData(false, false, null, 10, false, false, null, 10, true)]
+        [InlineData(true, false, null, 10, true, true, "SHA512Value1", 10, false)]
+        [InlineData(true, true, "SHA512Value1", 10, true, false, null, 10, false)]
+        [InlineData(true, false, null, 10, true, false, null, 10, false)]
+        [InlineData(true, true, "SHA512Value1", 10, true, true, "SHA512Value1", 11, false)]
+        public async Task ValidateAreSynchronizedmethod(
+            bool sourceBlobExists,
             bool hasSourceBlobSHA512Value,
             string sourceBlobSHA512Value,
+            long sourceSize,
             bool destinationBlobExists,
             bool hasDestinationBlobSHA512Value,
             string destinationBlobSHA512Value,
+            long destinationSize,
             bool expected)
         {
             // Arrange
-            var sourceBlob = GetMockedBlockBlob(sourceBlobExists, hasSourceBlobSHA512Value, sourceBlobSHA512Value, new Uri("https://blockBlob1"));
-            var destinationBlob = GetMockedBlockBlob(destinationBlobExists, hasDestinationBlobSHA512Value, destinationBlobSHA512Value, new Uri("https://blockBlob2"));
+            var sourceBlob = GetMockedBlockBlob(sourceBlobExists, hasSourceBlobSHA512Value, sourceBlobSHA512Value, sourceSize, new Uri("https://blockBlob1"));
+            var destinationBlob = GetMockedBlockBlob(destinationBlobExists, hasDestinationBlobSHA512Value, destinationBlobSHA512Value, destinationSize, new Uri("https://blockBlob2"));
 
             // Act
             var isSynchronized = await _storage.AreSynchronized(sourceBlob.Object, destinationBlob.Object);
@@ -48,8 +53,8 @@ public async Task ValidateAreSynchronizedmethod(bool sourceBlobExists,
 
             if (sourceBlobExists && destinationBlobExists)
             {
-                sourceBlob.Verify(x => x.GetMetadataAsync(CancellationToken.None), Times.Once);
-                destinationBlob.Verify(x => x.GetMetadataAsync(CancellationToken.None), Times.Once);
+                sourceBlob.Verify(x => x.FetchAttributesAsync(CancellationToken.None), Times.Once);
+                destinationBlob.Verify(x => x.FetchAttributesAsync(CancellationToken.None), Times.Once);
 
                 if (!hasSourceBlobSHA512Value)
                 {
@@ -69,7 +74,7 @@ public async Task ValidateAreSynchronizedmethod(bool sourceBlobExists,
             Assert.Equal(expected, isSynchronized);
         }
 
-        private Mock<ICloudBlockBlob> GetMockedBlockBlob(bool isExisted, bool hasSHA512Value, string SHA512Value, Uri blockBlobUri)
+        private Mock<ICloudBlockBlob> GetMockedBlockBlob(bool isExisted, bool hasSHA512Value, string SHA512Value, long size, Uri blockBlobUri)
         {
             var mockBlob = new Mock<ICloudBlockBlob>();
 
@@ -82,16 +87,16 @@ private Mock<ICloudBlockBlob> GetMockedBlockBlob(bool isExisted, bool hasSHA512V
 
                 if (hasSHA512Value)
                 {
-                    mockBlob.Setup(x => x.GetMetadataAsync(CancellationToken.None))
-                        .ReturnsAsync(new Dictionary<string, string>()
+                    mockBlob.Setup(x => x.FetchAttributesAsync(CancellationToken.None))
+                        .ReturnsAsync(BlobsModelFactory.BlobProperties(contentLength: size, metadata: new Dictionary<string, string>()
                         {
                             { "SHA512", SHA512Value }
-                        });
+                        }));
                 }
                 else
                 {
-                    mockBlob.Setup(x => x.GetMetadataAsync(CancellationToken.None))
-                        .ReturnsAsync(new Dictionary<string, string>());
+                    mockBlob.Setup(x => x.FetchAttributesAsync(CancellationToken.None))
+                        .ReturnsAsync(BlobsModelFactory.BlobProperties(contentLength: size, metadata: new Dictionary<string, string>()));
                 }
             }
 
@@ -116,13 +121,17 @@ private ICloudBlockBlob GetMockedBlockBlobWithNullMetadata(bool isBlobMetadataEx
         {
             if (isBlobMetadataExisted)
             {
-                return Mock.Of<ICloudBlockBlob>(x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&
-                    x.GetMetadataAsync(CancellationToken.None) == Task.FromResult<IReadOnlyDictionary<string, string>>(new Dictionary<string, string>()));
+                var properties = BlobsModelFactory.BlobProperties(metadata: new Dictionary<string, string>());
+                return Mock.Of<ICloudBlockBlob>(
+                    x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&
+                         x.FetchAttributesAsync(CancellationToken.None) == Task.FromResult(properties));
             }
             else
             {
-                return Mock.Of<ICloudBlockBlob>(x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&
-                    x.GetMetadataAsync(CancellationToken.None) == Task.FromResult<IReadOnlyDictionary<string, string>>(null));
+                var properties = BlobsModelFactory.BlobProperties(metadata: null);
+                return Mock.Of<ICloudBlockBlob>(
+                    x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&
+                         x.FetchAttributesAsync(CancellationToken.None) == Task.FromResult(properties));
             }
         }
     }
@@ -166,4 +175,4 @@ public AzureStorageBaseFacts()
                 false);
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -454,15 +454,21 @@ public async Task<bool> AreSynchronized(ICloudBlockBlob sourceBlockBlob, ICloudB`
`454`	`454`	`{`
`455`	`455`	`if (await sourceBlockBlob.ExistsAsync(CancellationToken.None))`
`456`	`456`	`{`
`457`		`- var sourceBlobMetadata = await sourceBlockBlob.GetMetadataAsync(CancellationToken.None);`
`458`		`- var destinationBlobMetadata = await destinationBlockBlob.GetMetadataAsync(CancellationToken.None);`
`459`		`- if (sourceBlobMetadata == null \|\| destinationBlobMetadata == null)`
	`457`	`+ BlobProperties sourceBlobAttributes = await sourceBlockBlob.FetchAttributesAsync(CancellationToken.None);`
	`458`	`+ BlobProperties destinationBlobAttributes = await destinationBlockBlob.FetchAttributesAsync(CancellationToken.None);`
	`459`	`+ if (sourceBlobAttributes?.Metadata == null \|\| destinationBlobAttributes?.Metadata == null)`
`460`	`460`	`{`
`461`	`461`	`return false;`
`462`	`462`	`}`
`463`	`463`
`464`		`- var sourceBlobHasSha512Hash = sourceBlobMetadata.TryGetValue(Sha512HashAlgorithmId, out var sourceBlobSha512Hash);`
`465`		`- var destinationBlobHasSha512Hash = destinationBlobMetadata.TryGetValue(Sha512HashAlgorithmId, out var destinationBlobSha512Hash);`
	`464`	`+ if (sourceBlobAttributes.ContentLength != destinationBlobAttributes.ContentLength)`
	`465`	`+ {`
	`466`	`+ Trace.WriteLine($"The source blob ({RemoveQueryString(sourceBlockBlob.Uri)}) and destination blob ({RemoveQueryString(destinationBlockBlob.Uri)}) have different sizes.");`
	`467`	`+ return false;`
	`468`	`+ }`
	`469`	`+`
	`470`	`+ var sourceBlobHasSha512Hash = sourceBlobAttributes.Metadata.TryGetValue(Sha512HashAlgorithmId, out var sourceBlobSha512Hash);`
	`471`	`+ var destinationBlobHasSha512Hash = destinationBlobAttributes.Metadata.TryGetValue(Sha512HashAlgorithmId, out var destinationBlobSha512Hash);`
`466`	`472`	`if (!sourceBlobHasSha512Hash)`
`467`	`473`	`{`
`468`	`474`	`Trace.TraceWarning($"The source blob ({RemoveQueryString(sourceBlockBlob.Uri)}) doesn't have the SHA512 hash.");`
Original file line number	Diff line number	Diff line change
`@@ -199,15 +199,19 @@ protected string GetName(Uri uri)`
`199`	`199`	`{`
`200`	`200`	`address += "/";`
`201`	`201`	`}`
`202`		`- var uriString = uri.ToString();`
	`202`	`+ var uriString = uri.GetLeftPart(UriPartial.Path);`
`203`	`203`
`204`	`204`	`int baseAddressLength = address.Length;`
`205`	`205`
`206`		`- var name = uriString.Substring(baseAddressLength);`
	`206`	`+ // handle mismatched scheme (http vs https)`
	`207`	`+ var schemeLengthDifference = uri.Scheme.Length - BaseAddress.Scheme.Length;`
	`208`	`+`
	`209`	`+ var name = uriString.Substring(baseAddressLength + schemeLengthDifference);`
`207`	`210`	`if (name.Contains("#"))`
`208`	`211`	`{`
`209`	`212`	`name = name.Substring(0, name.IndexOf("#"));`
`210`	`213`	`}`
	`214`	`+`
`211`	`215`	`return name;`
`212`	`216`	`}`
`213`	`217`
`@@ -229,7 +233,7 @@ protected void TraceMethod(string method, Uri resourceUri)`
`229`	`233`	`{`
`230`	`234`	`//The Uri depends on the storage implementation.`
`231`	`235`	`Uri storageUri = GetUri(GetName(resourceUri));`
`232`		`- Trace.WriteLine(String.Format("{0} {1}", method, storageUri));`
	`236`	`+ Trace.WriteLine(String.Format("{0} {1}", method, RemoveQueryString(storageUri)));`
`233`	`237`	`}`
`234`	`238`	`}`
`235`	`239`
`@@ -240,7 +244,7 @@ public static string RemoveQueryString(Uri storageUri)`
`240`	`244`
`241`	`245`	`private string TraceException(string method, Uri resourceUri, Exception exception)`
`242`	`246`	`{`
`243`		`- string message = $"{method} EXCEPTION: {GetUri(GetName(resourceUri))} {exception.ToString()}";`
	`247`	`+ string message = $"{method} EXCEPTION: {RemoveQueryString(GetUri(GetName(resourceUri)))} {exception.ToString()}";`
`244`	`248`	`Trace.WriteLine(message);`
`245`	`249`	`return message;`
`246`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) .NET Foundation. All rights reserved.`
	`1`	`+// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Xunit;`
`10`	`10`	`using NuGet.Services.Metadata.Catalog.Persistence;`
`11`	`11`	`using Azure.Storage.Blobs;`
	`12`	`+using Azure.Storage.Blobs.Models;`
`12`	`13`
`13`	`14`	`namespace CatalogMetadataTests`
`14`	`15`	`{`
`@@ -19,25 +20,29 @@ public AzureStorageFacts() : base()`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`[Theory]`
`22`		`- [InlineData(true, true, "SHA512Value1", true, true, "SHA512Value1", true)]`
`23`		`- [InlineData(true, true, "SHA512Value1", true, true, "SHA512Value2", false)]`
`24`		`- [InlineData(false, false, null, true, true, "SHA512Value1", true)]`
`25`		`- [InlineData(true, true, "SHA512Value1", false, false, null, false)]`
`26`		`- [InlineData(false, false, null, false, false, null, true)]`
`27`		`- [InlineData(true, false, null, true, true, "SHA512Value1", false)]`
`28`		`- [InlineData(true, true, "SHA512Value1", true, false, null, false)]`
`29`		`- [InlineData(true, false, null, true, false, null, false)]`
`30`		`- public async Task ValidateAreSynchronizedmethod(bool sourceBlobExists,`
	`23`	`+ [InlineData(true, true, "SHA512Value1", 10, true, true, "SHA512Value1", 10, true)]`
	`24`	`+ [InlineData(true, true, "SHA512Value1", 10, true, true, "SHA512Value2", 10, false)]`
	`25`	`+ [InlineData(false, false, null, 10, true, true, "SHA512Value1", 10, true)]`
	`26`	`+ [InlineData(true, true, "SHA512Value1", 10, false, false, null, 10, false)]`
	`27`	`+ [InlineData(false, false, null, 10, false, false, null, 10, true)]`
	`28`	`+ [InlineData(true, false, null, 10, true, true, "SHA512Value1", 10, false)]`
	`29`	`+ [InlineData(true, true, "SHA512Value1", 10, true, false, null, 10, false)]`
	`30`	`+ [InlineData(true, false, null, 10, true, false, null, 10, false)]`
	`31`	`+ [InlineData(true, true, "SHA512Value1", 10, true, true, "SHA512Value1", 11, false)]`
	`32`	`+ public async Task ValidateAreSynchronizedmethod(`
	`33`	`+ bool sourceBlobExists,`
`31`	`34`	`bool hasSourceBlobSHA512Value,`
`32`	`35`	`string sourceBlobSHA512Value,`
	`36`	`+ long sourceSize,`
`33`	`37`	`bool destinationBlobExists,`
`34`	`38`	`bool hasDestinationBlobSHA512Value,`
`35`	`39`	`string destinationBlobSHA512Value,`
	`40`	`+ long destinationSize,`
`36`	`41`	`bool expected)`
`37`	`42`	`{`
`38`	`43`	`// Arrange`
`39`		`- var sourceBlob = GetMockedBlockBlob(sourceBlobExists, hasSourceBlobSHA512Value, sourceBlobSHA512Value, new Uri("https://blockBlob1"));`
`40`		`- var destinationBlob = GetMockedBlockBlob(destinationBlobExists, hasDestinationBlobSHA512Value, destinationBlobSHA512Value, new Uri("https://blockBlob2"));`
	`44`	`+ var sourceBlob = GetMockedBlockBlob(sourceBlobExists, hasSourceBlobSHA512Value, sourceBlobSHA512Value, sourceSize, new Uri("https://blockBlob1"));`
	`45`	`+ var destinationBlob = GetMockedBlockBlob(destinationBlobExists, hasDestinationBlobSHA512Value, destinationBlobSHA512Value, destinationSize, new Uri("https://blockBlob2"));`
`41`	`46`
`42`	`47`	`// Act`
`43`	`48`	`var isSynchronized = await _storage.AreSynchronized(sourceBlob.Object, destinationBlob.Object);`
`@@ -48,8 +53,8 @@ public async Task ValidateAreSynchronizedmethod(bool sourceBlobExists,`
`48`	`53`
`49`	`54`	`if (sourceBlobExists && destinationBlobExists)`
`50`	`55`	`{`
`51`		`- sourceBlob.Verify(x => x.GetMetadataAsync(CancellationToken.None), Times.Once);`
`52`		`- destinationBlob.Verify(x => x.GetMetadataAsync(CancellationToken.None), Times.Once);`
	`56`	`+ sourceBlob.Verify(x => x.FetchAttributesAsync(CancellationToken.None), Times.Once);`
	`57`	`+ destinationBlob.Verify(x => x.FetchAttributesAsync(CancellationToken.None), Times.Once);`
`53`	`58`
`54`	`59`	`if (!hasSourceBlobSHA512Value)`
`55`	`60`	`{`
`@@ -69,7 +74,7 @@ public async Task ValidateAreSynchronizedmethod(bool sourceBlobExists,`
`69`	`74`	`Assert.Equal(expected, isSynchronized);`
`70`	`75`	`}`
`71`	`76`
`72`		`- private Mock<ICloudBlockBlob> GetMockedBlockBlob(bool isExisted, bool hasSHA512Value, string SHA512Value, Uri blockBlobUri)`
	`77`	`+ private Mock<ICloudBlockBlob> GetMockedBlockBlob(bool isExisted, bool hasSHA512Value, string SHA512Value, long size, Uri blockBlobUri)`
`73`	`78`	`{`
`74`	`79`	`var mockBlob = new Mock<ICloudBlockBlob>();`
`75`	`80`
`@@ -82,16 +87,16 @@ private Mock<ICloudBlockBlob> GetMockedBlockBlob(bool isExisted, bool hasSHA512V`
`82`	`87`
`83`	`88`	`if (hasSHA512Value)`
`84`	`89`	`{`
`85`		`- mockBlob.Setup(x => x.GetMetadataAsync(CancellationToken.None))`
`86`		`- .ReturnsAsync(new Dictionary<string, string>()`
	`90`	`+ mockBlob.Setup(x => x.FetchAttributesAsync(CancellationToken.None))`
	`91`	`+ .ReturnsAsync(BlobsModelFactory.BlobProperties(contentLength: size, metadata: new Dictionary<string, string>()`
`87`	`92`	`{`
`88`	`93`	`{ "SHA512", SHA512Value }`
`89`		`- });`
	`94`	`+ }));`
`90`	`95`	`}`
`91`	`96`	`else`
`92`	`97`	`{`
`93`		`- mockBlob.Setup(x => x.GetMetadataAsync(CancellationToken.None))`
`94`		`- .ReturnsAsync(new Dictionary<string, string>());`
	`98`	`+ mockBlob.Setup(x => x.FetchAttributesAsync(CancellationToken.None))`
	`99`	`+ .ReturnsAsync(BlobsModelFactory.BlobProperties(contentLength: size, metadata: new Dictionary<string, string>()));`
`95`	`100`	`}`
`96`	`101`	`}`
`97`	`102`
`@@ -116,13 +121,17 @@ private ICloudBlockBlob GetMockedBlockBlobWithNullMetadata(bool isBlobMetadataEx`
`116`	`121`	`{`
`117`	`122`	`if (isBlobMetadataExisted)`
`118`	`123`	`{`
`119`		`- return Mock.Of<ICloudBlockBlob>(x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&`
`120`		`- x.GetMetadataAsync(CancellationToken.None) == Task.FromResult<IReadOnlyDictionary<string, string>>(new Dictionary<string, string>()));`
	`124`	`+ var properties = BlobsModelFactory.BlobProperties(metadata: new Dictionary<string, string>());`
	`125`	`+ return Mock.Of<ICloudBlockBlob>(`
	`126`	`+ x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&`
	`127`	`+ x.FetchAttributesAsync(CancellationToken.None) == Task.FromResult(properties));`
`121`	`128`	`}`
`122`	`129`	`else`
`123`	`130`	`{`
`124`		`- return Mock.Of<ICloudBlockBlob>(x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&`
`125`		`- x.GetMetadataAsync(CancellationToken.None) == Task.FromResult<IReadOnlyDictionary<string, string>>(null));`
	`131`	`+ var properties = BlobsModelFactory.BlobProperties(metadata: null);`
	`132`	`+ return Mock.Of<ICloudBlockBlob>(`
	`133`	`+ x => x.ExistsAsync(CancellationToken.None) == Task.FromResult(true) &&`
	`134`	`+ x.FetchAttributesAsync(CancellationToken.None) == Task.FromResult(properties));`
`126`	`135`	`}`
`127`	`136`	`}`
`128`	`137`	`}`
`@@ -166,4 +175,4 @@ public AzureStorageBaseFacts()`
`166`	`175`	`false);`
`167`	`176`	`}`
`168`	`177`	`}`
`169`		`-}`
	`178`	`+}`