Merge pull request Azure#8667 from bashahee/master

cormacpayne · web-flow · commit c55eca1b05b4 · 2019-03-04T17:41:15.000-08:00
Updating AuditingEndpointsCommunicator
diff --git a/src/Sql/Sql/Auditing/Services/AuditingEndpointsCommunicator.cs b/src/Sql/Sql/Auditing/Services/AuditingEndpointsCommunicator.cs
@@ -166,6 +166,11 @@ public DiagnosticSettingsResource CreateDiagnosticSettings(
                 }
             }
 
+            if (!settings.Logs.Any(l => string.Equals(l.Category, DefinitionsCommon.SQLSecurityAuditCategory)))
+            {
+                settings.Logs.Add(new LogSettings(true, DefinitionsCommon.SQLSecurityAuditCategory));
+            }
+
             return client.DiagnosticSettings.CreateOrUpdateAsync(
                 resoureUri, settings, settingsName).Result;
         }
diff --git a/src/Sql/Sql/ChangeLog.md b/src/Sql/Sql/ChangeLog.md
@@ -18,7 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-
+* Updating AuditingEndpointsCommunicator.
+    - Fixing the behavior of an edge case while creating new diagnostic settings.
 ## Version 1.4.0
 * Add support for restore an instance database from geo-redundant backups
 

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,11 @@ public DiagnosticSettingsResource CreateDiagnosticSettings(`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
	`169`	`+ if (!settings.Logs.Any(l => string.Equals(l.Category, DefinitionsCommon.SQLSecurityAuditCategory)))`
	`170`	`+ {`
	`171`	`+ settings.Logs.Add(new LogSettings(true, DefinitionsCommon.SQLSecurityAuditCategory));`
	`172`	`+ }`
	`173`	`+`
`169`	`174`	`return client.DiagnosticSettings.CreateOrUpdateAsync(`
`170`	`175`	`resoureUri, settings, settingsName).Result;`
`171`	`176`	`}`