Skip to content

Dev #166

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
huangpf merged 18 commits into from
Oct 20, 2015
Merged

Dev #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
13d9dda
Use V2 Storage accounts for RM based Diagnostics Extenstion
rahulpandit85 Oct 13, 2015
577ab59
Adding ruleState to dynamic data masking
yoavrubin Oct 14, 2015
7877f08
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
yoavrubin Oct 14, 2015
08ede14
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Oct 14, 2015
cdba402
Audit cmdlets to read storage endoints from env
yoavrubin Oct 15, 2015
4ed2091
Merge pull request #46 from huangpf/dev
AzureRT Oct 16, 2015
6887eaa
Revert "Audit cmdlets to read storage endoints from env"
yoavrubin Oct 16, 2015
8f084e8
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Oct 19, 2015
362f3da
Running tests after checkin
yoavrubin Oct 19, 2015
dc7ee26
Testing rule lifecycle after CI
yoavrubin Oct 19, 2015
4d2f8d7
Merge pull request #1116 from yoavrubin/dev
stankovski Oct 19, 2015
5c679fd
Use StorageUtilities to fetch Storage Account keys
rahulpandit85 Oct 19, 2015
f411429
Merge pull request #164 from Azure/dev
huangpf Oct 19, 2015
93edfa5
Update Get-AllCommands.ps1
devigned Oct 19, 2015
8d44f81
Merge pull request #1112 from rahulpandit85/dev
ogail Oct 20, 2015
bd4be66
Merge pull request #165 from Azure/dev
huangpf Oct 20, 2015
73ebe3a
Merge pull request #48 from Azure/dev
AzureRT Oct 20, 2015
e4207be
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell int…
huangpf Oct 20, 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
20 changes: 7 additions & 13 deletions ...eManager/Compute/Commands.Compute/Extension/Diagnostics/SetAzureVMDiagnosticsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
using Microsoft.Azure.Management.Compute.Models;
using Microsoft.WindowsAzure.Commands.Common.Storage;
using Microsoft.WindowsAzure.Commands.Utilities.Common;
using Microsoft.WindowsAzure.Management.Storage;
using Microsoft.Azure.Commands.Management.Storage;
using Microsoft.Azure.Management.Storage;
using Newtonsoft.Json;

namespace Microsoft.Azure.Commands.Compute
Expand All @@ -37,7 +38,7 @@ public class SetAzureVMDiagnosticsExtensionCommand : VirtualMachineExtensionBase
private const string VirtualMachineExtension = "Microsoft.Compute/virtualMachines/extensions";
private const string IaaSDiagnosticsExtension = "IaaSDiagnostics";
private const string ExtensionPublisher = "Microsoft.Azure.Diagnostics";
private StorageManagementClient storageClient;
private IStorageManagementClient storageClient;

[Parameter(
Mandatory = true,
Expand Down Expand Up @@ -154,14 +155,14 @@ public string PrivateConfiguration
}
}

