Azure · dingmeng-xue · Jan 31, 2021 · Nov 8, 2020 · Dec 20, 2020 · Jan 28, 2021
diff --git a/...cords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestAuditOnDatabase.json b/...cords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestAuditOnDatabase.json
diff --git a/...Records/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestAuditOnServer.json b/...Records/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestAuditOnServer.json
diff --git a/...mands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseRetentionKeepProperties.json b/...mands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseRetentionKeepProperties.json
diff --git a/...e.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseStorageKeyRotation.json b/...e.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseStorageKeyRotation.json
diff --git a/...l.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseUpdatePolicyKeepPreviousStorage.json b/...l.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseUpdatePolicyKeepPreviousStorage.json
diff --git a/...sts.AuditTests/TestBlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion.json b/...sts.AuditTests/TestBlobAuditDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion.json
diff --git a/...mands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseUpdatePolicyWithStorage.json b/...mands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDatabaseUpdatePolicyWithStorage.json
diff --git a/...t.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDisableDatabaseAudit.json b/...t.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDisableDatabaseAudit.json
diff --git a/...oft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDisableServerAudit.json b/...oft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditDisableServerAudit.json
diff --git a/...Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditFailWithBadDatabaseIndentity.json b/...Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditFailWithBadDatabaseIndentity.json
diff --git a/...e.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditFailWithBadServerIndentity.json b/...e.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditFailWithBadServerIndentity.json
diff --git a/...l.Test.ScenarioTests.AuditTests/TestBlobAuditFailedDatabaseUpdatePolicyWithNoStorage.json b/...l.Test.ScenarioTests.AuditTests/TestBlobAuditFailedDatabaseUpdatePolicyWithNoStorage.json
diff --git a/...Sql.Test.ScenarioTests.AuditTests/TestBlobAuditFailedServerUpdatePolicyWithNoStorage.json b/...Sql.Test.ScenarioTests.AuditTests/TestBlobAuditFailedServerUpdatePolicyWithNoStorage.json
diff --git a/...s/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditOnDatabase.json b/...s/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditOnDatabase.json
diff --git a/...rds/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditOnServer.json b/...rds/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditOnServer.json
diff --git a/...ommands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerRetentionKeepProperties.json b/...ommands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerRetentionKeepProperties.json
diff --git a/...ure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerStorageKeyRotation.json b/...ure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerStorageKeyRotation.json
diff --git a/...Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerUpdatePolicyKeepPreviousStorage.json b/...Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerUpdatePolicyKeepPreviousStorage.json
diff --git a/...ommands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerUpdatePolicyWithStorage.json b/...ommands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditServerUpdatePolicyWithStorage.json
diff --git a/....Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditWithAuditActionGroups.json b/....Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestBlobAuditWithAuditActionGroups.json
diff --git a/...Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestDatabaseAuditingToStorageInVNet.json b/...Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestDatabaseAuditingToStorageInVNet.json
diff --git a/...crosoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestExtendedAuditOnDatabase.json b/...crosoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestExtendedAuditOnDatabase.json
diff --git a/...Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestExtendedAuditOnServer.json b/...Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestExtendedAuditOnServer.json
diff --git a/...icrosoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportAuditOnServer.json b/...icrosoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportAuditOnServer.json
diff --git a/....Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditDisableServerAudit.json b/....Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditDisableServerAudit.json
diff --git a/...s.Sql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditFailWithBadServerIndentity.json b/...s.Sql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditFailWithBadServerIndentity.json
diff --git a/...ScenarioTests.AuditTests/TestMSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage.json b/...ScenarioTests.AuditTests/TestMSSupportBlobAuditFailedServerUpdatePolicyWithNoStorage.json
diff --git a/...soft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditOnServer.json b/...soft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditOnServer.json
diff --git a/...ScenarioTests.AuditTests/TestMSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage.json b/...ScenarioTests.AuditTests/TestMSSupportBlobAuditServerUpdatePolicyKeepPreviousStorage.json
diff --git a/...ql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditServerUpdatePolicyWithStorage.json b/...ql.Test.ScenarioTests.AuditTests/TestMSSupportBlobAuditServerUpdatePolicyWithStorage.json
diff --git a/...Test.ScenarioTests.AuditTests/TestMSSupportNewServerAuditDiagnosticsAreCreatedOnNeed.json b/...Test.ScenarioTests.AuditTests/TestMSSupportNewServerAuditDiagnosticsAreCreatedOnNeed.json
diff --git a/...ft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportRemoveAuditOnServer.json b/...ft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportRemoveAuditOnServer.json
diff --git a/...Tests.AuditTests/TestMSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings.json b/...Tests.AuditTests/TestMSSupportRemoveServerAuditingSettingsMultipleDiagnosticSettings.json
diff --git a/...ommands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportServerAuditingToStorageInVNet.json b/...ommands.Sql.Test.ScenarioTests.AuditTests/TestMSSupportServerAuditingToStorageInVNet.json
diff --git a/...ds.Sql.Test.ScenarioTests.AuditTests/TestNewDatabaseAuditDiagnosticsAreCreatedOnNeed.json b/...ds.Sql.Test.ScenarioTests.AuditTests/TestNewDatabaseAuditDiagnosticsAreCreatedOnNeed.json
diff --git a/...ands.Sql.Test.ScenarioTests.AuditTests/TestNewServerAuditDiagnosticsAreCreatedOnNeed.json b/...ands.Sql.Test.ScenarioTests.AuditTests/TestNewServerAuditDiagnosticsAreCreatedOnNeed.json
diff --git a/...Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestRemoveAuditOnDatabase.json b/...Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestRemoveAuditOnDatabase.json
diff --git a/...s/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestRemoveAuditOnServer.json b/...s/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestRemoveAuditOnServer.json
diff --git a/...cenarioTests.AuditTests/TestRemoveDatabaseAuditingSettingsMultipleDiagnosticSettings.json b/...cenarioTests.AuditTests/TestRemoveDatabaseAuditingSettingsMultipleDiagnosticSettings.json
diff --git a/....ScenarioTests.AuditTests/TestRemoveServerAuditingSettingsMultipleDiagnosticSettings.json b/....ScenarioTests.AuditTests/TestRemoveServerAuditingSettingsMultipleDiagnosticSettings.json
diff --git a/...t.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestServerAuditingToStorageInVNet.json b/...t.Azure.Commands.Sql.Test.ScenarioTests.AuditTests/TestServerAuditingToStorageInVNet.json
diff --git a/src/Sql/Sql/Auditing/Cmdlet/SetAzSqlDatabaseAudit.cs b/src/Sql/Sql/Auditing/Cmdlet/SetAzSqlDatabaseAudit.cs
@@ -127,7 +127,7 @@ protected override DatabaseAuditModel ApplyUserInputToModel(DatabaseAuditModel m
 
             if (PredicateExpression != null)
             {
-                model.PredicateExpression = PredicateExpression = PredicateExpression;
+                model.PredicateExpression = PredicateExpression;
             }
 
             if (BlobStorageTargetState != null)

diff --git a/src/Sql/Sql/Auditing/Cmdlet/SetAzSqlServerAudit.cs b/src/Sql/Sql/Auditing/Cmdlet/SetAzSqlServerAudit.cs
@@ -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;
         }
 

diff --git a/src/Sql/Sql/Auditing/Services/SqlAuditAdapter.cs b/src/Sql/Sql/Auditing/Services/SqlAuditAdapter.cs
@@ -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; }
     }
 

diff --git a/src/Sql/Sql/ChangeLog.md b/src/Sql/Sql/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Added MaintenanceConfigurationId to 'New-AzSqlDatabase', 'Set-AzSqlDatabase', 'New-AzSqlElasticPool' and 'Set-AzSqlElasticPool'
+* Fixed regression in 'Set-AzSqlServerAudit' when PredicateExpression argument is provided
 
 ## Version 2.15.0
 * Made `Start-AzSqlInstanceDatabaseLogReplay` cmdlet synchronous, added -AsJob flag