Skip to content

Commit 74efb3d

Browse files
unknownunknown
unknown
authored and
unknown
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev2
2 parents 100bccb + 237ab20 commit 74efb3d

17 files changed

+6334
-2475
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@
263263
<Component Id="cmpD5624BF8D78E80B0526773DE6E4FD2D2" Guid="*">
264264
<File Id="fil81AE4D49FE4C59DD6526396037D718F7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Compute.dll-Help.xml" />
265265
</Component>
266+
<Component Id="cmp2D89D47A52D9C508B335922A76918EE3" Guid="*">
267+
<File Id="filFE04FA7CFF5D29881FA54A6ED872814A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Compute.format.generated.ps1xml" />
268+
</Component>
266269
<Component Id="cmp62942A24352ADC631A6C9DAE39D62F70" Guid="*">
267270
<File Id="fil1FB621027ABD42027FCAE84212775303" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Compute.format.ps1xml" />
268271
</Component>
@@ -883,6 +886,9 @@
883886
<Component Id="cmp4384DC163B139D10A7988F6DCE10A880" Guid="*">
884887
<File Id="fil93B13FEC3D2F0E6C24EEA5A88743673E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\Microsoft.Azure.Commands.KeyVault.dll" />
885888
</Component>
889+
<Component Id="cmp72DEDEB70C04F613F499759765B491C3" Guid="*">
890+
<File Id="fil945BE330AE595DDFB65805EF5604059F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\Microsoft.Azure.Commands.KeyVault.dll-help.xml" />
891+
</Component>
886892
<Component Id="cmp92D53BB85B8D42A3C0F2FD08233102D5" Guid="*">
887893
<File Id="fil74E9585A41297A7784BF077B4E9E0783" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\Microsoft.Azure.Commands.KeyVault.format.ps1xml" />
888894
</Component>
@@ -3908,6 +3914,7 @@
39083914
<ComponentRef Id="cmpEDFE5B7CD43B10FD4C5F82D443DA0C5D" />
39093915
<ComponentRef Id="cmp7F2719BE7827D3FDDF69D7ACB6135115" />
39103916
<ComponentRef Id="cmpD5624BF8D78E80B0526773DE6E4FD2D2" />
3917+
<ComponentRef Id="cmp2D89D47A52D9C508B335922A76918EE3" />
39113918
<ComponentRef Id="cmp62942A24352ADC631A6C9DAE39D62F70" />
39123919
<ComponentRef Id="cmp479E4B1EF0A49C9845DB071F542F5392" />
39133920
<ComponentRef Id="cmpDCDC7F34E3D2A51F32765B8C00AE3808" />
@@ -4102,6 +4109,7 @@
41024109
<ComponentRef Id="cmpF691ECE2E61383DFBF997C509D946386" />
41034110
<ComponentRef Id="cmpDE148D8065A52DA77846D8339A7F2254" />
41044111
<ComponentRef Id="cmp4384DC163B139D10A7988F6DCE10A880" />
4112+
<ComponentRef Id="cmp72DEDEB70C04F613F499759765B491C3" />
41054113
<ComponentRef Id="cmp92D53BB85B8D42A3C0F2FD08233102D5" />
41064114
<ComponentRef Id="cmp5F38D5C60E748EC6C858B453AD3588CF" />
41074115
<ComponentRef Id="cmpF367A5E3647B7598492C73AE20E99B06" />

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,11 @@
207207
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
208208
</EmbeddedResource>
209209
</ItemGroup>
210-
<ItemGroup />
210+
<ItemGroup>
211+
<Content Include="Microsoft.Azure.Commands.KeyVault.dll-help.xml">
212+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
213+
</Content>
214+
</ItemGroup>
211215
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
212216
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
213217
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

‎src/ResourceManager/KeyVault/Commands.KeyVault/Microsoft.Azure.Commands.KeyVault.dll-help.xml

Lines changed: 4583 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultDataServiceClient.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ public IEnumerable<KeyIdentityItem> GetKeys(KeyVaultObjectFilterOptions options)
192192
result = this.keyVaultClient.GetKeysNextAsync(options.NextLink).GetAwaiter().GetResult();
193193

