Removing blob storage SDK leakage into the code base

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
     <ServerCommonPackageVersion>2.120.0</ServerCommonPackageVersion>
-    <NuGetJobsPackageVersion>4.3.0-main-9408418</NuGetJobsPackageVersion>
+    <NuGetJobsPackageVersion>4.3.0-agr-azst-9643015</NuGetJobsPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">

src/NuGetGallery.Core/Auditing/CloudAuditingService.cs

@@ -5,9 +5,6 @@
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
-using Microsoft.WindowsAzure.Storage.Blob.Protocol;
 using Newtonsoft.Json;
 using NuGetGallery.Auditing.Obfuscation;
 
@@ -58,23 +55,16 @@ protected override async Task SaveAuditRecordAsync(string auditData, string reso
             {
                 await WriteBlob(auditData, fullPath, blob);
             }
-            catch (StorageException ex)
+            catch (CloudBlobContainerNotFoundException)
             {
-                if (ex.RequestInformation?.ExtendedErrorInformation?.ErrorCode == BlobErrorCodeStrings.ContainerNotFound)
-                {
-                    retry = true;
-                }
-                else
-                {
-                    throw;
-                }
+                retry = true;
             }
 
             if (retry)
             {
                 // Create the container and try again,
                 // this time we let exceptions bubble out
-                await container.CreateIfNotExistAsync(permissions: null);
+                await container.CreateIfNotExistAsync(enablePublicAccess: false);
                 await WriteBlob(auditData, fullPath, blob);
             }
         }
@@ -89,29 +79,25 @@ private static async Task WriteBlob(string auditData, string fullPath, ISimpleCl
         {
             try
             {
-                using (var stream = await blob.OpenWriteAsync(AccessCondition.GenerateIfNoneMatchCondition("*")))
+                using (var stream = await blob.OpenWriteAsync(AccessConditionWrapper.GenerateIfNoneMatchCondition("*")))
                 using (var writer = new StreamWriter(stream))
                 {
                     await writer.WriteAsync(auditData);
                 }
             }
-            catch (StorageException ex)
+            catch (CloudBlobConflictException ex)
             {
-                if (ex.RequestInformation != null && ex.RequestInformation.HttpStatusCode == 409)
-                {
-                    // Blob already existed!
-                    throw new InvalidOperationException(String.Format(
-                        CultureInfo.CurrentCulture,
-                        CoreStrings.CloudAuditingService_DuplicateAuditRecord,
-                        fullPath), ex);
-                }
-                throw;
+                // Blob already existed!
+                throw new InvalidOperationException(String.Format(
+                    CultureInfo.CurrentCulture,
+                    CoreStrings.CloudAuditingService_DuplicateAuditRecord,
+                    fullPath), ex.InnerException);
             }
         }
 
-        public Task<bool> IsAvailableAsync(BlobRequestOptions options, OperationContext operationContext)
+        public Task<bool> IsAvailableAsync(CloudBlobLocationMode? locationMode)
         {
-            return _auditContainerFactory().ExistsAsync(options, operationContext);
+            return _auditContainerFactory().ExistsAsync(locationMode);
         }
 
         public override string RenderAuditEntry(AuditEntry entry)

src/NuGetGallery.Core/Features/EditableFeatureFlagFileStorageService.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.WindowsAzure.Storage;
 using Newtonsoft.Json;
 using NuGet.Services.Entities;
 using NuGet.Services.FeatureFlags;
@@ -117,7 +116,7 @@ private async Task<ContentSaveResult> TrySaveInternalAsync(FeatureFlags flags, s
                     return ContentSaveResult.Ok;
                 }
             }
-            catch (StorageException e) when (e.IsPreconditionFailedException())
+            catch (CloudBlobPreconditionFailedException)
             {
                 return ContentSaveResult.Conflict;
             }

src/NuGetGallery.Core/ICloudStorageStatusDependency.cs

@@ -2,8 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace NuGetGallery
 {
@@ -13,6 +11,6 @@ namespace NuGetGallery
     /// </summary>
     public interface ICloudStorageStatusDependency
     {
-        Task<bool> IsAvailableAsync(BlobRequestOptions options, OperationContext operationContext);
+        Task<bool> IsAvailableAsync(CloudBlobLocationMode? locationMode);
     }
 }

src/NuGetGallery.Core/Login/EditableLoginConfigurationFileStorageService.cs