public StorageManagementClient StorageClient
public IStorageManagementClient StorageClient
{
get
{
if (this.storageClient == null)
{
this.storageClient = AzureSession.ClientFactory.CreateClient<StorageManagementClient>(
DefaultProfile.Context, AzureEnvironment.Endpoint.ServiceManagement);
DefaultProfile.Context, AzureEnvironment.Endpoint.ResourceManager);
}

return this.storageClient;
Expand Down Expand Up @@ -201,15 +202,8 @@ protected string GetStorageKey()

if (!string.IsNullOrEmpty(StorageAccountName))
{
var storageAccount = this.StorageClient.StorageAccounts.Get(StorageAccountName);
if (storageAccount != null)
{
var keys = this.StorageClient.StorageAccounts.GetKeys(StorageAccountName);
if (keys != null)
{
storageKey = !string.IsNullOrEmpty(keys.PrimaryKey) ? keys.PrimaryKey : keys.SecondaryKey;
}
}
var storageCredentials = StorageUtilities.GenerateStorageCredentials(this.StorageClient, this.ResourceGroupName, this.StorageAccountName);
storageKey = storageCredentials.ExportBase64EncodedKey();
}

return storageKey;
Expand Down
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 @@ -73,7 +73,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Sql">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.38.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.39.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 @@ -86,7 +86,7 @@ function Create-DataMaskingTestEnvironment ($testSuffix)
{
$params = Get-SqlDataMaskingTestEnvironmentParameters $testSuffix
New-AzureRmResourceGroup -Name $params.rgname -Location "Australia East" -Force
New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -TemplateFile ".\Templates\sql-audit-test-env-setup.json" -serverName $params.serverName -databaseName $params.databaseName -EnvLocation "Australia East" -administratorLogin $params.userName -Force
New-AzureRmResourceGroupDeployment -ResourceGroupName $params.rgname -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
Expand Down
28 changes: 14 additions & 14 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,50 +21,50 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
public class DataMaskingTests : SqlTestsBase
{

[Fact(Skip = "test takes more than 5 sec")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Fact]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestDatabaseDataMaskingPolicyEnablementToggling()
{
RunPowerShellTest("Test-DatabaseDataMaskingPolicyEnablementToggling");
}

[Fact(Skip = "test takes more than 5 sec")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Fact]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestDatabaseDataMaskingPrivilegedLoginsChanges()
{
RunPowerShellTest("Test-DatabaseDataMaskingPrivilegedLoginsChanges");
}

[Fact(Skip = "test takes more than 5 sec")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Fact]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestDatabaseDataMaskingBasicRuleLifecycle()
{
RunPowerShellTest("Test-DatabaseDataMaskingBasicRuleLifecycle");
}

[Fact(Skip = "test takes more than 5 sec")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Fact]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestDatabaseDataMaskingNumberRuleLifecycle()
{
RunPowerShellTest("Test-DatabaseDataMaskingNumberRuleLifecycle");
}

[Fact(Skip = "test takes more than 5 sec")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Fact]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestDatabaseDataMaskingTextRuleLifecycle()
{
RunPowerShellTest("Test-DatabaseDataMaskingTextRuleLifecycle");
}

[Fact(Skip = "test takes more than 5 sec")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Fact]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestDatabaseDataMaskingRuleCreationFailures()
{
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures");
}

[Fact(Skip = "test takes more than 5 sec")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Fact]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestDatabaseDataMaskingRuleCreationWithoutPolicy()
{
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationWithoutPolicy");
Expand Down
63 changes: 50 additions & 13 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 @@ -19,26 +19,41 @@ Tests toggling of the enablement property of a data masking policy
function Test-DatabaseDataMaskingPolicyEnablementToggling
{
# Setup
$testSuffix = 777
$params = Create-DataMaskingTestEnvironment $testSuffix
$testSuffix = 77732
$params = Create-DataMaskingTestEnvironment $testSuffix

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

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

# Test
# Test update from enabled to enabled
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

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


# Test update from enabled to disabled
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

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

# Test
# Test update from disabled to disabled
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Disabled"
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

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

# Test update from disabled to enabled
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -DataMaskingState "Enabled"
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

Expand All @@ -59,26 +74,48 @@ function Test-DatabaseDataMaskingPrivilegedLoginsChanges
{

# Setup
$testSuffix = 30371
$params = Create-DataMaskingTestEnvironment $testSuffix
$testSuffix = 30379
$params = Create-DataMaskingTestEnvironment $testSuffix

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

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


# Test adding a privileged login
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins "dbo"
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.PrivilegedLogins "dbo"

# Test
# Test removing a privileged login while having enabled policy
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins ""
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.PrivilegedLogins ""

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

# Assert
Assert-AreEqual $policy.PrivilegedLogins ""

# Test adding a privileged login while being disabled
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins "dbo"
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.PrivilegedLogins "dbo"

# Test
# Test removing a privileged login while being disabled
Set-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -PrivilegedLogins ""
$policy = Get-AzureRmSqlDatabaseDataMaskingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

Expand All @@ -99,9 +136,9 @@ function Test-DatabaseDataMaskingBasicRuleLifecycle
{

# Setup
$testSuffix = 40222
$params = Create-DataMaskingTestEnvironment $testSuffix
$ruleId = "rule1"
$testSuffix = 40225
$params = Create-DataMaskingTestEnvironment $testSuffix
$ruleId = "rule1"
try
{
# Test
Expand Down
Loading