Merge pull request Azure#8338 from jaredmoo/capabilitiesNullRef

Fixed null ref in Get-AzSqlCapability

Author: cormacpayne

src/Sql/Sql.Test/ScenarioTests/LocationCapabilitiesTests.ps1

@@ -12,31 +12,31 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
-<# 
+<#
     .SYNOPSIS
     Tests the Get-AzSqlCapability cmdlet
 #>
 function Test-Capabilities
 {
-	$location = "Southeast Asia"
+	$location = "eastus"
 	$all = Get-AzSqlCapability $location
 	Validate-Capabilities $all
-	
+
 	$default = Get-AzSqlCapability $location -Defaults
 	Validate-Capabilities $default
-	
+
 	$version = Get-AzSqlCapability $location -ServerVersionName "12.0"
 	Validate-Capabilities $default
-	
+
 	$edition = Get-AzSqlCapability $location -EditionName "Premium"
 	Validate-Capabilities $default
-	
+
 	$so = Get-AzSqlCapability $location -ServiceObjectiveName "S3"
 	Validate-Capabilities $default
 
 }
 
-<# 
+<#
     .SYNOPSIS
     Validates that a LocationCapabilities object is valid and has all properties filled out
 #>
@@ -57,15 +57,15 @@ function Validate-Capabilities ($capabilities)
 			Assert-NotNull $edition.EditionName
 			Assert-NotNull $edition.Status
 			Assert-True {$edition.SupportedServiceObjectives.Count -gt 0}
-			
+
 			foreach($so in $edition.SupportedServiceObjectives) {
 				Assert-NotNull $so
 				Assert-NotNull $so.ServiceObjectiveName
 				Assert-NotNull $so.Status
 				Assert-NotNull $so.Id
 				Assert-AreNotEqual $so.Id [System.Guid]::Empty
-				Assert-True {$so.SupportedMaxSizes.Count -gt 0}
-			
+				#Assert-True {$so.SupportedMaxSizes.Count -gt 0} # Vcore service objectives have empty list of SupportedMaxSizes
+
 				foreach($size in $so.SupportedMaxSizes) {
 					Assert-NotNull $size
 					Assert-NotNull $size.MinValue.Limit

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.LocationCapabilitiesTests/TestLocationCapabilities.json

@@ -20,6 +20,7 @@
 ## Upcoming Release
 * Add Get/Set AzSqlDatabaseBackupShortTermRetentionPolicy
 * Fix issue where not being logged into Azure account would result in nullref exception when executing SQL cmdlets
+* Fixed null ref exception in Get-AzSqlCapability
 
 ## Version 1.1.0
 * Update incorrect online help URLs

src/Sql/Sql/ChangeLog.md

@@ -108,7 +108,12 @@ private ServiceObjectiveCapabilityModel CreateSupportedSLOModel(Management.Sql.M
             slo.Id = s.Id;
             slo.ServiceObjectiveName = s.Name;
             slo.Status = s.Status.ToString();
-            slo.SupportedMaxSizes = s.SupportedMaxSizes.Select(CreateSupportedMaxSizeModel).ToList();
+
+            // Vcore service objectives don't have supported max sizes, they have max size ranges
+            if (s.SupportedMaxSizes != null)
+            {
+                slo.SupportedMaxSizes = s.SupportedMaxSizes.Select(CreateSupportedMaxSizeModel).ToList();
+            }
 
             return slo;
         }
@@ -133,7 +138,7 @@ private MaxSizeRangeCapabilityModel CreateSupportedMaxSizeModel(Management.Sql.M
                 Limit = m.MaxValue.Limit,
                 Unit = m.MaxValue.Unit
             };
-            
+
             maxSizeRange.ScaleSize = new MaxSizeCapabilityModel()
             {
                 Limit = m.ScaleSize.Limit,