Using Azure.Storage.Blobs for storage access

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-gal-stsdk-9768098</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/NuGetGallery.Core.csproj

@@ -43,16 +43,18 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
+
+    <PackageReference Include="Azure.Core" Version="1.39.0" />
+    <PackageReference Include="Azure.Identity" Version="1.11.3" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.20.0" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="NuGet.Packaging">
       <Version>$(NuGetClientPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.FeatureFlags">
       <Version>$(ServerCommonPackageVersion)</Version>
     </PackageReference>
-    <PackageReference Include="WindowsAzure.Storage">
-      <Version>9.3.3</Version>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">

src/NuGetGallery.Core/Services/AccessConditionWrapper.cs

@@ -1,8 +1,6 @@
 // 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;
-
 namespace NuGetGallery
 {
     public class AccessConditionWrapper : IAccessCondition
@@ -28,20 +26,20 @@ public static IAccessCondition GenerateIfMatchCondition(string etag)
         {
             return new AccessConditionWrapper(
                 ifNoneMatchETag: null,
-                ifMatchETag: AccessCondition.GenerateIfMatchCondition(etag).IfMatchETag);
+                ifMatchETag: etag);
         }
 
         public static IAccessCondition GenerateIfNoneMatchCondition(string etag)
         {
             return new AccessConditionWrapper(
-                ifNoneMatchETag: AccessCondition.GenerateIfNoneMatchCondition(etag).IfNoneMatchETag,
+                ifNoneMatchETag: etag,
                 ifMatchETag: null);
         }
 
         public static IAccessCondition GenerateIfNotExistsCondition()
         {
             return new AccessConditionWrapper(
-                ifNoneMatchETag: AccessCondition.GenerateIfNotExistsCondition().IfNoneMatchETag,
+                ifNoneMatchETag: "*",
                 ifMatchETag: null);
         }
     }

src/NuGetGallery.Core/Services/BlobListContinuationToken.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.
+
+namespace NuGetGallery
+{
+    public class BlobListContinuationToken
+    {
+        internal BlobListContinuationToken(string continuationToken)
+        {
+            ContinuationToken = continuationToken;
+        }
+
+        internal string ContinuationToken { get; }
+    }
+}

src/NuGetGallery.Core/Services/BlobResultSegmentWrapper.cs

@@ -2,23 +2,21 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using System.Linq;
-using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace NuGetGallery
 {
     public class BlobResultSegmentWrapper : ISimpleBlobResultSegment
     {
-        public BlobResultSegmentWrapper(BlobResultSegment segment)
+        public BlobResultSegmentWrapper(IReadOnlyList<ISimpleCloudBlob> items, string continuationToken)
         {
             // For now, assume all of the blobs are block blobs. This library's storage abstraction only allows
             // 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;
+            Results = items;
+            ContinuationToken = new BlobListContinuationToken(continuationToken);
         }
 
         public IReadOnlyList<ISimpleCloudBlob> Results { get; }
-        public BlobContinuationToken ContinuationToken { get; }
+        public BlobListContinuationToken ContinuationToken { get; }
     }
 }