Skip to content

Azure sql refactoring and contract updates #670

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 4 commits into from
Jul 30, 2015
Merged

Azure sql refactoring and contract updates #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8223f4f
Adding schema to data masking rule and refactoring
yoavrubin Jul 28, 2015
1d10cec
Adding schema to datamasking rules
yoavrubin Jul 30, 2015
e87409b
Updating policy tests
yoavrubin Jul 30, 2015
6689193
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Jul 30, 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
2 changes: 1 addition & 1 deletion src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Sql">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.28.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.32.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Creates the test environment needed to perform the Sql data masking tests
function Create-DataMaskingTestEnvironment ($testSuffix)
{
$params = Get-SqlDataMaskingTestEnvironmentParameters $testSuffix
New-AzureResourceGroup -Name $params.rgname -Location "West US" -TemplateFile ".\Templates\sql-ddm-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "West US" -administratorLogin $params.userName -Force
New-AzureResourceGroup -Name $params.rgname -Location "Australia East" -TemplateFile ".\Templates\sql-ddm-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force
$fullServerName = $params.serverName + ".database.windows.net"
$uid = $params.userName
$pwd = $params.pwd
Expand Down
42 changes: 24 additions & 18 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 @@ -72,7 +72,7 @@ function Test-DatabaseDataMaskingPrivilegedLoginsChanges
Assert-AreEqual $policy.PrivilegedLogins "A;B;C"

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

# Assert
Expand Down Expand Up @@ -109,7 +109,7 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle

$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 $params.table1 -ColumnName $params.column1
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

Expand All @@ -123,10 +123,11 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
Assert-AreEqual $rule.DatabaseName $params.databaseName
Assert-AreEqual $rule.RuleId $ruleId
Assert-AreEqual $rule.MaskingFunction "Default"
Assert-AreEqual $rule.SchemaName "DBO"
Assert-AreEqual $rule.TableName $params.table1
Assert-AreEqual $rule.ColumnName $params.column1

Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Email" -TableName $params.table2 -ColumnName $params.column2
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Email" -SchemaName "DBO" -TableName $params.table2 -ColumnName $params.column2
$rule = Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId

# Assert
Expand All @@ -135,6 +136,7 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
Assert-AreEqual $rule.DatabaseName $params.databaseName
Assert-AreEqual $rule.RuleId $ruleId
Assert-AreEqual $rule.MaskingFunction "Email"
Assert-AreEqual $rule.SchemaName "DBO"
Assert-AreEqual $rule.TableName $params.table2
Assert-AreEqual $rule.ColumnName $params.column2

Expand Down Expand Up @@ -174,7 +176,7 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle

$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 $params.table1 -ColumnName $params.column1 -NumberFrom 12 -NumberTo 56
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Number" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1 -NumberFrom 12 -NumberTo 56
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

Expand All @@ -189,13 +191,14 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
Assert-AreEqual $rule.DatabaseName $params.databaseName
Assert-AreEqual $rule.RuleId $ruleId
Assert-AreEqual $rule.MaskingFunction "Number"
Assert-AreEqual $rule.SchemaName "DBO"
Assert-AreEqual $rule.TableName $params.table1
Assert-AreEqual $rule.ColumnName $params.column1
Assert-AreEqual $rule.NumberFrom 12
Assert-AreEqual $rule.NumberTo 56


Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -TableName $params.table2 -ColumnName $params.column2 -NumberFrom 67.26 -NumberTo 78.91
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -SchemaName "DBO" -TableName $params.table2 -ColumnName $params.column2 -NumberFrom 67.26 -NumberTo 78.91
$rule = Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId

# Assert
Expand All @@ -204,6 +207,7 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
Assert-AreEqual $rule.DatabaseName $params.databaseName
Assert-AreEqual $rule.RuleId $ruleId
Assert-AreEqual $rule.MaskingFunction "Number"
Assert-AreEqual $rule.SchemaName "DBO"
Assert-AreEqual $rule.TableName $params.table2
Assert-AreEqual $rule.ColumnName $params.column2
Assert-AreEqual $rule.NumberFrom 67.26
Expand Down Expand Up @@ -246,7 +250,7 @@ function Test-DatabaseDataMaskingTextRuleLifecycle

$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 $params.table1 -ColumnName $params.column1 -PrefixSize 1 -ReplacementString "AAA" -SuffixSize 3
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Text" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1 -PrefixSize 1 -ReplacementString "AAA" -SuffixSize 3
$ruleCountAfter = (Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName).Count
$ruleCountAfter = if ( !$ruleCountAfter ) {0} else {$ruleCountAfter}

Expand All @@ -261,13 +265,14 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
Assert-AreEqual $rule.DatabaseName $params.databaseName
Assert-AreEqual $rule.RuleId $ruleId
Assert-AreEqual $rule.MaskingFunction "Text"
Assert-AreEqual $rule.SchemaName "DBO"
Assert-AreEqual $rule.TableName $params.table1
Assert-AreEqual $rule.ColumnName $params.column1
Assert-AreEqual $rule.PrefixSize 1
Assert-AreEqual $rule.ReplacementString "AAA"
Assert-AreEqual $rule.SuffixSize 3

Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -TableName $params.table2 -ColumnName $params.column2 -PrefixSize 4 -ReplacementString "BBB" -SuffixSize 2
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -SchemaName "DBO" -TableName $params.table2 -ColumnName $params.column2 -PrefixSize 4 -ReplacementString "BBB" -SuffixSize 2
$rule = Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId

# Assert
Expand All @@ -276,6 +281,7 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
Assert-AreEqual $rule.DatabaseName $params.databaseName
Assert-AreEqual $rule.RuleId $ruleId
Assert-AreEqual $rule.MaskingFunction "Text"
Assert-AreEqual $rule.SchemaName "DBO"
Assert-AreEqual $rule.TableName $params.table2
Assert-AreEqual $rule.ColumnName $params.column2
Assert-AreEqual $rule.PrefixSize 4
Expand Down Expand Up @@ -317,19 +323,19 @@ function Test-DatabaseDataMaskingRuleCreationFailures
# Test
Set-AzureSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
# Assert
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName "NONEXISTING" -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName "NONEXISTING" -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName "NONEXISTING" -RuleId $ruleId -MaskingFunction "Default" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -MaskingFunction "Default" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "NONEXISTING" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName "NONEXISTING" -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName "NONEXISTING" -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName "NONEXISTING" -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "NONEXISTING" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default"}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName $params.table1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Number" $params.table1 -ColumnName $params.column1 -NumberFrom 2 -NumberTo 1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -ColumnName $params.column1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Number" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1 -NumberFrom 2 -NumberTo 1}

New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName $params.table1 -ColumnName $params.column1
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName $params.table2 -ColumnName $params.column2}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId "SHOULD-FAIL" -MaskingFunction "Default" -TableName $params.table1 -ColumnName $params.column1}
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table2 -ColumnName $params.column2}
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId "SHOULD-FAIL" -MaskingFunction "Default" -SchemaName "DBO" -TableName $params.table1 -ColumnName $params.column1}

Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
}
Expand Down
Loading