Produce the correct Uri for TableClient.GenerateSasUri (Azure#26191)

* Produce the correct Uri for TableClient.GenerateSasUri

Author: christothes

sdk/core/Azure.Core.TestFramework/src/TestRecording.cs

@@ -406,6 +406,10 @@ public string GetVariable(string variableName, string defaultValue, Func<string,
                 case RecordedTestMode.Live:
                     return defaultValue;
                 case RecordedTestMode.Playback:
+                    if (Variables.Count == 0)
+                    {
+                        throw new TestRecordingMismatchException("The recording contains no variables.");
+                    }
                     Variables.TryGetValue(variableName, out string value);
                     return value;
                 default:

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

@@ -9,6 +9,7 @@
 ### Bugs Fixed
 - Fixed a an issue when using `TableEntity.GetDateTime` that resulted in an `InvalidOperationException` exception. ([#25323](https://github.com/Azure/azure-sdk-for-net/issues/25323)) 
 - `TableClient.GenerateSasUri(...)` does not throw if the client was constructed via `TableServiceClient.GetTableClient(string tableName)` ([#25881](https://github.com/Azure/azure-sdk-for-net/issues/25881))
+- `TableClient.GenerateSasUri(...)` now generates a Uri with the table name in the path. ([#26155](https://github.com/Azure/azure-sdk-for-net/issues/26155))
 ### Other Changes
 
 ## 12.3.0 (2021-11-09)

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

@@ -295,7 +295,11 @@ internal TableClient(Uri endpoint, string tableName, TableSharedKeyPipelinePolic
             var perCallPolicies = _isCosmosEndpoint ? new[] { new CosmosPatchTransformPolicy() } : Array.Empty<HttpPipelinePolicy>();
             HttpPipelinePolicy authPolicy = sasCredential switch
             {
-                null => policy,
+                // We were not passed an explicit SasCredential nor does one exist in the query string, default to policy
+                null when string.IsNullOrWhiteSpace(_endpoint.Query) => policy,
+                // The endpoint has a query string, so assume it is a SAS token
+                null => new AzureSasCredentialSynchronousPolicy(new AzureSasCredential(_endpoint.Query)),
+                // We were passed an explicit SasCredential, use that
                 _ => new AzureSasCredentialSynchronousPolicy(sasCredential)
             };
             _pipeline = HttpPipelineBuilder.Build(
@@ -1425,6 +1429,13 @@ public virtual Uri GenerateSasUri(
                 throw new ArgumentException($"The {nameof(builder.TableName)} must match the table name used to initialize this instance of the client");
             }
             TableUriBuilder sasUri = new(_endpoint);
+            if (string.IsNullOrEmpty(sasUri.Tablename))
+            {
+                // The table name is not included in the URI, so add it while preserving the trailing slash, if it exists.
+                var sasUrlbuilder = new UriBuilder(_endpoint);
+                sasUrlbuilder.Path += sasUrlbuilder.Path.EndsWith("/", StringComparison.Ordinal) ? $"{Name}/" : $"/{Name}";
+                sasUri = new(sasUrlbuilder.Uri);
+            }
             sasUri.Query = builder.ToSasQueryParameters(SharedKeyCredential).ToString();
             return sasUri.ToUri();
         }

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

@@ -291,9 +291,9 @@ internal static string GetTableNameFromUri(Uri uri)
                 UriHostNameType hostNameType = Uri.CheckHostName(uri.Host);
                 int expectedSegments = hostNameType switch
                 {
-                    // This is a dns name such as contoso.core.windows.net/tableName
+                    // This is a dns name such as accountName.core.windows.net/tableName
                     UriHostNameType.Dns => 2,
-                    // This is most likely Azurite, which looks like this: https://126.0.0.1:10002/contoso/tableName
+                    // This is most likely Azurite, which looks like this: https://127.0.0.1:10002/accountName/tableName
                     UriHostNameType.IPv4 => 3,
                     _ when uri.IsLoopback => 3,
                     _ => 0