Threat detection tests + error handling

Author: yoavrubin

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

@@ -129,7 +129,7 @@ Tests that when turning off auditing or marking it as "use server default" , thr
 function Test-DisablingThreatDetection
 {
 	# Setup
-	$testSuffix = 7011
+	$testSuffix = 7019
 	Create-TestEnvironment $testSuffix "Japan East"#Create-ThreatDetectionTestEnvironmentWithStorageV2 $testSuffix
 	$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix #Get-SqlThreatDetectionTestEnvironmentParameters $testSuffix
 
@@ -207,13 +207,13 @@ function Test-InvalidArgumentsThreatDetection
 
 <#
 .SYNOPSIS
-Tests that thread detection doesn't work on 0.2 servers
+Tests that thread detection doesn't work on 2.0 servers
 #>
 function Test-ThreatDetectionOnV2Server
 {
 	# Setup
-	$testSuffix = 5007
-	Create-TestEnvironment $testSuffix "Japan East" "2.0" #Create-ThreatDetectionTestEnvironmentWithStorageV2 $testSuffix "2.0"
+	$testSuffix = 5023
+	Create-TestEnvironment $testSuffix "West Europe" "2.0" #Create-ThreatDetectionTestEnvironmentWithStorageV2 $testSuffix "2.0"
 	$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix #Get-SqlThreatDetectionTestEnvironmentParameters $testSuffix
 
 	try
@@ -224,7 +224,7 @@ function Test-ThreatDetectionOnV2Server
 
 		 Set-AzureRmSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -StorageAccountName $params.storageAccount
 		 Assert-Throws {Set-AzureRmSqlServerThreatDetectionPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName} 
-		 Assert-Throws {Get-AzureRmSqlDatabaseThreatDetectionPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName} 
+		 Assert-Throws {Get-AzureRmSqlServerThreatDetectionPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName} 
 
 	}
 	finally

src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlDatabaseAuditingPolicy.cs

@@ -188,8 +188,11 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
             Action swapAuditType = () => { AuditType = AuditType == AuditType.Blob ? AuditType.Table : AuditType.Blob; };
             swapAuditType();
             var otherAuditingTypePolicyModel = GetEntity();
-            otherAuditingTypePolicyModel.AuditState = AuditStateType.Disabled;
-            base.PersistChanges(otherAuditingTypePolicyModel);
+            if (otherAuditingTypePolicyModel != null)
+            {
+                otherAuditingTypePolicyModel.AuditState = AuditStateType.Disabled;
+                base.PersistChanges(otherAuditingTypePolicyModel);
+            }
             swapAuditType();
             return model;
         }

src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlServerAuditingPolicy.cs

@@ -189,8 +189,11 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
             Action swapAuditType = () => { AuditType = AuditType == AuditType.Blob ? AuditType.Table : AuditType.Blob; };
             swapAuditType();
             var otherAuditingTypePolicyModel = GetEntity();
-            otherAuditingTypePolicyModel.AuditState = AuditStateType.Disabled;
-            base.PersistChanges(otherAuditingTypePolicyModel);
+            if (otherAuditingTypePolicyModel != null)
+            {
+                otherAuditingTypePolicyModel.AuditState = AuditStateType.Disabled;
+                base.PersistChanges(otherAuditingTypePolicyModel);
+            }
             swapAuditType();
             return model;
         }

src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseAuditingCmdletBase.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Sql.Auditing.Model;
 using Microsoft.Azure.Commands.Sql.Auditing.Services;
@@ -35,11 +36,25 @@ protected override AuditingPolicyModel GetEntity()
             if (AuditType == AuditType.Table)
             {
                 DatabaseAuditingPolicyModel model;
-                ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out model);
-                return model;
+                try
+                {                  
+                    ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out model);
+                    return model;
+                }
+                catch
+                {
+                    return null;
+                }
             }
             DatabaseBlobAuditingPolicyModel blobModel;
-            ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out blobModel);
+            try
+            {
+                ModelAdapter.GetDatabaseAuditingPolicy(ResourceGroupName, ServerName, DatabaseName, clientRequestId, out blobModel);
+            }
+            catch
+            {
+                return null;
+            }
             return blobModel;
         }
 

src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseServerAuditingCmdletBase.cs

@@ -43,12 +43,26 @@ protected override AuditingPolicyModel GetEntity()
             if (AuditType == AuditType.Table)
             {
                 ServerAuditingPolicyModel model;
-                ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, this.clientRequestId, out model);
-                return model;
+                try
+                {
+                    ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, clientRequestId, out model);
+                    return model;
+                }
+                catch
+                {
+                    return null;
+                }
             }
             ServerBlobAuditingPolicyModel blobModel;
-            ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, this.clientRequestId, out blobModel);
-            return blobModel;
+            try
+            {
+                ModelAdapter.GetServerAuditingPolicy(ResourceGroupName, ServerName, clientRequestId, out blobModel);
+                return blobModel;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         /// <summary>