@@ -5,10 +5,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.ComTypes;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.WindowsAzure.Storage;
 using Newtonsoft.Json;
 using NuGetGallery.Shared;
 
@@ -123,7 +121,7 @@ private async Task<ContentSaveResult> TrySaveInternalAsync(LoginDiscontinuation
                     return ContentSaveResult.Ok;
                 }
             }
-            catch (StorageException e) when (e.IsPreconditionFailedException())
+            catch (CloudBlobPreconditionFailedException)
             {
                 return ContentSaveResult.Conflict;
             }

src/NuGetGallery.Core/Services/BlobListContinuationToken.cs

@@ -0,0 +1,16 @@
+// 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 Microsoft.WindowsAzure.Storage.Blob;
+
+namespace NuGetGallery
+{
+    internal class BlobListContinuationToken : IBlobListContinuationToken
+    {
+        public BlobListContinuationToken(BlobContinuationToken continuationToken)
+        {
+            ContinuationToken = continuationToken;
+        }
+        public BlobContinuationToken ContinuationToken { get; }
+    }
+}

src/NuGetGallery.Core/Services/BlobResultSegmentWrapper.cs

@@ -15,10 +15,10 @@ public BlobResultSegmentWrapper(BlobResultSegment segment)
             // creation of block blobs so it's good enough for now. If another caller created a non-block blob, this
             // cast will fail at runtime.
             Results = segment.Results.Cast<CloudBlockBlob>().Select(x => new CloudBlobWrapper(x)).ToList();
-            ContinuationToken = segment.ContinuationToken;
+            ContinuationToken = new BlobListContinuationToken(segment.ContinuationToken);
         }
 
         public IReadOnlyList<ISimpleCloudBlob> Results { get; }
-        public BlobContinuationToken ContinuationToken { get; }
+        public IBlobListContinuationToken ContinuationToken { get; }
     }
 }

src/NuGetGallery.Core/Services/CloudBlobConflictException.cs

@@ -0,0 +1,15 @@
+// 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;
+
+namespace NuGetGallery
+{
+    public class CloudBlobConflictException : CloudBlobStorageException
+    {
+        public CloudBlobConflictException(Exception innerException)
+            : base(innerException)
+        {
+        }
+    }
+}

src/NuGetGallery.Core/Services/CloudBlobContainerNotFoundException.cs

@@ -0,0 +1,15 @@
+// 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;
+
+namespace NuGetGallery
+{
+    public class CloudBlobContainerNotFoundException : CloudBlobGenericNotFoundException
+    {
+        public CloudBlobContainerNotFoundException(Exception innerException)
+            : base("Container not found", innerException)
+        {
+        }
+    }
+}

src/NuGetGallery.Core/Services/CloudBlobContainerWrapper.cs

@@ -1,9 +1,9 @@
 // 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;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace NuGetGallery
@@ -20,70 +20,93 @@ public CloudBlobContainerWrapper(CloudBlobContainer blobContainer)
         public async Task<ISimpleBlobResultSegment> ListBlobsSegmentedAsync(
             string prefix,
             bool useFlatBlobListing,
-            BlobListingDetails blobListingDetails,
+            ListingDetails blobListingDetails,
             int? maxResults,
-            BlobContinuationToken blobContinuationToken,
-            BlobRequestOptions options,
-            OperationContext operationContext,
+            IBlobListContinuationToken blobContinuationToken,
+            TimeSpan? requestTimeout,
+            CloudBlobLocationMode? cloudBlobLocationMode,
             CancellationToken cancellationToken)
         {
-            var segment = await _blobContainer.ListBlobsSegmentedAsync(
-                prefix,
-                useFlatBlobListing,
-                blobListingDetails,
-                maxResults,
-                blobContinuationToken,
-                options,
-                operationContext,
-                cancellationToken);
-
-            return new BlobResultSegmentWrapper(segment);
-        }
-
-        public Task CreateIfNotExistAsync(BlobContainerPermissions permissions)
-        {
-            var publicAccess = permissions?.PublicAccess;
+            BlobContinuationToken continuationToken = null;
+            if (blobContinuationToken != null)
+            {
+                if (blobContinuationToken is BlobListContinuationToken token)
+                {
+                    continuationToken = token.ContinuationToken;
+                }
+                else
+                {
+                    throw new ArgumentException();
+                }
+            }
 
-            if (publicAccess.HasValue)
+            BlobRequestOptions options = null;
+            if (requestTimeout.HasValue || cloudBlobLocationMode.HasValue)
             {
-                return _blobContainer.CreateIfNotExistsAsync(publicAccess.Value, options: null, operationContext: null);
+                options = new BlobRequestOptions();
+                if (requestTimeout.HasValue)
+                {
+                    options.ServerTimeout = requestTimeout.Value;
+                }
+                if (cloudBlobLocationMode.HasValue)
+                {
+                    options.LocationMode = CloudWrapperHelpers.GetSdkRetryPolicy(cloudBlobLocationMode.Value);
+                }
             }
 
-            return _blobContainer.CreateIfNotExistsAsync();
-        }
+            var segment = await CloudWrapperHelpers.WrapStorageExceptionAsync(() =>
+                _blobContainer.ListBlobsSegmentedAsync(
+                    prefix,
+                    useFlatBlobListing,
+                    CloudWrapperHelpers.GetSdkBlobListingDetails(blobListingDetails),
+                    maxResults,
+                    continuationToken,
+                    options,
+                    operationContext: null,
+                    cancellationToken: cancellationToken));
 
