Skip to content

Minor code cleanup #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2015
Merged

Minor code cleanup #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a64b276
Cleanups
yoavrubin Mar 9, 2015
c23c7b0
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 12 additions & 100 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,46 +18,6 @@ Tests toggling of the enablement property of a data masking policy
#>
function Test-DatabaseDataMaskingPolicyEnablementToggling
{

# Setup
$testSuffix = 777
$params = Create-DataMaskingTestEnvironment $testSuffix

try
{
# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.DataMaskingState "Enabled"

# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.DataMaskingState "Disabled"

# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.DataMaskingState "Enabled"
}
finally
{
# Cleanup
}
}

<#
.SYNOPSIS
Tests toggling of the enablement property of a data masking policy
#>
function Test-DatabaseDataMaskingAuditPolicyEnablementToggling {

# Setup
$testSuffix = 777
$params = Create-DataMaskingTestEnvironment $testSuffix
Expand Down Expand Up @@ -92,53 +52,6 @@ function Test-DatabaseDataMaskingAuditPolicyEnablementToggling {
}


<#
.SYNOPSIS
Tests the toggling of the enablement property of a data masking policy
#>
function Test-DatabaseDataMaskingPolicyEnablementToggling {

# Setup
$testSuffix = 10777
$params = Create-DataMaskingTestEnvironment $testSuffix

try
{
# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.DataMaskingState "Enabled"

# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -MaskingLevel "Extended"
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.DataMaskingState "Enabled"


# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.DataMaskingState "Disabled"

# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
$policy = Get-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.DataMaskingState "Enabled"
}
finally
{
# Cleanup
}
}

<#
.SYNOPSIS
Tests changes of the masking level property of a data masking policy
Expand Down Expand Up @@ -228,7 +141,6 @@ function Test-DatabaseDataMaskingPrivilegedLoginsChanges
}
}


<#
.SYNOPSIS
Tests the lifecycle of a data masking rule with basic masking function
Expand All @@ -245,10 +157,10 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName "Table1" -ColumnName "Column1"
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

# Assert
Expand Down Expand Up @@ -276,10 +188,10 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
Assert-AreEqual $rule.TableName "Table2"
Assert-AreEqual $rule.ColumnName "Column2"

$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

# Assert
Expand Down Expand Up @@ -310,10 +222,10 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

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

# Assert
Expand Down Expand Up @@ -347,10 +259,10 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
Assert-AreEqual $rule.NumberTo 78.91


$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

# Assert
Expand Down Expand Up @@ -381,10 +293,10 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
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
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

# Assert
Expand Down Expand Up @@ -419,10 +331,10 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
Assert-AreEqual $rule.SuffixSize 2


$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountBefore = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountBefore = if ( !$ruleCountBefore ) {0} else {$ruleCountBefore}
Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Length
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

# Assert
Expand Down
2 changes: 1 addition & 1 deletion ...anager/Sql/Commands.Sql/Security/Cmdlet/DataMasking/NewAzureSqlDatabaseDataMaskingRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.DataMasking
/// <summary>
/// Returns a new data masking rule for a specific database
/// </summary>
[Cmdlet(VerbsCommon.New, "AzureSqlDatabaseDataMaskingRule")]
[Cmdlet(VerbsCommon.New, "AzureSqlDatabaseDataMaskingRule", DefaultParameterSetName = ByTableAndColumn)]
public class NewAzureSqlDatabaseDataMaskingRule : BuildAzureSqlDatabaseDataMaskingRule
{
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion ...anager/Sql/Commands.Sql/Security/Cmdlet/DataMasking/SetAzureSqlDatabaseDataMaskingRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.DataMasking
/// <summary>
/// Sets properties for a data masking rule.
/// </summary>
[Cmdlet(VerbsCommon.Set, "AzureSqlDatabaseDataMaskingRule")]
[Cmdlet(VerbsCommon.Set, "AzureSqlDatabaseDataMaskingRule", DefaultParameterSetName = ByTableAndColumn)]
public class SetAzureSqlDatabaseDataMaskingRule : BuildAzureSqlDatabaseDataMaskingRule
{
/// <summary>
Expand Down