Skip to content

Bug fix in SQL data masking when updating rule #807

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
Aug 28, 2015
Merged

Bug fix in SQL data masking when updating rule #807

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
90804f3
Bug fix in SQL data masking when updating rule
yoavrubin Aug 27, 2015
19f772c
Updating tests
yoavrubin Aug 27, 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
15 changes: 14 additions & 1 deletion 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 @@ -140,6 +140,19 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
Assert-AreEqual $rule.TableName $params.table2
Assert-AreEqual $rule.ColumnName $params.column2

Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default"
$rule = Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId

# Assert
Assert-AreEqual $rule.ResourceGroupName $params.rgname
Assert-AreEqual $rule.ServerName $params.serverName
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.table2
Assert-AreEqual $rule.ColumnName $params.column2

$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
Expand Down Expand Up @@ -353,7 +366,7 @@ function Test-DatabaseDataMaskingRuleCreationWithoutPolicy
{

# Setup
$testSuffix = 45262
$testSuffix = 457822
$params = Create-DataMaskingTestEnvironment $testSuffix
$ruleId = "rule1"
try
Expand Down
1,572 changes: 996 additions & 576 deletions ...ds.Sql.Test.ScenarioTests.DataMaskingTests/TestDatabaseDataMaskingBasicRuleLifecycle.json
View file
Open in desktop

Large diffs are not rendered by default.

2,332 changes: 1,790 additions & 542 deletions ...s.Sql.Test.ScenarioTests.DataMaskingTests/TestDatabaseDataMaskingNumberRuleLifecycle.json
View file
Open in desktop

Large diffs are not rendered by default.

1,102 changes: 599 additions & 503 deletions ....Sql.Test.ScenarioTests.DataMaskingTests/TestDatabaseDataMaskingRuleCreationFailures.json
View file
Open in desktop

Large diffs are not rendered by default.

1,936 changes: 1,241 additions & 695 deletions ...Test.ScenarioTests.DataMaskingTests/TestDatabaseDataMaskingRuleCreationWithoutPolicy.json
View file
Open in desktop

Large diffs are not rendered by default.

1,156 changes: 578 additions & 578 deletions ...nds.Sql.Test.ScenarioTests.DataMaskingTests/TestDatabaseDataMaskingTextRuleLifecycle.json
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 15 additions & 3 deletions ...ourceManager/Sql/Commands.Sql/Data Masking/Cmdlet/BuildAzureSqlDatabaseDataMaskingRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,21 @@ protected string ValidateRuleTarget(IEnumerable<DatabaseDataMaskingRuleModel> ru
/// <returns>An updated rule model</returns>
protected DatabaseDataMaskingRuleModel UpdateRule(DatabaseDataMaskingRuleModel rule)
{
rule.SchemaName = SchemaName;
rule.TableName = TableName;
rule.ColumnName = ColumnName;
if (!string.IsNullOrEmpty(SchemaName)) // only update if the user provided this value
{
rule.SchemaName = SchemaName;
}

if (!string.IsNullOrEmpty(TableName)) // only update if the user provided this value
{
rule.TableName = TableName;
}

if (!string.IsNullOrEmpty(ColumnName)) // only update if the user provided this value
{
rule.ColumnName = ColumnName;
}

if(!string.IsNullOrEmpty(MaskingFunction)) // only update if the user provided this value
{
rule.MaskingFunction = ModelizeMaskingFunction();
Expand Down