huangpf · huangpf · Dec 7, 2015 · Dec 6, 2015 · Dec 6, 2015 · Dec 6, 2015
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.ps1 b/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
 	{

diff --git a/...Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseDisableEnableKeepProperties.json b/...Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseDisableEnableKeepProperties.json
diff --git a/...nds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseRetentionKeepProperties.json b/...nds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseRetentionKeepProperties.json
diff --git a/...Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseStorageKeyRotation.json b/...Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseStorageKeyRotation.json
diff --git a/...Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyKeepPreviousStorage.json b/...Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyKeepPreviousStorage.json
diff --git a/...t.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithEventTypeShortcuts.json b/...t.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithEventTypeShortcuts.json
diff --git a/....Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithEventTypes.json b/....Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithEventTypes.json
diff --git a/...s.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithRetention.json b/...s.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithRetention.json
diff --git a/...nds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithStorage.json b/...nds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithStorage.json
diff --git a/...s.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithStorageV2.json b/...s.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithStorageV2.json
diff --git a/...re.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDisableDatabaseAuditing.json b/...re.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDisableDatabaseAuditing.json
diff --git a/...zure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDisableServerAuditing.json b/...zure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDisableServerAuditing.json
diff --git a/...mmands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingFailWithBadDatabaseIndentity.json b/...mmands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingFailWithBadDatabaseIndentity.json
diff --git a/...Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingFailWithBadServerIndentity.json b/...Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingFailWithBadServerIndentity.json
diff --git a/...Test.ScenarioTests.AuditingTests/TestAuditingFailedDatabaseUpdatePolicyWithNoStorage.json b/...Test.ScenarioTests.AuditingTests/TestAuditingFailedDatabaseUpdatePolicyWithNoStorage.json
diff --git a/...l.Test.ScenarioTests.AuditingTests/TestAuditingFailedServerUpdatePolicyWithNoStorage.json b/...l.Test.ScenarioTests.AuditingTests/TestAuditingFailedServerUpdatePolicyWithNoStorage.json
diff --git a/...ure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingFailedUseServerDefault.json b/...ure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingFailedUseServerDefault.json
diff --git a/...s.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerDisableEnableKeepProperties.json b/...s.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerDisableEnableKeepProperties.json
diff --git a/...mands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerRetentionKeepProperties.json b/...mands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerRetentionKeepProperties.json
diff --git a/...e.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerStorageKeyRotation.json b/...e.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerStorageKeyRotation.json
diff --git a/...l.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyKeepPreviousStorage.json b/...l.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyKeepPreviousStorage.json
diff --git a/...est.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithEventTypeShortcuts.json b/...est.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithEventTypeShortcuts.json
diff --git a/...ds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithEventTypes.json b/...ds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithEventTypes.json
diff --git a/...nds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithRetention.json b/...nds.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithRetention.json
diff --git a/...mands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithStorage.json b/...mands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingServerUpdatePolicyWithStorage.json
diff --git a/...oft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingUseServerDefault.json b/...oft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingUseServerDefault.json
diff --git a/...Commands.Sql.Test.ScenarioTests.ThreatDetectionTests/InvalidArgumentsThreatDetection.json b/...Commands.Sql.Test.ScenarioTests.ThreatDetectionTests/InvalidArgumentsThreatDetection.json
diff --git a/src/ResourceManager/Sql/Commands.Sql/Auditing/Services/SqlAuditAdapter.cs b/src/ResourceManager/Sql/Commands.Sql/Auditing/Services/SqlAuditAdapter.cs
@@ -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];
             }