Merge pull request #11364 from bashahee/master

Save sensitivity rank when classifying columns

Author: isra-fel

src/Network/Network/Network.csproj

@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.40.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.41.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Sql/Sql.Test/ScenarioTests/DataClassificationTests.ps1

@@ -238,25 +238,29 @@ function Test-DataClassificationOnSqlDatabase
 		$firstColumnName = $firstRecommendation.ColumnName
 		$firstInformationType = $firstRecommendation.InformationType
 		$firstSensitivityLabel = $firstRecommendation.SensitivityLabel
+		$firstRank = $firstRecommendation.Rank
 
 		Assert-AreEqual "dbo" $firstSchemaName
 		Assert-AreEqual "Persons" $firstTableName
 		Assert-NotNullOrEmpty $firstColumnName
 		Assert-NotNullOrEmpty $firstInformationType
 		Assert-NotNullOrEmpty $firstSensitivityLabel
+		Assert-NotNullOrEmpty $firstRank
 
 		$secondRecommendation = ($recommendations.SensitivityLabels)[1]
 		$secondSchemaName = $secondRecommendation.SchemaName
 		$secondTableName = $secondRecommendation.TableName
 		$secondColumnName = $secondRecommendation.ColumnName
 		$secondInformationType = $secondRecommendation.InformationType
 		$secondSensitivityLabel = $secondRecommendation.SensitivityLabel
+		$secondRank = $secondRecommendation.Rank
 
 		Assert-AreEqual "dbo" $secondSchemaName
 		Assert-AreEqual "Persons" $secondTableName
 		Assert-NotNullOrEmpty $secondColumnName
 		Assert-NotNullOrEmpty $secondInformationType
 		Assert-NotNullOrEmpty $secondSensitivityLabel
+		Assert-NotNullOrEmpty $secondRank
 
 		# Set first two sensitivity labels as recommended and verify.
 		# Second label is set using pipeline.
@@ -278,6 +282,7 @@ function Test-DataClassificationOnSqlDatabase
 		Assert-AreEqual $firstColumnName $classification.ColumnName
 		Assert-AreEqual $firstInformationType $classification.InformationType
 		Assert-AreEqual $firstSensitivityLabel $classification.SensitivityLabel
+		Assert-AreEqual $firstRank $classification.Rank
 
 		$secondClassification = Get-AzSqlDatabase -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName | Get-AzSqlDatabaseSensitivityClassification -SchemaName $secondSchemaName -TableName $secondTableName -ColumnName $secondColumnName
 		Assert-AreEqual 1 ($secondClassification.SensitivityLabels).count
@@ -287,6 +292,7 @@ function Test-DataClassificationOnSqlDatabase
 		Assert-AreEqual $secondColumnName $classification.ColumnName
 		Assert-AreEqual $secondInformationType $classification.InformationType
 		Assert-AreEqual $secondSensitivityLabel $classification.SensitivityLabel
+		Assert-AreEqual $secondRank $classification.Rank
 
 		# Get, using pipeline, recommended sensitivity labels, and verify.
 		$recommendations = Get-AzSqlDatabase -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName | Get-AzSqlDatabaseSensitivityRecommendation
@@ -503,6 +509,8 @@ function Create-SqlDataClassificationTestEnvironment ($testSuffix, $location = "
     New-AzSqlServer -ResourceGroupName  $params.rgname -ServerName $params.serverName -ServerVersion $serverVersion -Location $location -SqlAdministratorCredentials $credentials
 	New-AzSqlServerFirewallRule -ResourceGroupName  $params.rgname -ServerName $params.serverName -StartIpAddress 0.0.0.0 -EndIpAddress 255.255.255.255 -FirewallRuleName "dcRule"
 
+	# Enable Advanced Data Security
+	Enable-AzSqlServerAdvancedDataSecurity -ResourceGroupName $params.rgname -ServerName $params.serverName -DoNotConfigureVulnerabilityAssessment
 
 	New-AzSqlDatabase -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
 
@@ -577,7 +585,7 @@ function Test-EnableDisableRecommendationsOnSqlDatabase
 		Assert-NotNullOrEmpty $secondInformationType
 		Assert-NotNullOrEmpty $secondSensitivityLabel
 
-		# Disable first two recommdationsd, second recommdation is disabled using pipeline.
+		# Disable first two recommdations, second recommdation is disabled using pipeline.
 		Disable-AzSqlDatabaseSensitivityRecommendation -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -SchemaName $firstSchemaName -TableName $firstTableName -ColumnName $firstColumnName
 		Get-AzSqlDatabase -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName | Disable-AzSqlDatabaseSensitivityRecommendation -SchemaName $secondSchemaName -TableName $secondTableName -ColumnName $secondColumnName