Fix TableClient.Uri Property when Targeting Azurite (Azure#35566)

* Fix Uri generation for emulator clients

Author: wsugarman

sdk/tables/Azure.Data.Tables/CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed the URL returned by `TableClient.Uri` when connecting to Azurite
 
 ### Other Changes
 

sdk/tables/Azure.Data.Tables/src/TableClient.cs

@@ -236,7 +236,7 @@ public TableClient(string connectionString, string tableName, TableClientOptions
             _tableOperations = new TableRestClient(_diagnostics, _pipeline, _endpoint.AbsoluteUri, _version);
             _batchOperations = new TableRestClient(_diagnostics, CreateBatchPipeline(), _tableOperations.endpoint, _tableOperations.clientVersion);
             Name = tableName;
-            Uri = new Uri(_endpoint, Name);
+            Uri = new TableUriBuilder(_endpoint) { Query = null, Sas = null, Tablename = Name }.ToUri();
         }
 
         /// <summary>
@@ -288,7 +288,7 @@ public TableClient(Uri endpoint, string tableName, TokenCredential tokenCredenti
             _tableOperations = new TableRestClient(_diagnostics, _pipeline, _endpoint.AbsoluteUri, _version);
             _batchOperations = new TableRestClient(_diagnostics, CreateBatchPipeline(), _tableOperations.endpoint, _tableOperations.clientVersion);
             Name = tableName;
-            Uri = new Uri(_endpoint, Name);
+            Uri = new TableUriBuilder(_endpoint) { Query = null, Sas = null, Tablename = Name }.ToUri();
         }
 
         internal TableClient(Uri endpoint, string tableName, TableSharedKeyPipelinePolicy policy, AzureSasCredential sasCredential, TableClientOptions options)
@@ -339,7 +339,7 @@ null when string.IsNullOrWhiteSpace(_endpoint.Query) => policy,
             _tableOperations = new TableRestClient(_diagnostics, _pipeline, _endpoint.AbsoluteUri, _version);
             _batchOperations = new TableRestClient(_diagnostics, CreateBatchPipeline(), _tableOperations.endpoint, _tableOperations.clientVersion);
             Name = tableName;
-            Uri = new Uri(_endpoint, Name);
+            Uri = new TableUriBuilder(_endpoint) { Query = null, Sas = null, Tablename = Name }.ToUri();
         }
 
         internal TableClient(
@@ -366,7 +366,7 @@ internal TableClient(
             _batchOperations = new TableRestClient(diagnostics, CreateBatchPipeline(), _tableOperations.endpoint, _tableOperations.clientVersion);
             _version = version;
             Name = table;
-            Uri = new Uri(_endpoint, Name);
+            Uri = new TableUriBuilder(_endpoint) { Query = null, Sas = null, Tablename = Name }.ToUri();
             _accountName = accountName;
             _diagnostics = diagnostics;
             _isCosmosEndpoint = isPremiumEndpoint;

sdk/tables/Azure.Data.Tables/tests/TableClientTests.cs

@@ -511,26 +511,48 @@ public void GenerateSasUri(TableClient client, TableSharedKeyCredential cred)
             CollectionAssert.Contains(actualSas.Segments, TableName);
         }
 
-        private static IEnumerable<object[]> TableClientsAllCtors()
+        private static IEnumerable<object[]> TableClientsAllCtors(bool useEmulator)
         {
-            var sharedKeyCred = new TableSharedKeyCredential(AccountName, Secret);
+            Uri url;
+            string connectionString;
+            TableSharedKeyCredential sharedKeyCred;
+
+            if (useEmulator)
+            {
+                url = new Uri("http://127.0.0.1:10002/devstoreaccount1");
+                connectionString = "UseDevelopmentStorage=true";
+                sharedKeyCred = new TableSharedKeyCredential("devstoreaccount1", "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==");
+            }
+            else
+            {
+                url = _url;
+                connectionString = $"DefaultEndpointsProtocol=https;AccountName={AccountName};AccountKey={Secret};TableEndpoint=https://{AccountName}.table.core.windows.net/;";
+                sharedKeyCred = new TableSharedKeyCredential(AccountName, Secret);
+            }
+
             var tokenCred = new MockCredential();
-            var connString = $"DefaultEndpointsProtocol=https;AccountName={AccountName};AccountKey={Secret};TableEndpoint=https://{AccountName}.table.core.windows.net/;";
             var sasCred = new AzureSasCredential(signature);
-            var fromTableServiceClient = new TableServiceClient(_url, sharedKeyCred).GetTableClient(TableName);
+            var fromTableServiceClient = new TableServiceClient(url, sharedKeyCred).GetTableClient(TableName);
 
-            yield return new object[] { new TableClient(connString, TableName) };
-            yield return new object[] { new TableClient(_url, TableName, sharedKeyCred) };
-            yield return new object[] { new TableClient(_url, TableName, tokenCred) };
-            yield return new object[] { new TableClient(_url, sasCred) };
-            yield return new object[] { new TableClient(new Uri($"{_url}?{signature}")) };
+            yield return new object[] { new TableClient(connectionString, TableName) };
+            yield return new object[] { new TableClient(url, TableName, sharedKeyCred) };
+            yield return new object[] { new TableClient(url, TableName, tokenCred) };
+            yield return new object[] { new TableClient(url, sasCred) };
+            yield return new object[] { new TableClient(new Uri($"{url}?{signature}")) };
             yield return new object[] { fromTableServiceClient };
         }
 
-        [TestCaseSource(nameof(TableClientsAllCtors))]
+        [TestCaseSource(nameof(TableClientsAllCtors), new object[] { false })]
         public void UriPropertyIsPopulated(TableClient client)
         {
-            Assert.AreEqual($"{_url}{TableName}", client.Uri.AbsoluteUri);
+            Assert.AreEqual(_urlWithTableName, client.Uri);
+            Assert.That(client.Uri.AbsoluteUri, Does.Not.Contain(signature));
+        }
+
+        [TestCaseSource(nameof(TableClientsAllCtors), new object[] { true })]
+        public void UriPropertyIsPopulatedForEmulator(TableClient client)
+        {
+            Assert.AreEqual(new Uri("http://127.0.0.1:10002/devstoreaccount1/" + TableName), client.Uri);
             Assert.That(client.Uri.AbsoluteUri, Does.Not.Contain(signature));
         }