Skip to content

Commit 4d2f8d7

Browse files
stankovskistankovski
committed
Merge pull request #1116 from yoavrubin/dev
Updating dynamic data masking to use the RuleState property
2 parents 69044ea + dc7ee26 commit 4d2f8d7

16 files changed

+12070
-5327
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.Sql">
76-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.38.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
76+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.39.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
7777
</Reference>
7878
<Reference Include="Microsoft.Azure.Management.Storage">
7979
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function Create-DataMaskingTestEnvironment ($testSuffix)
8686
{
8787
$params = Get-SqlDataMaskingTestEnvironmentParameters $testSuffix
8888
New-AzureRmResourceGroup -Name $params.rgname -Location "Australia East" -Force
89-
New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force
89+
New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-ddm-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force
9090
$fullServerName = $params.serverName + ".database.windows.net"
9191

9292
$uid = $params.userName

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,50 +21,50 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2121
public class DataMaskingTests : SqlTestsBase
2222
{
2323

24-
[Fact(Skip = "test takes more than 5 sec")]
25-
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
[Fact]
25+
[Trait(Category.AcceptanceType, Category.BVT)]
2626
public void TestDatabaseDataMaskingPolicyEnablementToggling()
2727
{
2828
RunPowerShellTest("Test-DatabaseDataMaskingPolicyEnablementToggling");
2929
}
3030

31-
[Fact(Skip = "test takes more than 5 sec")]
32-
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
[Fact]
32+
[Trait(Category.AcceptanceType, Category.BVT)]
3333
public void TestDatabaseDataMaskingPrivilegedLoginsChanges()
3434
{
3535
RunPowerShellTest("Test-DatabaseDataMaskingPrivilegedLoginsChanges");
3636
}
3737

38-
[Fact(Skip = "test takes more than 5 sec")]
39-
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
[Fact]
39+
[Trait(Category.AcceptanceType, Category.BVT)]
4040
public void TestDatabaseDataMaskingBasicRuleLifecycle()
4141
{
4242
RunPowerShellTest("Test-DatabaseDataMaskingBasicRuleLifecycle");
4343
}
4444

45-
[Fact(Skip = "test takes more than 5 sec")]
46-
[Trait(Category.AcceptanceType, Category.CheckIn)]
45+
[Fact]
46+
[Trait(Category.AcceptanceType, Category.BVT)]
4747
public void TestDatabaseDataMaskingNumberRuleLifecycle()
4848
{
4949
RunPowerShellTest("Test-DatabaseDataMaskingNumberRuleLifecycle");
5050
}
5151

52-
[Fact(Skip = "test takes more than 5 sec")]
53-
[Trait(Category.AcceptanceType, Category.CheckIn)]
52+
[Fact]
53+
[Trait(Category.AcceptanceType, Category.BVT)]
5454
public void TestDatabaseDataMaskingTextRuleLifecycle()
5555
{
5656
RunPowerShellTest("Test-DatabaseDataMaskingTextRuleLifecycle");
5757
}
5858

59-
[Fact(Skip = "test takes more than 5 sec")]
60-
[Trait(Category.AcceptanceType, Category.CheckIn)]
59+
[Fact]
60+
[Trait(Category.AcceptanceType, Category.BVT)]
6161
public void TestDatabaseDataMaskingRuleCreationFailures()
6262
{
6363
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures");
6464
}
6565

66-
[Fact(Skip = "test takes more than 5 sec")]
67-
[Trait(Category.AcceptanceType, Category.CheckIn)]
66+
[Fact]
67+
[Trait(Category.AcceptanceType, Category.BVT)]
6868
public void TestDatabaseDataMaskingRuleCreationWithoutPolicy()
6969
{
7070
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationWithoutPolicy");

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.ps1

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,41 @@ Tests toggling of the enablement property of a data masking policy
1919
function Test-DatabaseDataMaskingPolicyEnablementToggling
2020
{
2121
# Setup
22-
$testSuffix = 777
23-
$params = Create-DataMaskingTestEnvironment $testSuffix
22+
$testSuffix = 77732
23+
$params = Create-DataMaskingTestEnvironment $testSuffix
2424

2525
try
2626
{
27-
# Test
27+
# Test create as enabled
2828
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
2929
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
3030

3131
# Assert
3232
Assert-AreEqual $policy.DataMaskingState "Enabled"
3333

34-
# Test
34+
# Test update from enabled to enabled
35+
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
36+
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
37+
38+
# Assert
39+
Assert-AreEqual $policy.DataMaskingState "Enabled"
40+
41+
42+
# Test update from enabled to disabled
3543
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
3644
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
3745

3846
# Assert
3947
Assert-AreEqual $policy.DataMaskingState "Disabled"
4048

41-
# Test
49+
# Test update from disabled to disabled
50+
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
51+
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
52+
53+
# Assert
54+
Assert-AreEqual $policy.DataMaskingState "Disabled"
55+
56+
# Test update from disabled to enabled
4257
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
4358
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
4459

@@ -59,26 +74,48 @@ function Test-DatabaseDataMaskingPrivilegedLoginsChanges
5974
{
6075

6176
# Setup
62-
$testSuffix = 30371
63-
$params = Create-DataMaskingTestEnvironment $testSuffix
77+
$testSuffix = 30379
78+
$params = Create-DataMaskingTestEnvironment $testSuffix
6479

6580
try
6681
{
67-
# Test
82+
# Test create as enabled
83+
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
84+
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
85+
86+
# Assert
87+
Assert-AreEqual $policy.DataMaskingState "Enabled"
88+
89+
90+
# Test adding a privileged login
6891
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins "dbo"
6992
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
7093

7194
# Assert
7295
Assert-AreEqual $policy.PrivilegedLogins "dbo"
7396

74-
# Test
97+
# Test removing a privileged login while having enabled policy
98+
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins ""
99+
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
100+
101+
# Assert
102+
Assert-AreEqual $policy.PrivilegedLogins ""
103+
104+
# Test disabling a policy
75105
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
76106
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
77107

108+
# Assert
109+
Assert-AreEqual $policy.PrivilegedLogins ""
110+
111+
# Test adding a privileged login while being disabled
112+
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins "dbo"
113+
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
114+
78115
# Assert
79116
Assert-AreEqual $policy.PrivilegedLogins "dbo"
80117

81-
# Test
118+
# Test removing a privileged login while being disabled
82119
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins ""
83120
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
84121

@@ -99,9 +136,9 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
99136
{
100137

101138
# Setup
102-
$testSuffix = 40222
103-
$params = Create-DataMaskingTestEnvironment $testSuffix
104-
$ruleId = "rule1"
139+
$testSuffix = 40225
140+
$params = Create-DataMaskingTestEnvironment $testSuffix
141+
$ruleId = "rule1"
105142
try
106143
{
107144
# Test

0 commit comments

Comments
 (0)