Skip to content

Commit 2b7b6e2

Browse files
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 969b3fb + e073bb8 commit 2b7b6e2

File tree

15 files changed

+2505
-2114
lines changed

15 files changed

+2505
-2114
lines changed

setup/azurecmdfiles.wxi

Lines changed: 0 additions & 336 deletions
Large diffs are not rendered by default.

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SecurityTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function Test-DatabaseUpdatePolicyWithEventTypes
153153
$policy = Get-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
154154

155155
# Assert
156-
Assert-AreEqual $policy.EventType.Length 15
156+
Assert-AreEqual $policy.EventType.Length 10
157157

158158
# Test
159159
Set-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount -EventType "PlainSQL_Success","ParameterizedSQL_Success","ParameterizedSQL_Failure"
@@ -197,7 +197,7 @@ function Test-ServerUpdatePolicyWithEventTypes
197197
$policy = Get-AzureSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName
198198

199199
# Assert
200-
Assert-AreEqual $policy.EventType.Length 15
200+
Assert-AreEqual $policy.EventType.Length 10
201201

202202
# Test
203203
Set-AzureSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -StorageAccountName $params.storageAccount -EventType "PlainSQL_Success","ParameterizedSQL_Success","ParameterizedSQL_Failure"
@@ -242,14 +242,14 @@ function Test-DatabaseUpdatePolicyWithEventTypeShortcuts
242242
$policy = Get-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
243243

244244
# Assert
245-
Assert-AreEqual $policy.EventType.Length 15
245+
Assert-AreEqual $policy.EventType.Length 10
246246

247247
# Test
248248
Set-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount -EventType "All"
249249
$policy = Get-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
250250

251251
# Assert
252-
Assert-AreEqual $policy.EventType.Length 15
252+
Assert-AreEqual $policy.EventType.Length 10
253253

254254

255255
# Test
@@ -301,14 +301,14 @@ function Test-ServerUpdatePolicyWithEventTypeShortcuts
301301
$policy = Get-AzureSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName
302302

303303
# Assert
304-
Assert-AreEqual $policy.EventType.Length 15
304+
Assert-AreEqual $policy.EventType.Length 10
305305

306306
# Test
307307
Set-AzureSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -StorageAccountName $params.storageAccount -EventType "All"
308308
$policy = Get-AzureSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName
309309

310310
# Assert
311-
Assert-AreEqual $policy.EventType.Length 15
311+
Assert-AreEqual $policy.EventType.Length 10
312312

313313

314314
# Test

0 commit comments

Comments
 (0)