Merge pull request Azure#696 from yoavrubin/dev

Bug fix: storage properties update

Author: yugangw-msft

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1

@@ -38,8 +38,10 @@ function Get-SqlDataMaskingTestEnvironmentParameters ($testSuffix)
 			  pwd = "testp@ssMakingIt1007Longer";
 			  table1="table1";
 			  column1 = "column1";
+			  columnInt = "columnInt";
 			  table2="table2";
-			  column2 = "column2"
+			  column2 = "column2";
+			  columnFloat = "columnFloat"
 			  }
 }
 
@@ -94,16 +96,17 @@ function Create-DataMaskingTestEnvironment ($testSuffix)
 		$connection.Open()
 		$table1 = $params.table1
 		$column1 = $params.column1
-		$query = "CREATE TABLE $table1 ($column1 NVARCHAR(20)NOT NULL);"
-		$command = $connection.CreateCommand()
-		$command.CommandText = $query
-		$command.ExecuteReader()
+		$columnInt = $params.columnInt
+
 		$table2 = $params.table2
 		$column2 = $params.column2
-		$query = "CREATE TABLE $table2 ($column2 NVARCHAR(20)NOT NULL);"
+		$columnFloat = $params.columnFloat
+
+		$query = "CREATE TABLE $table1 ($column1 NVARCHAR(20)NOT NULL, $columnInt INT);CREATE TABLE $table2 ($column2 NVARCHAR(20)NOT NULL, $columnFloat DECIMAL(6,3));"
 		$command = $connection.CreateCommand()
 		$command.CommandText = $query
 		$command.ExecuteReader()
+		
 	}
 	catch
 	{

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs

@@ -61,5 +61,12 @@ public void TestDatabaseDataMaskingRuleCreationFailures()
         {
             RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures");
         }
+
+        [Fact]
+        [Trait(Category.RunType, Category.LiveOnly)]
+        public void TestDatabaseDataMaskingRuleCreationWithoutPolicy()
+        {
+            RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationWithoutPolicy");
+        }
     }
 }

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.ps1

@@ -191,9 +191,9 @@ function Test-DatabaseUpdatePolicyWithEventTypes
 
 		# Assert
 		Assert-AreEqual $policy.EventType.Length 3
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::PlainSQL_Success)}
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::ParameterizedSQL_Success)}
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::ParameterizedSQL_Failure)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::PlainSQL_Success)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::ParameterizedSQL_Success)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::ParameterizedSQL_Failure)}
 
 		# Test
 		Set-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount -EventType "None"
@@ -235,9 +235,9 @@ function Test-ServerUpdatePolicyWithEventTypes
 
 		# Assert
 		Assert-AreEqual $policy.EventType.Length 3
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::PlainSQL_Success)}
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::ParameterizedSQL_Success)}
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::ParameterizedSQL_Failure)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::PlainSQL_Success)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::ParameterizedSQL_Success)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::ParameterizedSQL_Failure)}
 
 
 		# Test
@@ -451,7 +451,7 @@ function Test-DatabaseDisableEnableKeepProperties
 		Assert-AreEqual $policy.AuditState "Enabled"
 		Assert-AreEqual $policy.UseServerDefault "Disabled"
 		Assert-AreEqual $policy.EventType.Length 1
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::Login_Failure)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::Login_Failure)}
 	}
 	finally
 	{
@@ -483,7 +483,7 @@ function Test-ServerDisableEnableKeepProperties
 		Assert-AreEqual $policy.StorageAccountName $params.storageAccount
 		Assert-AreEqual $policy.AuditState "Enabled"
 		Assert-AreEqual $policy.EventType.Length 1
-		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Security.Model.AuditEventType]::TransactionManagement_Success)}
+		Assert-True {$policy.EventType.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditEventType]::TransactionManagement_Success)}
 	}
 	finally
 	{