clean up connection string parsing

Author: advay26

src/NuGet.Services.Validation.Orchestrator/Job.cs

@@ -10,7 +10,6 @@
 using System.Threading.Tasks;
 using Autofac;
 using Autofac.Core;
-using Azure.Core;
 using Azure.Identity;
 using Azure.Storage.Blobs;
 using Microsoft.ApplicationInsights;
@@ -621,27 +620,29 @@ private static BlobServiceClient CreateBlobServiceClient(
             {
                 if (string.IsNullOrWhiteSpace(msiConfiguration.ManagedIdentityClientId))
                 {
-                    // Using MSI with DefaultAzureCredential (local debugging)
+                    // 1. Using MSI with DefaultAzureCredential (local debugging)
                     var defaultAzureCredentialOptions = new DefaultAzureCredentialOptions
                     {
-                        ManagedIdentityClientId = msiConfiguration.ManagedIdentityClientId,
+                        ManagedIdentityClientId = null,
                     };
-                    var tokenCredential = new DefaultAzureCredential(defaultAzureCredentialOptions);
 
-                    return new BlobServiceClient(new Uri(storageConnectionString), tokenCredential, blobClientOptions);
+                    return new BlobServiceClient(
+                        ConnectionStringExtensions.GetBlobEndpointFromConnectionString(storageConnectionString),
+                        new DefaultAzureCredential(defaultAzureCredentialOptions),
+                        blobClientOptions);
                 }
                 else
                 {
-                    // Using MSI with ClientId
-                    var tokenCredential = new ManagedIdentityCredential(msiConfiguration.ManagedIdentityClientId);
-
-                    return new BlobServiceClient(new Uri(storageConnectionString), tokenCredential, blobClientOptions);
+                    // 2. Using MSI with ClientId
+                    return new BlobServiceClient(
+                        ConnectionStringExtensions.GetBlobEndpointFromConnectionString(storageConnectionString),
+                        new ManagedIdentityCredential(msiConfiguration.ManagedIdentityClientId),
+                        blobClientOptions);
                 }
             }
             else
             {
-                // Using SAS token
-
+                // 3. Using SAS token
                 // workaround for https://github.com/Azure/azure-sdk-for-net/issues/44373
                 var connectionString = storageConnectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");
 

src/NuGetGallery.Core/Extensions/ConnectionStringExtensions.cs

@@ -0,0 +1,25 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Azure.Storage.Blobs;
+
+namespace NuGetGallery
+{
+    public static class ConnectionStringExtensions
+    {
+        public static Uri GetBlobEndpointFromConnectionString(string connectionString)
+        {
+            var tempClient = new BlobServiceClient(connectionString);
+            // if _storageConnectionString has SAS token, Uri will contain SAS signature, we need to strip it
+            var uriBuilder = new UriBuilder(tempClient.Uri);
+            uriBuilder.Query = "";
+            uriBuilder.Fragment = "";
+            return uriBuilder.Uri;
+        }
+    }
+}

src/NuGetGallery.Core/Services/CloudBlobClientWrapper.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;
@@ -177,12 +177,7 @@ internal BlobContainerClient CreateBlobContainerClient(CloudBlobLocationMode loc
 
         private Uri GetPrimaryServiceUri()
         {
-            var tempClient = new BlobServiceClient(_storageConnectionString);
-            // if _storageConnectionString has SAS token, Uri will contain SAS signature, we need to strip it
-            var uriBuilder = new UriBuilder(tempClient.Uri);
-            uriBuilder.Query = "";
-            uriBuilder.Fragment = "";
-            return uriBuilder.Uri;
+            return ConnectionStringExtensions.GetBlobEndpointFromConnectionString(_storageConnectionString);
         }
 
         private Uri GetSecondaryServiceUri()
@@ -278,4 +273,4 @@ private static ClientCertificateCredential GetCredentialUsingServicePrincipal(st
             return new ClientCertificateCredential(tenantId, appID, clientCert, new ClientCertificateCredentialOptions { AuthorityHost = new Uri(authorityHost), SendCertificateChain = true });
         }
     }
-}
+}