[Storage] Fixed bug where connection string with account name not set in Storage Client (Azure#48636)

* WIP - blobs, datalake is done, not yet shares or queues is done yet

* Add fix into Share Files and Queues; Updated Changelog

* Added fix to set account name when passed SharedKey

* Forgot to commit datalake directory and file

* Updated changelog

Author: amnguye

sdk/storage/Azure.Storage.Blobs/CHANGELOG.md

@@ -8,7 +8,8 @@
 ### Breaking Changes
 
 ### Bugs Fixed
-
+- Fixed bug where a `BlobServiceClient`, `BlobContainerClient`, `BlobBaseClient` created with a connection string with an account name specified (e.g. "AccountName=..;"), the account name was not populated on the Storage Clients if the account name was not also specified in the endpoint. (#42925)
+- Fixed bug where a `BlobServiceClient`, `BlobContainerClient`, `BlobBaseClient` created with a `StorageSharedKeyCredential`, the account name was not populated on the Storage Clients if the account name was not also specified in the endpoint. (#42925)
 ### Other Changes
 
 ## 12.24.0-beta.1 (2025-02-11)

sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs

@@ -207,6 +207,9 @@ public BlobBaseClient(string connectionString, string blobContainerName, string
                     BlobName = blobName
                 };
             _uri = builder.ToUri();
+            _accountName = conn.AccountName;
+            _containerName = blobContainerName;
+            _name = blobName;
 
             _clientConfiguration = new BlobClientConfiguration(
                 pipeline: options.Build(conn.Credentials),
@@ -278,6 +281,7 @@ public BlobBaseClient(Uri blobUri, StorageSharedKeyCredential credential, BlobCl
                   sasCredential: null,
                   tokenCredential: null)
         {
+            _accountName ??= credential?.AccountName;
         }
 
         /// <summary>
@@ -605,9 +609,9 @@ private void SetNameFieldsIfNull()
             if (_name == null || _containerName == null || _accountName == null)
             {
                 var builder = new BlobUriBuilder(Uri, ClientConfiguration.TrimBlobNameSlashes);
-                _name = builder.BlobName;
-                _containerName = builder.BlobContainerName;
-                _accountName = builder.AccountName;
+                _name ??= builder.BlobName;
+                _containerName ??= builder.BlobContainerName;
+                _accountName ??= builder.AccountName;
             }
         }
 

sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs

@@ -193,6 +193,8 @@ public BlobContainerClient(string connectionString, string blobContainerName, Bl
                 BlobContainerName = blobContainerName
             };
             _uri = builder.ToUri();
+            _name = blobContainerName;
+            _accountName = conn.AccountName;
             options ??= new BlobClientOptions();
 
             _clientConfiguration = new BlobClientConfiguration(
@@ -275,6 +277,7 @@ public BlobContainerClient(Uri blobContainerUri, StorageSharedKeyCredential cred
             Argument.AssertNotNull(blobContainerUri, nameof(blobContainerUri));
             HttpPipelinePolicy authPolicy = credential.AsPolicy();
             _uri = blobContainerUri;
+            _accountName = credential.AccountName;
             _authenticationPolicy = authPolicy;
             options ??= new BlobClientOptions();
 
@@ -626,8 +629,8 @@ private void SetNameFieldsIfNull()
             if (_name == null || _accountName == null)
             {
                 var builder = new BlobUriBuilder(Uri, ClientConfiguration.TrimBlobNameSlashes);
-                _name = builder.BlobContainerName;
-                _accountName = builder.AccountName;
+                _name ??= builder.BlobContainerName;
+                _accountName ??= builder.AccountName;
             }
         }
 

sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs

@@ -149,6 +149,7 @@ public BlobServiceClient(string connectionString, BlobClientOptions options)
             _uri = conn.BlobEndpoint;
             options ??= new BlobClientOptions();
             _authenticationPolicy = StorageClientOptions.GetAuthenticationPolicy(conn.Credentials);
+            _accountName = conn.AccountName;
 
             _clientConfiguration = new BlobClientConfiguration(
                 pipeline: options.Build(_authenticationPolicy),
@@ -330,6 +331,7 @@ internal BlobServiceClient(
                   authentication,
                   options?._clientSideEncryptionOptions?.Clone())
         {
+            _accountName ??= storageSharedKeyCredential?.AccountName;
         }
 
         /// <summary>

sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs

@@ -70,6 +70,28 @@ public void Ctor_ConnectionString()
             Assert.AreEqual("accountName", builder2.AccountName);
         }
 
+        [Test]
+        public void Ctor_ConnectionString_CustomUri()
+        {
+            var accountName = "accountName";
+            var accountKey = Convert.ToBase64String(new byte[] { 0, 1, 2, 3, 4, 5 });
+
+            var credentials = new StorageSharedKeyCredential(accountName, accountKey);
+            var blobEndpoint = new Uri("http://customdomain/" + accountName);
+            var blobSecondaryEndpoint = new Uri("http://customdomain/" + accountName + "-secondary");
+
+            var connectionString = new StorageConnectionString(credentials, blobStorageUri: (blobEndpoint, blobSecondaryEndpoint));
+
+            var containerName = "containername";
+            var blobName = "blobname";
+
+            BlobBaseClient blobClient = new BlobBaseClient(connectionString.ToString(true), containerName, blobName);
+
+            Assert.AreEqual(containerName, blobClient.BlobContainerName);
+            Assert.AreEqual(blobName, blobClient.Name);
+            Assert.AreEqual(accountName, blobClient.AccountName);
+        }
+
         [RecordedTest]
         public async Task Ctor_ConnectionStringEscapeBlobName()
         {
@@ -214,6 +236,24 @@ public void Ctor_CPK_EncryptionScope()
                 new ArgumentException("CustomerProvidedKey and EncryptionScope cannot both be set"));
         }
 
+        [Test]
+        public void Ctor_SharedKey_AccountName()
+        {
+            // Arrange
+            var accountName = "accountName";
+            var containerName = "containerName";
+            var blobName = "blobName";
+            var accountKey = Convert.ToBase64String(new byte[] { 0, 1, 2, 3, 4, 5 });
+            var credentials = new StorageSharedKeyCredential(accountName, accountKey);
+            var blobEndpoint = new Uri($"https://customdomain/{containerName}/{blobName}");
+
+            BlobBaseClient blobClient = new BlobBaseClient(blobEndpoint, credentials);
+
+            Assert.AreEqual(accountName, blobClient.AccountName);
+            Assert.AreEqual(containerName, blobClient.BlobContainerName);
+            Assert.AreEqual(blobName, blobClient.Name);
+        }
+
         [RecordedTest]
         public async Task Ctor_AzureSasCredential()
         {

sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs

@@ -63,6 +63,30 @@ public void Ctor_ConnectionString()
             Assert.AreEqual(accountName, builder.AccountName);
         }
 
+        [Test]
+        public void Ctor_ConnectionString_CustomUri()
+        {
+            var accountName = "accountName";
+            var accountKey = Convert.ToBase64String(new byte[] { 0, 1, 2, 3, 4, 5 });
+
+            var credentials = new StorageSharedKeyCredential(accountName, accountKey);
+            var blobEndpoint = new Uri("http://customdomain/" + accountName);
+            var blobSecondaryEndpoint = new Uri("http://customdomain/" + accountName + "-secondary");
+
+            var connectionString = new StorageConnectionString(credentials, blobStorageUri: (blobEndpoint, blobSecondaryEndpoint));
+
+            var containerName = "containername";
+
+            BlobContainerClient container = new BlobContainerClient(connectionString.ToString(true), containerName);
+
+            var builder = new BlobUriBuilder(container.Uri);
+
+            Assert.AreEqual(containerName, builder.BlobContainerName);
+            Assert.AreEqual("", builder.BlobName);
+            Assert.AreEqual(containerName, container.Name);
+            Assert.AreEqual(accountName, container.AccountName);
+        }
+
         [RecordedTest]
         [TestCase(true)] // https://github.com/Azure/azure-sdk-for-net/issues/9110
         [TestCase(false)]
@@ -303,6 +327,22 @@ public void Ctor_CPK_EncryptionScope()
                 new ArgumentException("CustomerProvidedKey and EncryptionScope cannot both be set"));
         }
 
+        [Test]
+        public void Ctor_SharedKey_AccountName()
+        {
+            // Arrange
+            var accountName = "accountName";
+            var containerName = "containerName";
+            var accountKey = Convert.ToBase64String(new byte[] { 0, 1, 2, 3, 4, 5 });
+            var credentials = new StorageSharedKeyCredential(accountName, accountKey);
+            var blobEndpoint = new Uri($"https://customdomain/{containerName}");
+
+            BlobContainerClient blobClient = new BlobContainerClient(blobEndpoint, credentials);
+
+            Assert.AreEqual(accountName, blobClient.AccountName);
+            Assert.AreEqual(containerName, blobClient.Name);
+        }
+
         [RecordedTest]
         public async Task Ctor_AzureSasCredential()
         {

sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs

@@ -56,6 +56,23 @@ public void Ctor_ConnectionString()
             Assert.AreEqual(accountName, builder2.AccountName);
         }
 
+        [Test]
+        public void Ctor_ConnectionString_CustomUri()
+        {
+            var accountName = "accountName";
+            var accountKey = Convert.ToBase64String(new byte[] { 0, 1, 2, 3, 4, 5 });
+
+            var credentials = new StorageSharedKeyCredential(accountName, accountKey);
+            var blobEndpoint = new Uri("http://customdomain/" + accountName);
+            var blobSecondaryEndpoint = new Uri("http://customdomain/" + accountName + "-secondary");
+
+            var connectionString = new StorageConnectionString(credentials, blobStorageUri: (blobEndpoint, blobSecondaryEndpoint));
+
+            BlobServiceClient service = new BlobServiceClient(connectionString.ToString(true));
+
+            Assert.AreEqual(accountName, service.AccountName);
+        }
+
         [RecordedTest]
         public void Ctor_Uri()
         {
@@ -125,6 +142,20 @@ public void Ctor_CPK_EncryptionScope()
                 new ArgumentException("CustomerProvidedKey and EncryptionScope cannot both be set"));
         }
 
