Fix predicate expression for server audit (#14063)

* fix PredicateExpression for server audit policy

* re-record all audit tests to avoid regression

* updated ChangeLog.md

* Make build change

* Undo make build change

Co-authored-by: Oleg Sternberg <[email protected]>

Author: OlegSternbergIBM

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestAuditOnDatabase.json

@@ -127,7 +127,7 @@ protected override DatabaseAuditModel ApplyUserInputToModel(DatabaseAuditModel m
 
             if (PredicateExpression != null)
             {
-                model.PredicateExpression = PredicateExpression = PredicateExpression;
+                model.PredicateExpression = PredicateExpression;
             }
 
             if (BlobStorageTargetState != null)

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestAuditOnServer.json

@@ -58,11 +58,26 @@ protected override ServerAuditModel ApplyUserInputToModel(ServerAuditModel model
         {
             base.ApplyUserInputToModel(model);
 
+            if (AuditActionGroup != null)
+            {
+                model.AuditActionGroup = AuditActionGroup;
+            }
+
+            if (PredicateExpression != null)
+            {
+                model.PredicateExpression = PredicateExpression;
+            }
+
             if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType))
             {
                 model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary) ? StorageKeyKind.Primary : StorageKeyKind.Secondary;
             }
 
+            if (RetentionInDays != null)
+            {
+                model.RetentionInDays = RetentionInDays;
+            }
+
             return model;
         }
 

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseRetentionKeepProperties.json

@@ -99,23 +99,6 @@ internal void ModelizeAuditPolicy(AuditModelType model,
             DetermineTargetsState(model, state);
         }
 
-        internal string[] ExtractAuditActions(IEnumerable<string> auditActionsAndGroups)
-        {
-            var actions = new List<string>();
-            if (auditActionsAndGroups != null)
-            {
-                auditActionsAndGroups.ForEach(item =>
-                {
-                    if (!Enum.TryParse(item, true, out AuditActionGroups group))
-                    {
-                        actions.Add(item);
-                    }
-                });
-            }
-
-            return actions.ToArray();
-        }
-
         internal virtual void ModelizeStorageKeyType(AuditModelType model, bool? isSecondary) { }
 
         internal virtual void ModelizeRetentionInfo(AuditModelType model, int? retentionDays) { }
@@ -932,6 +915,23 @@ protected override void PolicizeAuditModel(DatabaseAuditModel model, ProxyResour
             dynamicPolicy.AuditActionsAndGroups = ExtractAuditActionsAndGroups(model.AuditActionGroup, model.AuditAction);
         }
 
+        private string[] ExtractAuditActions(IEnumerable<string> auditActionsAndGroups)
+        {
+            var actions = new List<string>();
+            if (auditActionsAndGroups != null)
+            {
+                auditActionsAndGroups.ForEach(item =>
+                {
+                    if (!Enum.TryParse(item, true, out AuditActionGroups group))
+                    {
+                        actions.Add(item);
+                    }
+                });
+            }
+
+            return actions.ToArray();
+        }
+
         internal string DatabaseName { get; set; }
     }