added ManagedIdentityClientId as fallback for storage MSI

Author: advay26

src/NuGet.Jobs.Common/StorageAccountExtensions.cs

@@ -7,20 +7,18 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using NuGet.Services.Configuration;
 using NuGetGallery;
 
 namespace NuGet.Jobs
 {
     public static class StorageAccountHelper
     {
-        private const string StorageUseManagedIdentityPropertyName = "Storage_UseManagedIdentity";
-        private const string StorageManagedIdentityClientIdPropertyName = "Storage_ManagedIdentityClientId";
-
         public static IServiceCollection ConfigureStorageMsi(
             this IServiceCollection serviceCollection,
             IConfiguration configuration,
-            string useManageIdentityPropertyName = null,
-            string managedIdentityClientIdPropertyName = null)
+            string storageUseManagedIdentityPropertyName = null,
+            string storageManagedIdentityClientIdPropertyName = null)
         {
             if (serviceCollection == null)
             {
@@ -31,11 +29,13 @@ public static IServiceCollection ConfigureStorageMsi(
                 throw new ArgumentNullException(nameof(configuration));
             }
 
-            useManageIdentityPropertyName ??= StorageUseManagedIdentityPropertyName;
-            managedIdentityClientIdPropertyName ??= StorageManagedIdentityClientIdPropertyName;
+            storageUseManagedIdentityPropertyName ??= Constants.StorageUseManagedIdentityPropertyName;
+            storageManagedIdentityClientIdPropertyName ??= Constants.StorageManagedIdentityClientIdPropertyName;
 
-            string useManagedIdentityStr = configuration[useManageIdentityPropertyName];
-            string managedIdentityClientId = configuration[managedIdentityClientIdPropertyName];
+            string useManagedIdentityStr = configuration[storageUseManagedIdentityPropertyName];
+            string managedIdentityClientId = string.IsNullOrEmpty(configuration[storageManagedIdentityClientIdPropertyName])
+                                                ? configuration[Constants.ManagedIdentityClientIdKey]
+                                                : configuration[storageManagedIdentityClientIdPropertyName];
             bool useManagedIdentity = false;
             if (!string.IsNullOrWhiteSpace(useManagedIdentityStr))
             {

src/NuGet.Services.Configuration/Constants.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 NuGet.Services.Configuration
@@ -15,5 +15,7 @@ public static class Constants
         public static string KeyVaultStoreNameKey = "KeyVault_StoreName";
         public static string KeyVaultStoreLocationKey = "KeyVault_StoreLocation";
         public static string KeyVaultSendX5c = "KeyVault_SendX5c";
+        public static string StorageUseManagedIdentityPropertyName = "Storage_UseManagedIdentity";
+        public static string StorageManagedIdentityClientIdPropertyName = "Storage_ManagedIdentityClientId";
     }
 }