Merge pull request Azure#1426 from yaakoviyun/dev

Defect: Disable auditing cmdlets should send the resource group and subscription id

Author: jianghaolu

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

@@ -105,8 +105,6 @@ function Test-AuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion
 		Assert-AreEqual $policy.StorageAccountName $params.storageAccount
 		Assert-AreEqual $policy.AuditState "Enabled"  
 		Assert-AreEqual $policy.UseServerDefault "Disabled"
-
-
 	}
 	finally
 	{
@@ -434,6 +432,7 @@ function Test-AuditingDisableDatabaseAuditing
 
 		# Assert
 		Assert-AreEqual $policy.AuditState "Disabled"
+		Assert-AreEqual $policy.StorageAccountName $params.storageAccount
 	}
 	finally
 	{

src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseDisableEnableKeepProperties.json

@@ -423,11 +423,7 @@ private bool IsEventTypeOn(AuditEventType lookedForType, AuditEventType[] userSe
         /// </summary>
         private string ExtractStorageAccountTableEndpoint(string storageName, string endpointSuffix)
         {
-            if (IgnoreStorage)
-            {
-                return null;
-            }
-            if (storageName == FetchedStorageAccountName && FetchedStorageAccountTableEndpoint != null)
+            if (IgnoreStorage || (storageName == FetchedStorageAccountName && FetchedStorageAccountTableEndpoint != null))
             {
                 return FetchedStorageAccountTableEndpoint;
             }
@@ -439,11 +435,7 @@ private string ExtractStorageAccountTableEndpoint(string storageName, string end
         /// </summary>
         private string ExtractStorageAccountSubscriptionId(string storageName)
         {
-            if (IgnoreStorage)
-            {
-                return null;
-            }
-            if (storageName == FetchedStorageAccountName && FetchedStorageAccountSubscription != null)
+            if (IgnoreStorage || (storageName == FetchedStorageAccountName && FetchedStorageAccountSubscription != null))
             {
                 return FetchedStorageAccountSubscription;
             }
@@ -455,11 +447,7 @@ private string ExtractStorageAccountSubscriptionId(string storageName)
         /// </summary>
         private string ExtractStorageAccountResourceGroup(string storageName)
         {
-            if (IgnoreStorage)
-            {
-                return null;
-            }
-            if (storageName == FetchedStorageAccountName && FetchedStorageAccountResourceGroup != null)
+            if (IgnoreStorage || (storageName == FetchedStorageAccountName && FetchedStorageAccountResourceGroup != null))
             {
                 return FetchedStorageAccountResourceGroup;
             }
@@ -471,11 +459,7 @@ private string ExtractStorageAccountResourceGroup(string storageName)
         /// </summary>
         private string ExtractStorageAccountKey(string storageName, BaseAuditingPolicyModel model, string storageAccountResourceGroup, StorageKeyKind keyType)
         {
-            if (IgnoreStorage)
-            {
-                return null;
-            }
-            if (model.StorageKeyType == keyType)
+            if (IgnoreStorage || (model.StorageKeyType == keyType))
             {
                 return AzureCommunicator.GetStorageKeys(storageAccountResourceGroup, storageName)[keyType];
             }