194194
options.NextLink = result.NextLink;
195-
return result.Value.Select((keyItem) => { return new KeyIdentityItem(keyItem, this.vaultUriHelper); });
195+
return (result.Value == null) ? new List<KeyIdentityItem>() :
196+
result.Value.Select((keyItem) => { return new KeyIdentityItem(keyItem, this.vaultUriHelper); });
196197
}
197198
catch (Exception ex)
198199
{
@@ -349,7 +350,8 @@ public IEnumerable<SecretIdentityItem> GetSecrets(KeyVaultObjectFilterOptions op
349350
result = this.keyVaultClient.GetSecretsNextAsync(options.NextLink).GetAwaiter().GetResult();
350351

351352
options.NextLink = result.NextLink;
352-
return result.Value.Select((secretItem) => { return new SecretIdentityItem(secretItem, this.vaultUriHelper); });
353+
return (result.Value == null) ? new List<SecretIdentityItem>() :
354+
result.Value.Select((secretItem) => { return new SecretIdentityItem(secretItem, this.vaultUriHelper); });
353355
}
354356
catch (Exception ex)
355357
{

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
245245
Assert-AreEqual $rule.NumberTo 56
246246

247247

248-
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -AliasName "AliasNumber" -NumberFrom 67.26 -NumberTo 78.91
248+
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -TableName "TableNumber1" -ColumnName "ColumnNumber1" -NumberFrom 67.26 -NumberTo 78.91
249249
$rule = Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId
250250

251251
# Assert
@@ -254,7 +254,8 @@ function Test-DatabaseDataMaskingNumberRuleLifecycle
254254
Assert-AreEqual $rule.DatabaseName $params.databaseName
255255
Assert-AreEqual $rule.RuleId $ruleId
256256
Assert-AreEqual $rule.MaskingFunction "Number"
257-
Assert-AreEqual $rule.AliasName "AliasNumber"
257+
Assert-AreEqual $rule.TableName "TableNumber1"
258+
Assert-AreEqual $rule.ColumnName "ColumnNumber1"
258259
Assert-AreEqual $rule.NumberFrom 67.26
259260
Assert-AreEqual $rule.NumberTo 78.91
260261

@@ -316,7 +317,7 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
316317
Assert-AreEqual $rule.ReplacementString "AAA"
317318
Assert-AreEqual $rule.SuffixSize 3
318319

319-
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -AliasName "AliasText" -PrefixSize 4 -ReplacementString "BBB" -SuffixSize 2
320+
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -TableName "TableText1" -ColumnName "ColumnText1" -PrefixSize 4 -ReplacementString "BBB" -SuffixSize 2
320321
$rule = Get-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId
321322

322323
# Assert
@@ -325,7 +326,8 @@ function Test-DatabaseDataMaskingTextRuleLifecycle
325326
Assert-AreEqual $rule.DatabaseName $params.databaseName
326327
Assert-AreEqual $rule.RuleId $ruleId
327328
Assert-AreEqual $rule.MaskingFunction "Text"
328-
Assert-AreEqual $rule.AliasName "AliasText"
329+
Assert-AreEqual $rule.TableName "TableText1"
330+
Assert-AreEqual $rule.ColumnName "ColumnText1"
329331
Assert-AreEqual $rule.PrefixSize 4
330332
Assert-AreEqual $rule.ReplacementString "BBB"
331333
Assert-AreEqual $rule.SuffixSize 2
@@ -371,16 +373,13 @@ function Test-DatabaseDataMaskingRuleCreationFailures
371373
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -MaskingFunction "Default" -TableName "T1" -ColumnName "C1"}
372374
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "NONEXISTING" -TableName "T1" -ColumnName "C1"}
373375
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default"}
374-
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -ColumnName "C1" -AliasName "A1"}
375-
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName "T1" -AliasName "A1"}
376-
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName "T1" -ColumnName "C1" -AliasName "A1"}
376+
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -ColumnName "C1"}
377+
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName "T1"}
377378
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Number" -TableName "T1" -ColumnName "C1" -NumberFrom 2 -NumberTo 1}
378379

379380
New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName "TT1" -ColumnName "CC1"
380381
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -TableName "TT2" -ColumnName "CC2" }
381382
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId "SHOULD-FAIL" -MaskingFunction "Default" -TableName "TT1" -ColumnName "CC1"}
382-
Set-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -MaskingFunction "Default" -AliasName "AA1"
383-
Assert-Throws { New-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId "SHOULD-FAIL" -MaskingFunction -AliasName "AA1"}
384383

385384
Remove-AzureSqlDatabaseDataMaskingRule -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -RuleId $ruleId -Force
386385
}

0 commit comments

Comments
 (0)