+        [Test]
+        public void Ctor_SharedKey_AccountName()
+        {
+            // Arrange
+            var accountName = "accountName";
+            var accountKey = Convert.ToBase64String(new byte[] { 0, 1, 2, 3, 4, 5 });
+            var credentials = new StorageSharedKeyCredential(accountName, accountKey);
+            var blobEndpoint = new Uri($"https://customdomain/");
+
+            BlobServiceClient blobClient = new BlobServiceClient(blobEndpoint, credentials);
+
+            Assert.AreEqual(accountName, blobClient.AccountName);
+        }
+
         [RecordedTest]
         public async Task Ctor_AzureSasCredential()
         {

sdk/storage/Azure.Storage.Common/CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fixed bug to ensure that the accumulated disposables within the internal `StorageWriteStream` are disposed properly in the event that an exception is thrown during the disposal process. (#47781)
 - Fixed bug to Redact SAS credentials from Error.SasCredentialRequiresUriWithoutSas message.
 - Fixed bug where LazyLoadingReadOnlyStream overprovisions the default buffer memory for OpenRead
+- Fixed bug where a client created with a connection string with an account name specified (e.g. "AccountName=..;"), the account name was not populated on the Storage Clients if the account name was not also specified in the endpoint. (#42925)
 
 ### Other Changes
 - Implemented IAsyncDisposable in StorageWriteStream

sdk/storage/Azure.Storage.Common/src/Shared/StorageConnectionString.cs

@@ -222,9 +222,9 @@ public static StorageConnectionString DevelopmentStorageAccount
         public object Credentials { get; set; }
 
         /// <summary>
-        /// Private record of the account name for use in ToString(bool).
+        /// Gets the account name.
         /// </summary>
-        internal string _accountName;
+        public string AccountName;
 
         /// <summary>
         /// Parses a connection string and returns a <see cref="StorageConnectionString"/> created
@@ -516,7 +516,7 @@ static Uri CreateUri(string endpoint, string sasToken)
                             Settings = s_validCredentials(settings)
                         };
 
-                    accountInformation._accountName = settingOrDefault(Constants.ConnectionStrings.AccountNameSetting);
+                    accountInformation.AccountName = settingOrDefault(Constants.ConnectionStrings.AccountNameSetting);
 
                     return true;
                 }

sdk/storage/Azure.Storage.Common/tests/Shared/TestExtensions.cs

@@ -126,7 +126,7 @@ internal static StorageConnectionString CreateStorageConnectionString(
                 throw Errors.ArgumentNull(nameof(accountName));
             }
 
-            conn._accountName = accountName;
+            conn.AccountName = accountName;
             var sasToken = (storageCredentials is SharedAccessSignatureCredentials sasCredentials) ? sasCredentials.SasToken : default;
 
             var scheme = useHttps ? Constants.Https : Constants.Http;
@@ -205,9 +205,9 @@ internal static string ToString(this StorageConnectionString conn, bool exportSe
                 listOfSettings.Add(ToString(conn.Credentials, exportSecrets));
             }
 
-            if (!string.IsNullOrWhiteSpace(conn._accountName) && (conn.Credentials is StorageSharedKeyCredential sharedKeyCredentials ? string.IsNullOrWhiteSpace(sharedKeyCredentials.AccountName) : true))
+            if (!string.IsNullOrWhiteSpace(conn.AccountName) && (conn.Credentials is StorageSharedKeyCredential sharedKeyCredentials ? string.IsNullOrWhiteSpace(sharedKeyCredentials.AccountName) : true))
             {
-                listOfSettings.Add(string.Format(CultureInfo.InvariantCulture, "{0}={1}", Constants.ConnectionStrings.AccountNameSetting, conn._accountName));
+                listOfSettings.Add(string.Format(CultureInfo.InvariantCulture, "{0}={1}", Constants.ConnectionStrings.AccountNameSetting, conn.AccountName));
             }
 
             return string.Join(";", listOfSettings);