PR feedback

Author: jaredmoo

src/Sql/Sql/ChangeLog.md

@@ -20,7 +20,7 @@
 ## Upcoming Release
 * Updated cmdlets with plural nouns to singular, and deprecated plural names.
 * Enhanced process of multiple columns classification.
-* Include sku properties (sku name, family, capacity) in resposne from Get-AzSqlServerServiceObjective and format as table by default.
+* Include sku properties (sku name, family, capacity) in response from Get-AzSqlServerServiceObjective and format as table by default.
 
 ## Version 1.8.0
 * Support Database Data Classification.

src/Sql/Sql/ServiceObjective/Cmdlet/GetAzureSqlServerServiceObjective.cs

@@ -44,7 +44,7 @@ protected override IEnumerable<AzureSqlServerServiceObjectiveModel> GetEntity()
         {
             ICollection<AzureSqlServerServiceObjectiveModel> results = null;
 
-            if (this.MyInvocation.BoundParameters.ContainsKey("ServiceObjectiveName"))
+            if (this.MyInvocation.BoundParameters.ContainsKey("ServiceObjectiveName") && !WildcardPattern.ContainsWildcardCharacters(ServiceObjectiveName))
             {
                 results = ModelAdapter.GetServiceObjective(
                     this.ResourceGroupName,

src/Sql/Sql/ServiceObjective/Service/AzureSqlServerServiceObjectiveAdapter.cs

@@ -68,10 +68,10 @@ public List<AzureSqlServerServiceObjectiveModel> GetServiceObjective(string reso
             var capabilities = CapabilitiesCommunicator.Get(server.Location);
 
             return (
-                from sv in FilterByName(capabilities.SupportedServerVersions, server.Version)
-                from e in sv.SupportedEditions
-                from slo in FilterByName(e.SupportedServiceLevelObjectives, serviceObjectiveName)
-                select CreateServiceObjectiveModelFromResponse(e, slo, resourceGroupName, serverName)).ToList();
+                from serverVersion in FilterByName(capabilities.SupportedServerVersions, server.Version)
+                from edition in serverVersion.SupportedEditions
+                from serviceObjective in FilterByName(edition.SupportedServiceLevelObjectives, serviceObjectiveName)
+                select CreateServiceObjectiveModelFromResponse(edition, serviceObjective, resourceGroupName, serverName)).ToList();
         }
 
         /// <summary>
@@ -86,10 +86,10 @@ public List<AzureSqlServerServiceObjectiveModel> ListServiceObjectives(string re
             var capabilities = CapabilitiesCommunicator.Get(server.Location);
 
             return (
-                from sv in FilterByName(capabilities.SupportedServerVersions, server.Version)
-                from e in sv.SupportedEditions
-                from slo in e.SupportedServiceLevelObjectives
-                select CreateServiceObjectiveModelFromResponse(e, slo, resourceGroupName, serverName)).ToList();
+                from serverVersion in FilterByName(capabilities.SupportedServerVersions, server.Version)
+                from edition in serverVersion.SupportedEditions
+                from serviceObjective in edition.SupportedServiceLevelObjectives
+                select CreateServiceObjectiveModelFromResponse(edition, serviceObjective, resourceGroupName, serverName)).ToList();
         }
 
         /// <summary>