Regenerate swagger, bump version, and default EndpointSuffix to 'core…

….windows.net' (#18981) * update link to readme.md * refactor to GetSegmentValueOfDefault
Azure · Feb 24, 2021 · 162b926 · 162b926
1 parent 3370c21
commit 162b926
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 33 deletions.
diff --git a/sdk/core/Azure.Core/src/Shared/ConnectionString.cs b/sdk/core/Azure.Core/src/Shared/ConnectionString.cs
@@ -40,6 +40,12 @@ public string GetRequired(string keyword) =>
         public bool TryGetSegmentValue(string keyword, out string? value) =>
             _pairs.TryGetValue(keyword, out value);
 
+        public string? GetSegmentValueOrDefault(string keyword, string defaultValue) =>
+            _pairs.TryGetValue(keyword, out var value) switch {
+                false => defaultValue,
+                true => value
+            };
+
         public bool ContainsSegmentKey(string keyword) =>
             _pairs.ContainsKey(keyword);
 

diff --git a/sdk/core/Azure.Core/tests/ConnectionStringTests.cs b/sdk/core/Azure.Core/tests/ConnectionStringTests.cs
@@ -73,6 +73,15 @@ public void TryGetSegmentValue()
             Assert.That(connectionString.TryGetSegmentValue("notpresent", out _), Is.False);
         }
 
