fix the check if EventType and AuditAction have been populated

fix the check if EventType and AuditAction have been populated

Author: ayeletshpigelman

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

@@ -64,8 +64,14 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
             ModelAdapter.IgnoreStorage = true;
             base.PersistChanges(model);
             //if another server auditing policy exists, remove it
-            Action swapAuditType = () => { AuditType = AuditType == AuditType.Blob ? AuditType.Table : AuditType.Blob; };
-            swapAuditType();
+            if (AuditType == AuditType.Blob)
+            {
+                AuditType = AuditType.Table;
+            }
+            else
+            {
+                AuditType = AuditType.Blob;
+            }
             var otherAuditingTypePolicyModel = GetEntity();
             if (otherAuditingTypePolicyModel != null)
             {

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

@@ -58,8 +58,14 @@ protected override AuditingPolicyModel PersistChanges(AuditingPolicyModel model)
             ModelAdapter.IgnoreStorage = true;
             base.PersistChanges(model);
             //if another server auditing policy exists, remove it
-            Action swapAuditType = () => { AuditType = AuditType == AuditType.Blob ? AuditType.Table : AuditType.Blob; };
-            swapAuditType();
+            if (AuditType == AuditType.Blob)
+            {
+                AuditType = AuditType.Table;
+            }
+            else
+            {
+                AuditType = AuditType.Blob;
+            }
             var otherAuditingTypePolicyModel = GetEntity();
             if (otherAuditingTypePolicyModel != null)
             {

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

@@ -45,19 +45,22 @@ public class SetAzureSqlDatabaseAuditingPolicy : SqlDatabaseAuditingCmdletBase
         ///  Defines the set of audit action groups that would be used by the auditing settings
         /// </summary>
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The set of the audit action groups")]
+        [ValidateNotNullOrEmpty]
         public AuditActionGroups[] AuditActionGroup { get; set; }
 
         /// <summary>
         ///  Defines the set of audit actions that would be used by the auditing settings
         /// </summary>
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The set of the audit actions")]
+        [ValidateNotNullOrEmpty]
         public string[] AuditAction { get; set; }
 
         /// <summary>
         /// Gets or sets the names of the event types to use.
         /// </summary>
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Event types to audit")]
         [ValidateSet(SecurityConstants.PlainSQL_Success, SecurityConstants.PlainSQL_Failure, SecurityConstants.ParameterizedSQL_Success, SecurityConstants.ParameterizedSQL_Failure, SecurityConstants.StoredProcedure_Success, SecurityConstants.StoredProcedure_Failure, SecurityConstants.Login_Success, SecurityConstants.Login_Failure, SecurityConstants.TransactionManagement_Success, SecurityConstants.TransactionManagement_Failure, SecurityConstants.All, SecurityConstants.None, IgnoreCase = false)]
+        [ValidateNotNullOrEmpty]
         public string[] EventType { get; set; }
 
         /// <summary>
@@ -126,7 +129,7 @@ private void ApplyUserInputToBlobAuditingModel(DatabaseBlobAuditingPolicyModel m
                 model.StorageAccountName = StorageAccountName;
             }
 
-            if (!string.IsNullOrEmpty(StorageKeyType))
+            if (MyInvocation.BoundParameters.ContainsKey("StorageKeyType"))
             {
                 // the user enter a key type - we use it (and override the previously defined key type)
                 model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary)
@@ -144,7 +147,7 @@ private void ApplyUserInputToBlobAuditingModel(DatabaseBlobAuditingPolicyModel m
                 model.AuditAction = AuditAction;
             }
 
-            if (EventType != null) // Event types are relevant only for Table auditing
+            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // Event types are relevant only for Table auditing
             {
                 throw new Exception(string.Format(Properties.Resources.EventTypeConfiguringIrrelevantForBlobAuditingPolicy));
             }
@@ -170,7 +173,7 @@ private void ApplyUserInputToTableAuditingModel(DatabaseAuditingPolicyModel mode
 
             EventType = Util.ProcessAuditEvents(EventType);
 
-            if (EventType != null) // the user provided Table auditing event types
+            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // the user provided Table auditing event types
             {
                 model.EventType = EventType.Select(s => SecurityConstants.AuditEventsToAuditEventType[s]).ToArray();
             }

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

@@ -34,12 +34,14 @@ public class SetAzureSqlServerAuditingPolicy : SqlDatabaseServerAuditingCmdletBa
         [Parameter(Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The audit type.")]
+        [ValidateNotNullOrEmpty]
         public override AuditType AuditType { get; set; }
 
         /// <summary>
         ///  Defines the set of audit action groups that would be used by the auditing settings
         /// </summary>
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The set of the audit action groups")]
+        [ValidateNotNullOrEmpty]
         public AuditActionGroups[] AuditActionGroup { get; set; }
 
         [Parameter(Mandatory = false)]
@@ -55,6 +57,7 @@ public class SetAzureSqlServerAuditingPolicy : SqlDatabaseServerAuditingCmdletBa
             SecurityConstants.StoredProcedure_Failure, SecurityConstants.Login_Success, SecurityConstants.Login_Failure,
             SecurityConstants.TransactionManagement_Success, SecurityConstants.TransactionManagement_Failure,
             SecurityConstants.All, SecurityConstants.None, IgnoreCase = false)]
+        [ValidateNotNullOrEmpty]
         public string[] EventType { get; set; }
 
         /// <summary>
@@ -129,7 +132,7 @@ private void ApplyUserInputToTableAuditingModel(ServerAuditingPolicyModel model)
 
             EventType = Util.ProcessAuditEvents(EventType);
 
-            if (EventType != null) // the user provided event types to audit
+            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // the user provided event types to audit
             {
                 model.EventType = EventType.Select(s => SecurityConstants.AuditEventsToAuditEventType[s]).ToArray();
             }
@@ -152,7 +155,7 @@ private void ApplyUserInputToTableAuditingModel(ServerAuditingPolicyModel model)
                 model.TableIdentifier = TableIdentifier;
             }
 
-            if (AuditActionGroup != null) //AuditActionGroup is relevant only for blob auditing
+            if (MyInvocation.BoundParameters.ContainsKey("AuditActionGroups")) //AuditActionGroup is relevant only for blob auditing
             {
                 throw new Exception(string.Format(Properties.Resources.AuditActionGroupsConfiguringIrrelevantForTableAuditingPolicy));
             }
@@ -181,7 +184,7 @@ private void ApplyUserInputToBlobAuditingModel(ServerBlobAuditingPolicyModel mod
                 model.AuditActionGroup = AuditActionGroup;
             }
 
-            if (EventType != null) // EventType is relevant only for table auditing
+            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // EventType is relevant only for table auditing
             {
                 throw new Exception(string.Format(Properties.Resources.EventTypeConfiguringIrrelevantForBlobAuditingPolicy));
             }