Skip to content

Commit 992981b

Browse files
committed
Merge pull request Azure#701 from yoavrubin/dev
Adding test to storage deletion and re-creation in a different region
2 parents c28e2cc + 317db15 commit 992981b

File tree

4 files changed

+5596
-0
lines changed

4 files changed

+5596
-0
lines changed

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,9 @@
262262
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.SqlTests.DataMaskingTests\TestDatabaseDataMaskingRuleCreationFailures.json">
263263
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
264264
</None>
265+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.SqlTests.DataMaskingTests\TestDatabaseDataMaskingRuleCreationWithoutPolicy.json">
266+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
267+
</None>
265268
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.SqlTests.DataMaskingTests\TestDatabaseDataMaskingTextRuleLifecycle.json">
266269
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
267270
</None>
@@ -286,6 +289,9 @@
286289
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests\TestDatabaseUpdatePolicyWithRetention.json">
287290
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
288291
</None>
292+
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests\TestDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion.json">
293+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
294+
</None>
289295
<None Include="SessionRecords\Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests\TestDatabaseUpdatePolicyWithStorage.json">
290296
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
291297
</None>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,5 +231,12 @@ public void TestDatabaseRetentionKeepProperties()
231231
{
232232
RunPowerShellTest("Test-DatabaseRetentionKeepProperties");
233233
}
234+
235+
[Fact(Skip = "Skip for the version header upgrade on Storage library.")]
236+
[Trait(Category.RunType, Category.LiveOnly)]
237+
public void TestDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion()
238+
{
239+
RunPowerShellTest("Test-DatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion");
240+
}
234241
}
235242
}

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,49 @@ function Test-DatabaseUpdatePolicyWithStorage
7171
}
7272
}
7373

74+
<#
75+
.SYNOPSIS
76+
Tests the flow in which re-setting the policy with storage account that has the same name as before, but it is now on a different region
77+
#>
78+
function Test-DatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion
79+
{
80+
# Setup
81+
$testSuffix = 173
82+
Create-TestEnvironment $testSuffix
83+
$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix
84+
85+
try
86+
{
87+
# Test
88+
Set-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount
89+
$policy = Get-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
90+
91+
# Assert
92+
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
93+
Assert-AreEqual $policy.AuditState "Enabled"
94+
Assert-AreEqual $policy.UseServerDefault "Disabled"
95+
96+
Azure\Remove-AzureStorageAccount -StorageAccountName $params.storageAccount
97+
$newResourceGroupName = "test-rg-for-sql-cmdlets-" + $testSuffix
98+
New-AzureResourceGroup -Name $newResourceGroupName -Location "japanwest"
99+
New-AzureStorageAccount -StorageAccountName $params.storageAccount -ResourceGroupName $newResourceGroupName -Location "japanwest" -Type Standard_GRS
100+
101+
Set-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount
102+
$policy = Get-AzureSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
103+
104+
# Assert
105+
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
106+
Assert-AreEqual $policy.AuditState "Enabled"
107+
Assert-AreEqual $policy.UseServerDefault "Disabled"
108+
109+
110+
}
111+
finally
112+
{
113+
# Cleanup
114+
}
115+
}
116+
74117
<#
75118
.SYNOPSIS
76119
Tests that when setting the storage account property's value in a server's auditing policy, that value is later fetched properly

0 commit comments

Comments
 (0)