+        [Test]
+        public void GetSegmentValueOrDefault()
+        {
+            var connectionString = ConnectionString.Parse("x=y");
+            Assert.That(connectionString.GetSegmentValueOrDefault("x", "_"), Is.EqualTo("y"));
+            var defaultValue = "foo";
+            Assert.That(connectionString.GetSegmentValueOrDefault("notpresentWithDefault", defaultValue), Is.EqualTo(defaultValue));
+        }
+
         [Test]
         public void Add()
         {

diff --git a/sdk/tables/Azure.Data.Tables/CHANGELOG.md b/sdk/tables/Azure.Data.Tables/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Release History
 
-## 3.0.0-beta.6 (Unreleased)
+## 12.0.0-beta.6 (Unreleased)
+
+### Changed
+
+- Changed major version number to 12 to indicate this is the latest Tables package across all legacy versions and for cross language consistency.
 
 ### Key Bug Fixes
 

diff --git a/sdk/tables/Azure.Data.Tables/src/Azure.Data.Tables.csproj b/sdk/tables/Azure.Data.Tables/src/Azure.Data.Tables.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>This client library enables working with the Microsoft Azure Table service</Description>
     <AssemblyTitle>Microsoft Azure.Data.Tables client library</AssemblyTitle>
-    <Version>3.0.0-beta.6</Version>
+    <Version>12.0.0-beta.6</Version>
     <DefineConstants>TableSDK;$(DefineConstants)</DefineConstants>
     <PackageTags>Microsoft Azure Tables;Microsoft;Azure;Tables;Table;$(PackageCommonTags)</PackageTags>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>

diff --git a/sdk/tables/Azure.Data.Tables/src/Generated/ServiceRestClient.cs b/sdk/tables/Azure.Data.Tables/src/Generated/ServiceRestClient.cs
diff --git a/...yEntitiesWithPartitionAndRowKeyHeaders.cs → ...eryEntityWithPartitionAndRowKeyHeaders.cs b/...yEntitiesWithPartitionAndRowKeyHeaders.cs → ...eryEntityWithPartitionAndRowKeyHeaders.cs
diff --git a/sdk/tables/Azure.Data.Tables/src/Generated/TableRestClient.cs b/sdk/tables/Azure.Data.Tables/src/Generated/TableRestClient.cs
diff --git a/sdk/tables/Azure.Data.Tables/src/TableClient.cs b/sdk/tables/Azure.Data.Tables/src/TableClient.cs
@@ -430,7 +430,7 @@ public virtual async Task<Response> DeleteAsync(CancellationToken cancellationTo
             scope.Start();
             try
             {
-                var response = _tableOperations.QueryEntitiesWithPartitionAndRowKey(
+                var response = _tableOperations.QueryEntityWithPartitionAndRowKey(
                     _table,
                     partitionKey,
                     rowKey,
@@ -469,7 +469,7 @@ public virtual async Task<Response> DeleteAsync(CancellationToken cancellationTo
             scope.Start();
             try
             {
-                var response = await _tableOperations.QueryEntitiesWithPartitionAndRowKeyAsync(
+                var response = await _tableOperations.QueryEntityWithPartitionAndRowKeyAsync(
                     _table,
                     partitionKey,
                     rowKey,

diff --git a/sdk/tables/Azure.Data.Tables/src/TableConnectionString.cs b/sdk/tables/Azure.Data.Tables/src/TableConnectionString.cs
@@ -191,9 +191,10 @@ string settingOrDefault(string key)
                 settings.TryGetSegmentValue(TableConstants.ConnectionStrings.SharedAccessSignatureSetting, out sasToken);
 
             var matchesAutomaticEndpointsSpec = settings.TryGetSegmentValue(TableConstants.ConnectionStrings.AccountNameSetting, out var accountName) &&
-                settings.TryGetSegmentValue(TableConstants.ConnectionStrings.AccountKeySetting, out var accountKey) &&
-                    (settings.TryGetSegmentValue(TableConstants.ConnectionStrings.TableEndpointSetting, out var primary) ||
-                    settings.TryGetSegmentValue(TableConstants.ConnectionStrings.EndpointSuffixSetting, out var endpointSuffix));
+                settings.TryGetSegmentValue(TableConstants.ConnectionStrings.AccountKeySetting, out var accountKey);
+
+            settings.TryGetSegmentValue(TableConstants.ConnectionStrings.TableEndpointSetting, out var primary);
+            var endpointSuffix = settings.GetSegmentValueOrDefault(TableConstants.ConnectionStrings.EndpointSuffixSetting, TableConstants.ConnectionStrings.DefaultEndpointSuffix);
 
             if (matchesAutomaticEndpointsSpec || matchesExplicitEndpointsSpec)
             {

diff --git a/sdk/tables/Azure.Data.Tables/src/autorest.md b/sdk/tables/Azure.Data.Tables/src/autorest.md
@@ -7,18 +7,10 @@ Run `dotnet build /t:GenerateCode` to generate code.
 
 ``` yaml
 title: Azure.Data.Tables
-input-file:
-    - https://github.com/Azure/azure-rest-api-specs/blob/bda39d9be69b9e838eb41e5b71964a567a627cbc/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/table.json
+tag: package-2019-02
+azure-validator: false
+require:
+    - https://github.com/Azure/azure-rest-api-specs/blob/2df8b07bf9af7c96066ca4dda21b79297307d108/specification/cosmos-db/data-plane/readme.md
 namespace: Azure.Data.Tables
 include-csproj: disable
 ```
-
-### Fix Response type for QueryEntitiesWithPartitionAndRowKey
-
-``` yaml
-directive:
-  from: swagger-document
-  where: $.paths["/{table}(PartitionKey='{partitionKey}',RowKey='{rowKey}')"].get.responses
-  transform: >
-    $["200"].schema.$ref = "#/definitions/TableEntityProperties"
-```
diff --git a/sdk/tables/Azure.Data.Tables/tests/TableConnectionStringTests.cs b/sdk/tables/Azure.Data.Tables/tests/TableConnectionStringTests.cs
@@ -35,6 +35,8 @@ public static IEnumerable<object[]> ValidStorageConnStrings()
         {
             yield return new object[] { $"DefaultEndpointsProtocol=https;AccountName={AccountName};AccountKey={Secret};EndpointSuffix=core.windows.net" };
             yield return new object[] { $"AccountName={AccountName};AccountKey={Secret};EndpointSuffix=core.windows.net" };
+            yield return new object[] { $"DefaultEndpointsProtocol=https;AccountName={AccountName};AccountKey={Secret}" };
+            yield return new object[] { $"AccountName={AccountName};AccountKey={Secret}" };
         }
 
         public static IEnumerable<object[]> InvalidStorageConnStrings()
@@ -132,7 +134,6 @@ public static IEnumerable<object[]> InvalidConnStrings()
         {
             yield return new object[] { "UseDevelopmentStorage=false" };
             yield return new object[] { $"BlobEndpoint=https://{AccountName}.blob.core.windows.net/;QueueEndpoint=https://{AccountName}.queue.core.windows.net/;FileEndpoint=https://{AccountName}.file.core.windows.net/;TableEndpoint=https://{AccountName}.table.core.windows.net/" };
-            yield return new object[] { $"DefaultEndpointsProtocol=https;AccountName={AccountName};AccountKey={Secret}" };
             yield return new object[] { $"DefaultEndpointsProtocol=https;AccountName={AccountName};EndpointSuffix=core.windows.net" };
             yield return new object[] { $"DefaultEndpointsProtocol=https;AccountKey={Secret};EndpointSuffix=core.windows.net" };
         }