Skip to content

Fix basic account and network rule test cases #45

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
yifanz7 merged 1 commit into from
Nov 14, 2024
Merged

Fix basic account and network rule test cases #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 6 deletions src/Storage/RegressionTests/srp.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Describe "Management plan test" {
$result.NameAvailable | should -Be $false

$account = Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameBasic | Set-AzStorageAccount -EnableHttpsTrafficOnly $false -AccessTier cool -Force
$account.EnableHttpsTrafficOnly | should -Be $false
# $account.EnableHttpsTrafficOnly | should -Be $false -- comment out the check since EnableHttpsTrafficOnly is always true
$account.AccessTier | should -Be "Cool"
$account = Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameBasic | Set-AzStorageAccount -UpgradeToStorageV2 -PublicNetworkAccess Enabled -AllowedCopyScope PrivateLink
$account.Kind | should -Be "StorageV2"
Expand Down Expand Up @@ -238,15 +238,18 @@ Describe "Management plan test" {
New-AzStorageAccount -ResourceGroupName $rgname -Name $accountNameNetRule1 -SkuName Standard_LRS -Location eastus
New-AzStorageAccount -ResourceGroupName $rgname -Name $accountNameNetRule2 -SkuName Standard_LRS -Location eastus

$resourceId1 = "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DataFactory/factories/myDataFactory"
$resourceId2 = "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Sql/servers/mySQLServer"

#Update the Account NetworkACL with JSON
echo "Update the Account NetworkACL with JSON"
$rule = Update-AzStorageAccountNetworkRuleSet -ResourceGroupName $rgname -Name $accountNameNetRule1 -Bypass AzureServices -DefaultAction Allow -IpRule (@{IPAddressOrRange="20.11.0.0/16";Action="allow"},
@{IPAddressOrRange="28.0.2.0/19";Action="allow"},
@{IPAddressOrRange="129.0.2.34/25";Action="allow"})`
-VirtualNetworkRule (@{VirtualNetworkResourceId=$vnet1;Action="allow"},
@{VirtualNetworkResourceId=$vnet2;Action="allow"}) `
-ResourceAccessRule (@{ResourceId=$vnet1;TenantId=$globalNode.tenantId},
@{ResourceId=$vnet2;TenantId=$globalNode.tenantId})
-ResourceAccessRule (@{ResourceId=$resourceId1;TenantId=$globalNode.tenantId},
@{ResourceId=$resourceId2;TenantId=$globalNode.tenantId})
$rule.ResourceAccessRules.Count | should -be 2
$rule.Bypass | should -be AzureServices
$rule.DefaultAction | should -be Allow
Expand Down Expand Up @@ -289,11 +292,11 @@ Describe "Management plan test" {
echo "Clean the ResourceAccessRules, and add 2 Rules"
$rule = Update-AzStorageAccountNetworkRuleSet -ResourceGroupName $rgname -Name $accountNameNetRule1 -ResourceAccessRule @()
$rule.ResourceAccessRules.Count | should -be 0
$resrule = Add-AzStorageAccountNetworkRule -ResourceGroupName $rgname -Name $accountNameNetRule1 -TenantId $globalNode.tenantId -ResourceId $vnet1
$resrule = Add-AzStorageAccountNetworkRule -ResourceGroupName $rgname -Name $accountNameNetRule1 -TenantId $globalNode.tenantId -ResourceId $resourceId1
$resrule.Count | should -be 1
$resrule = Add-AzStorageAccountNetworkRule -ResourceGroupName $rgname -Name $accountNameNetRule1 -TenantId $globalNode.tenantId -ResourceId $vnet2
$resrule = Add-AzStorageAccountNetworkRule -ResourceGroupName $rgname -Name $accountNameNetRule1 -TenantId $globalNode.tenantId -ResourceId $resourceId2
$resrule.Count | should -be 2
$resrule = Remove-AzStorageAccountNetworkRule -ResourceGroupName $rgname -Name $accountNameNetRule1 -TenantId $globalNode.tenantId -ResourceId $vnet1
$resrule = Remove-AzStorageAccountNetworkRule -ResourceGroupName $rgname -Name $accountNameNetRule1 -TenantId $globalNode.tenantId -ResourceId $resourceId1
$resrule.Count | should -be 1

#Clean the IpRules on Account2, Pipeline to add IpRules from Account1 to Account2
Expand Down