Merge pull request #10143 from NuGet/agr-msi-fixup

Statistics and Auditing storage access update.

Author: agr

src/NuGetGallery.Services/Configuration/IBlobStorageConfiguration.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.
 
 namespace NuGetGallery.Services
@@ -7,5 +7,7 @@ public interface IBlobStorageConfiguration
     {
         string ConnectionString { get; }
         bool ReadAccessGeoRedundant { get; }
+        string MsiClientId { get; }
+        bool UseMsi { get; }
     }
 }

src/NuGetGallery.Services/Configuration/SimpleBlobStorageConfiguration.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.
 
 namespace NuGetGallery.Services
@@ -17,10 +17,24 @@ public bool ReadAccessGeoRedundant
             private set;
         }
 
-    public SimpleBlobStorageConfiguration(string connectionString, bool readAccessGeoRedundant)
+        public bool UseMsi
+        {
+            get;
+            private set;
+        }
+
+        public string MsiClientId
+        {
+            get;
+            private set;
+        }
+
+    public SimpleBlobStorageConfiguration(string connectionString, bool readAccessGeoRedundant, bool useMsi, string msiClientId)
         {
             ConnectionString = connectionString;
             ReadAccessGeoRedundant = readAccessGeoRedundant;
+            UseMsi = useMsi;
+            MsiClientId = msiClientId;
         }
     }
 }

src/NuGetGallery/App_Start/DefaultDependenciesModule.cs