-        public async Task SetPermissionsAsync(BlobContainerPermissions permissions)
+            return new BlobResultSegmentWrapper(segment);
+        }
+
+        public async Task CreateIfNotExistAsync(bool enablePublicAccess)
         {
-            await _blobContainer.SetPermissionsAsync(permissions);
+            var accessType = enablePublicAccess ? BlobContainerPublicAccessType.Blob : BlobContainerPublicAccessType.Off;
+
+            await CloudWrapperHelpers.WrapStorageExceptionAsync(() =>
+                _blobContainer.CreateIfNotExistsAsync(accessType, options: null, operationContext: null));
         }
 
         public ISimpleCloudBlob GetBlobReference(string blobAddressUri)
         {
             return new CloudBlobWrapper(_blobContainer.GetBlockBlobReference(blobAddressUri));
         }
 
-        public async Task<bool> ExistsAsync(BlobRequestOptions blobRequestOptions, OperationContext context)
+        public async Task<bool> ExistsAsync(CloudBlobLocationMode? cloudBlobLocationMode)
         {
-            return await _blobContainer.ExistsAsync(blobRequestOptions, context);
+            BlobRequestOptions options = null;
+            if (cloudBlobLocationMode.HasValue)
+            {
+                options = new BlobRequestOptions
+                {
+                    LocationMode = CloudWrapperHelpers.GetSdkRetryPolicy(cloudBlobLocationMode.Value),
+                };
+            }
+            return await CloudWrapperHelpers.WrapStorageExceptionAsync(() =>
+                _blobContainer.ExistsAsync(options, operationContext: null));
         }
 
         public async Task<bool> DeleteIfExistsAsync()
         {
-            return await _blobContainer.DeleteIfExistsAsync();
+            return await CloudWrapperHelpers.WrapStorageExceptionAsync(() =>
+                _blobContainer.DeleteIfExistsAsync());
         }
 
-        public async Task CreateAsync(BlobContainerPermissions permissions)
+        public async Task CreateAsync(bool enablePublicAccess)
         {
-            var publicAccess = permissions?.PublicAccess;
+            var accessType = enablePublicAccess ? BlobContainerPublicAccessType.Blob : BlobContainerPublicAccessType.Off;
 
-            if (publicAccess.HasValue)
-            {
-                await _blobContainer.CreateAsync(publicAccess.Value, options: null, operationContext: null);
-            }
-            else
-            {
-                await _blobContainer.CreateAsync();
-            }
+            await CloudWrapperHelpers.WrapStorageExceptionAsync(() =>
+                _blobContainer.CreateAsync(accessType, options: null, operationContext: null));
         }
     }
 }

src/NuGetGallery.Core/Services/CloudBlobCopyState.cs

@@ -0,0 +1,21 @@
+// 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;
+using Microsoft.WindowsAzure.Storage.Blob;
+
+namespace NuGetGallery
+{
+    internal class CloudBlobCopyState : ICloudBlobCopyState
+    {
+        private readonly CloudBlockBlob _blob;
+
+        public CloudBlobCopyState(CloudBlockBlob blob)
+        {
+            _blob = blob ?? throw new ArgumentNullException(nameof(blob));
+        }
+        public CloudBlobCopyStatus Status => CloudWrapperHelpers.GetBlobCopyStatus(_blob.CopyState.Status);
+
+        public string StatusDescription => _blob.CopyState.StatusDescription;
+    }
+}