Skip to content

Commit 8f1d81f

Browse files
ogailogail
committed
Merge pull request #247 from yoavrubin/dev
Minor code cleanup
2 parents a1a8503 + c23c7b0 commit 8f1d81f

File tree

3 files changed

+14
-102
lines changed

3 files changed

+14
-102
lines changed

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

Lines changed: 12 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -18,46 +18,6 @@ Tests toggling of the enablement property of a data masking policy
1818
#>
1919
function Test-DatabaseDataMaskingPolicyEnablementToggling
2020
{
21-
22-
# Setup
23-
$testSuffix = 777
24-
$params = Create-DataMaskingTestEnvironment $testSuffix
25-
26-
try
27-
{
28-
# Test
29-
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
30-
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
31-
32-
# Assert
33-
Assert-AreEqual $policy.DataMaskingState "Enabled"
34-
35-
# Test
36-
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
37-
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
38-
39-
# Assert
40-
Assert-AreEqual $policy.DataMaskingState "Disabled"
41-
42-
# Test
43-
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
44-
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
45-
46-
# Assert
47-
Assert-AreEqual $policy.DataMaskingState "Enabled"
48-
}
49-
finally
50-
{
51-
# Cleanup
52-
}
53-
}
54-
55-
<#
56-
.SYNOPSIS
57-
Tests toggling of the enablement property of a data masking policy
58-
#>
59-
function Test-DatabaseDataMaskingAuditPolicyEnablementToggling {
60-
6121
# Setup
6222
$testSuffix = 777
6323
$params = Create-DataMaskingTestEnvironment $testSuffix
@@ -92,53 +52,6 @@ function Test-DatabaseDataMaskingAuditPolicyEnablementToggling {
9252
}
9353

9454

95-
<#
96-
.SYNOPSIS
97-
Tests the toggling of the enablement property of a data masking policy
98-
#>
99-
function Test-DatabaseDataMaskingPolicyEnablementToggling {
100-
101-
# Setup
102-
$testSuffix = 10777
103-
$params = Create-DataMaskingTestEnvironment $testSuffix
104-
105-
try
106-
{
107-
# Test
108-
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
109-
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
110-
111-
# Assert
112-
Assert-AreEqual $policy.DataMaskingState "Enabled"
113-
114-
# Test
115-
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -MaskingLevel "Extended"
116-
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
117-
118-
# Assert
119-
Assert-AreEqual $policy.DataMaskingState "Enabled"
120-
121-
122-
# Test
123-
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
124-
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
125-
126-
# Assert
127-
Assert-AreEqual $policy.DataMaskingState "Disabled"
128-
129-
# Test
130-
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
131-
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
132-
133-
# Assert
134-
Assert-AreEqual $policy.DataMaskingState "Enabled"
135-
}
136-
finally
137-
{
138-
# Cleanup
139-
}
140-
}
141-
14255
<#
14356
.SYNOPSIS
14457
Tests changes of the masking level property of a data masking policy
@@ -228,7 +141,6 @@ function Test-DatabaseDataMaskingPrivilegedLoginsChanges
228141
}
229142
}
230143

231-
232144
<#
233145
.SYNOPSIS
234146
Tests the lifecycle of a data masking rule with basic masking function
@@ -245,10 +157,10 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
245157
# Test
246158
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
247159

248-
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
160+
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
249161
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
250162
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName "Table1" -ColumnName "Column1"
251-
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
163+
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
252164
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}
253165

254166
# Assert
@@ -276,10 +188,10 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
276188
Assert-AreEqual $rule.TableName "Table2"
277189
Assert-AreEqual $rule.ColumnName "Column2"
278190

279-
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
191+
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
280192
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
281193
Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
282-
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
194+
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
283195
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}
284196

285197
# Assert
@@ -310,10 +222,10 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
310222
# Test
311223
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
312224

313-
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
225+
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
314226
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
315227
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Number" -TableName "TableNumber" -ColumnName "ColumnNumber" -NumberFrom 12 -NumberTo 56
316-
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
228+
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
317229
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}
318230

319231
# Assert
@@ -347,10 +259,10 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
347259
Assert-AreEqual $rule.NumberTo 78.91
348260

349261

350-
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
262+
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
351263
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
352264
Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
353-
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
265+
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
354266
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}
355267

356268
# Assert
@@ -381,10 +293,10 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
381293
# Test
382294
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
383295

384-
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
296+
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
385297
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
386298
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Text" -TableName "TableText" -ColumnName "ColumnText" -PrefixSize 1 -ReplacementString "AAA" -SuffixSize 3
387-
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
299+
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
388300
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}
389301

390302
# Assert
@@ -419,10 +331,10 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
419331
Assert-AreEqual $rule.SuffixSize 2
420332

421333

422-
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
334+
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
423335
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
424336
Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
425-
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
337+
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
426338
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}
427339

428340
# Assert

‎src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/DataMasking/NewAzureSqlDatabaseDataMaskingRule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.DataMasking
2525
/// <summary>
2626
/// Returns a new data masking rule for a specific database
2727
/// </summary>
28-
[Cmdlet(VerbsCommon.New, "AzureSqlDatabaseDataMaskingRule")]
28+
[Cmdlet(VerbsCommon.New, "AzureSqlDatabaseDataMaskingRule", DefaultParameterSetName = ByTableAndColumn)]
2929
public class NewAzureSqlDatabaseDataMaskingRule : BuildAzureSqlDatabaseDataMaskingRule
3030
{
3131
/// <summary>

‎src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/DataMasking/SetAzureSqlDatabaseDataMaskingRule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.DataMasking
2525
/// <summary>
2626
/// Sets properties for a data masking rule.
2727
/// </summary>
28-
[Cmdlet(VerbsCommon.Set, "AzureSqlDatabaseDataMaskingRule")]
28+
[Cmdlet(VerbsCommon.Set, "AzureSqlDatabaseDataMaskingRule", DefaultParameterSetName = ByTableAndColumn)]
2929
public class SetAzureSqlDatabaseDataMaskingRule : BuildAzureSqlDatabaseDataMaskingRule
3030
{
3131
/// <summary>

0 commit comments

Comments
 (0)