@@ -721,26 +721,42 @@ private static void RegisterDeleteAccountService(ContainerBuilder builder, Confi
         private static void RegisterStatisticsServices(ContainerBuilder builder, IGalleryConfigurationService configuration)
         {
             // when running on Windows Azure, download counts come from the downloads.v1.json blob
-            builder.Register(c => new SimpleBlobStorageConfiguration(configuration.Current.AzureStorage_Statistics_ConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant))
+            builder.Register(c => new SimpleBlobStorageConfiguration(
+                    configuration.Current.AzureStorage_Statistics_ConnectionString,
+                    configuration.Current.AzureStorageReadAccessGeoRedundant,
+                    configuration.Current.AzureStorageUseMsi,
+                    configuration.Current.AzureStorageMsiClientId))
                 .SingleInstance()
                 .Keyed<IBlobStorageConfiguration>(BindingKeys.PrimaryStatisticsKey);
 
-            builder.Register(c => new SimpleBlobStorageConfiguration(configuration.Current.AzureStorage_Statistics_ConnectionString_Alternate, configuration.Current.AzureStorageReadAccessGeoRedundant))
+            builder.Register(c => new SimpleBlobStorageConfiguration(
+                    configuration.Current.AzureStorage_Statistics_ConnectionString_Alternate,
+                    configuration.Current.AzureStorageReadAccessGeoRedundant,
+                    configuration.Current.AzureStorageUseMsi,
+                    configuration.Current.AzureStorageMsiClientId))
                 .SingleInstance()
                 .Keyed<IBlobStorageConfiguration>(BindingKeys.AlternateStatisticsKey);
 
             builder.Register(c =>
                 {
                     var blobConfiguration = c.ResolveKeyed<IBlobStorageConfiguration>(BindingKeys.PrimaryStatisticsKey);
-                    return new CloudBlobClientWrapper(blobConfiguration.ConnectionString, blobConfiguration.ReadAccessGeoRedundant);
+                    return CreateCloudBlobClientWrapper(
+                        blobConfiguration.ConnectionString,
+                        blobConfiguration.UseMsi,
+                        blobConfiguration.MsiClientId,
+                        blobConfiguration.ReadAccessGeoRedundant);
                 })
                 .SingleInstance()
                 .Keyed<ICloudBlobClient>(BindingKeys.PrimaryStatisticsKey);
 
             builder.Register(c =>
                 {
                     var blobConfiguration = c.ResolveKeyed<IBlobStorageConfiguration>(BindingKeys.AlternateStatisticsKey);
-                    return new CloudBlobClientWrapper(blobConfiguration.ConnectionString, blobConfiguration.ReadAccessGeoRedundant);
+                    return CreateCloudBlobClientWrapper(
+                        blobConfiguration.ConnectionString,
+                        blobConfiguration.UseMsi,
+                        blobConfiguration.MsiClientId,
+                        blobConfiguration.ReadAccessGeoRedundant);
                 })
                 .SingleInstance()
                 .Keyed<ICloudBlobClient>(BindingKeys.AlternateStatisticsKey);
@@ -1432,33 +1448,11 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC
             {
                 if (completedBindingKeys.Add(dependent.BindingKey))
                 {
-                    CloudBlobClientWrapper blobClient;
-                    if (!configuration.Current.AzureStorageUseMsi)
-                    {
-                        blobClient = new CloudBlobClientWrapper(dependent.AzureStorageConnectionString, configuration.Current.AzureStorageReadAccessGeoRedundant);
-                    }
-                    else
-                    {
-                        if (string.IsNullOrWhiteSpace(configuration.Current.AzureStorageMsiClientId))
-                        {
-#if DEBUG
-                            blobClient = CloudBlobClientWrapper.UsingDefaultAzureCredential(
-                                dependent.AzureStorageConnectionString,
-                                readAccessGeoRedundant: configuration.Current.AzureStorageReadAccessGeoRedundant);
-#else
-                            blobClient = CloudBlobClientWrapper.UsingMsi(
-                                dependent.AzureStorageConnectionString,
-                                readAccessGeoRedundant: configuration.Current.AzureStorageReadAccessGeoRedundant);
-#endif
-                        }
-                        else
-                        {
-                            blobClient = CloudBlobClientWrapper.UsingMsi(
-                                dependent.AzureStorageConnectionString,
-                                configuration.Current.AzureStorageMsiClientId,
-                                configuration.Current.AzureStorageReadAccessGeoRedundant);
-                        }
-                    }
+                    CloudBlobClientWrapper blobClient = CreateCloudBlobClientWrapper(
+                        dependent.AzureStorageConnectionString,
+                        configuration.Current.AzureStorageUseMsi,
+                        configuration.Current.AzureStorageMsiClientId,
+                        configuration.Current.AzureStorageReadAccessGeoRedundant);
                     builder.RegisterInstance(blobClient)
                         .AsSelf()
                         .As<ICloudBlobClient>()
@@ -1502,6 +1496,40 @@ private static void ConfigureForAzureStorage(ContainerBuilder builder, IGalleryC
                 .SingleInstance();
         }
 
+        private static CloudBlobClientWrapper CreateCloudBlobClientWrapper(
+            string connectionString,
+            bool useMsi,
+            string msiClientId,
+            bool useStorageReadAccessGeoRedundant)
+        {
+            if (!useMsi)
+            {
+                return new CloudBlobClientWrapper(connectionString, useStorageReadAccessGeoRedundant);
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(msiClientId))
+                {
+#if DEBUG
+                    return CloudBlobClientWrapper.UsingDefaultAzureCredential(
+                        connectionString,
+                        readAccessGeoRedundant: useStorageReadAccessGeoRedundant);
+#else
+                    return CloudBlobClientWrapper.UsingMsi(
+                        connectionString,
+                        readAccessGeoRedundant: useStorageReadAccessGeoRedundant);
+#endif
+                }
+                else
+                {
+                    return CloudBlobClientWrapper.UsingMsi(
+                        connectionString,
+                        msiClientId,
+                        useStorageReadAccessGeoRedundant);
+                }
+            }
+        }
+
         private static IAuditingService CombineAuditingServices(IEnumerable<IAuditingService> services)
         {
             if (!services.Any())
@@ -1540,7 +1568,11 @@ private static void RegisterAuditingServices(ContainerBuilder builder, string st
                 builder.Register(c =>
                     {
                         var configuration = c.Resolve<IAppConfiguration>();
-                        return new CloudBlobClientWrapper(configuration.AzureStorage_Auditing_ConnectionString, configuration.AzureStorageReadAccessGeoRedundant);
+                        return CreateCloudBlobClientWrapper(
+                            configuration.AzureStorage_Auditing_ConnectionString,
+                            configuration.AzureStorageUseMsi,
+                            configuration.AzureStorageMsiClientId,
+                            configuration.AzureStorageReadAccessGeoRedundant);
                     })
                     .SingleInstance()
                     .Keyed<ICloudBlobClient>(BindingKeys.AuditKey);
@@ -1630,4 +1662,4 @@ private static void RegisterTyposquattingServiceHelper(ContainerBuilder builder,
             .SingleInstance();
         }
     }
-}
+}