Skip to content

Commit f43da67

Browse files
VeryEarlyVeryEarly
committed
move creation of resource group to utils.ps1
1 parent 656a440 commit f43da67

17 files changed

+215
-247
lines changed

‎src/Resources/Policy.Autorest/test/Backcompat/NewPolicyExemptionParameters.Tests.ps1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# setup the Pester environment for policy backcompat tests
22
. (Join-Path $PSScriptRoot 'Common.ps1') 'Backcompat-NewPolicyExemptionParameters'
33

4-
Describe 'Backcompat-NewPolicyExemptionParameters' -Tag 'LiveOnly' {
4+
Describe 'Backcompat-NewPolicyExemptionParameters' {
55

66
BeforeAll {
77
# make a new resource group and policy assignment of some built-in definition
8-
$rgname = Get-ResourceGroupName
8+
$rgname = $env.rgname
99
$goodScope = "/subscriptions/$subscriptionId/resourceGroups/$rgname"
1010

11-
$rg = New-ResourceGroup -Name $rgname -Location "west us"
1211
$assignmentName = 'testPA1'
1312
$policy = Get-AzPolicyDefinition -Builtin | ?{ $_.Name -eq '0a914e76-4921-4c19-b460-a2d36003525a' }
14-
$goodPolicyAssignment = New-AzPolicyAssignment -Name $assignmentName -Scope $rg.ResourceId -PolicyDefinition $policy -Description $description -BackwardCompatible
13+
$goodPolicyAssignment = New-AzPolicyAssignment -Name $assignmentName -Scope $env.scope -PolicyDefinition $policy -Description $description -BackwardCompatible
1514
}
1615

1716
It 'no parameters' {
@@ -46,7 +45,6 @@ Describe 'Backcompat-NewPolicyExemptionParameters' -Tag 'LiveOnly' {
4645
AfterAll {
4746
$remove = Remove-AzPolicyAssignment -Name $assignmentName -BackwardCompatible
4847

49-
$remove = (Remove-ResourceGroup -Name $rgname) -and $remove
5048
Assert-AreEqual True $remove
5149

5250
Write-Host -ForegroundColor Magenta "Cleanup complete."

‎src/Resources/Policy.Autorest/test/Backcompat/PolicyAssignmentCRUD.Tests.ps1

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# setup the Pester environment for policy backcompat tests
22
. (Join-Path $PSScriptRoot 'Common.ps1') 'Backcompat-PolicyAssignmentCRUD'
33

4-
Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
4+
Describe 'Backcompat-PolicyAssignmentCRUD' {
55

66
BeforeAll {
77
# setup
8-
$rgname = Get-ResourceGroupName
8+
$rgname = $env.rgname
99
$policyName = Get-ResourceName
1010

1111
$policySetDefName = Get-ResourceName
1212
$policyDefName1 = Get-ResourceName
1313
$policyDefName2 = Get-ResourceName
1414

1515
# make a new resource group and policy definition
16-
$rg = New-ResourceGroup -Name $rgname -Location "west us"
1716
$policyDefinition1 = New-AzPolicyDefinition -Name $policyDefName1 -Policy "$testFilesFolder\SamplePolicyDefinition.json" -Description $description -BackwardCompatible
1817
$policyDefinition2 = New-AzPolicyDefinition -Name $policyDefName2 -Policy "$testFilesFolder\SamplePolicyDefinition.json" -Description $description -BackwardCompatible
1918
$policySetString = "[{""policyDefinitionId"":""" + $policyDefinition1.PolicyDefinitionId + """}, {""policyDefinitionId"":""" + $policyDefinition2.PolicyDefinitionId + """}]"
@@ -29,13 +28,13 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
2928
It 'make a policy assignment at RG scope' {
3029
{
3130
# assign the policy definition to the resource group, get the assignment back and validate
32-
$actual = New-AzPolicyAssignment -Name $test1 -PolicySetDefinition $policySet -Scope $rg.ResourceId -Description $description -NonComplianceMessage $nonComplianceMessages -BackwardCompatible
33-
$expected = Get-AzPolicyAssignment -Name $test1 -Scope $rg.ResourceId -BackwardCompatible
31+
$actual = New-AzPolicyAssignment -Name $test1 -PolicySetDefinition $policySet -Scope $env.scope -Description $description -NonComplianceMessage $nonComplianceMessages -BackwardCompatible
32+
$expected = Get-AzPolicyAssignment -Name $test1 -Scope $env.scope -BackwardCompatible
3433
Assert-AreEqual $expected.Name $actual.Name
3534
Assert-AreEqual Microsoft.Authorization/policyAssignments $actual.ResourceType
3635
Assert-AreEqual $expected.PolicyAssignmentId $actual.PolicyAssignmentId
3736
Assert-AreEqual $expected.Properties.PolicyDefinitionId $policySet.ResourceId
38-
Assert-AreEqual $expected.Properties.Scope $rg.ResourceId
37+
Assert-AreEqual $expected.Properties.Scope $env.scope
3938
Assert-AreEqual 1 $expected.Properties.NonComplianceMessages.Length
4039
Assert-AreEqual "General message" $expected.Properties.NonComplianceMessages[0].Message
4140
} | Should -Not -Throw
@@ -44,7 +43,7 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
4443
It 'get policy assignment by Id' {
4544
{
4645
# get first assignment back by name
47-
$actual = Get-AzPolicyAssignment -Name $test1 -Scope $rg.ResourceId -BackwardCompatible
46+
$actual = Get-AzPolicyAssignment -Name $test1 -Scope $env.scope -BackwardCompatible
4847

4948
# get it again by id and validate
5049
$actualId = Get-AzPolicyAssignment -Id $actual.ResourceId -BackwardCompatible
@@ -57,7 +56,7 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
5756
It 'make a policy assignment with multiple noncompliance messages' {
5857
{
5958
# get first assignment back by name
60-
$get = Get-AzPolicyAssignment -Name $test1 -Scope $rg.ResourceId -BackwardCompatible
59+
$get = Get-AzPolicyAssignment -Name $test1 -Scope $env.scope -BackwardCompatible
6160

6261
$nonComplianceMessages = $nonComplianceMessages + @(@{
6362
Message = "Specific message 1"
@@ -68,7 +67,7 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
6867
Assert-AreEqual 2 $nonComplianceMessages.Length
6968

7069
# create it again with two non-compliance messages
71-
$new = New-AzPolicyAssignment -Name $test1 -PolicySetDefinition $policySet -Scope $rg.ResourceId -Description $description -NonComplianceMessage $nonComplianceMessages -BackwardCompatible
70+
$new = New-AzPolicyAssignment -Name $test1 -PolicySetDefinition $policySet -Scope $env.scope -Description $description -NonComplianceMessage $nonComplianceMessages -BackwardCompatible
7271
Assert-AreEqual $get.ResourceId $new.ResourceId
7372

7473
# get it again by id and validate non-compliance messages
@@ -96,7 +95,7 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
9695
It 'update policy assignment to a single noncompliance message' {
9796
{
9897
# get first assignment back again
99-
$actual = Get-AzPolicyAssignment -Name $test1 -Scope $rg.ResourceId -BackwardCompatible
98+
$actual = Get-AzPolicyAssignment -Name $test1 -Scope $env.scope -BackwardCompatible
10099

101100
$nonComplianceMessages = @(@{ Message = "General non-compliance message" })
102101

@@ -111,7 +110,7 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
111110
It 'update policy assignment back to a multiple noncompliance message' {
112111
{
113112
# get first assignment back again
114-
$actual = Get-AzPolicyAssignment -Name $test1 -Scope $rg.ResourceId -BackwardCompatible
113+
$actual = Get-AzPolicyAssignment -Name $test1 -Scope $env.scope -BackwardCompatible
115114

116115
$nonComplianceMessages = @(
117116
@{
@@ -135,8 +134,8 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
135134
It 'list policy assignments' {
136135
{
137136
# make another policy assignment, ensure both are present in resource group scope listing
138-
$expected = New-AzPolicyAssignment -Name $test2 -Scope $rg.ResourceId -PolicyDefinition $policyDefinition1 -Description $description -BackwardCompatible
139-
$list1 = Get-AzPolicyAssignment -Scope $rg.ResourceId -BackwardCompatible | ?{ $_.Name -in @($test1, $test2) }
137+
$expected = New-AzPolicyAssignment -Name $test2 -Scope $env.scope -PolicyDefinition $policyDefinition1 -Description $description -BackwardCompatible
138+
$list1 = Get-AzPolicyAssignment -Scope $env.scope -BackwardCompatible | ?{ $_.Name -in @($test1, $test2) }
140139
Assert-AreEqual 2 $list1.Count
141140

142141
# ensure both are present in full listing
@@ -151,12 +150,11 @@ Describe 'Backcompat-PolicyAssignmentCRUD' -Tag 'LiveOnly' {
151150

152151
AfterAll {
153152
# clean up
154-
$remove = Remove-AzPolicyAssignment -Name $test1 -Scope $rg.ResourceId -BackwardCompatible
155-
$remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $rg.ResourceId -BackwardCompatible) -and $remove
153+
$remove = Remove-AzPolicyAssignment -Name $test1 -Scope $env.scope -BackwardCompatible
154+
$remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $env.scope -BackwardCompatible) -and $remove
156155
$remove = (Remove-AzPolicySetDefinition -Name $policySetDefName -Force -BackwardCompatible) -and $remove
157156
$remove = (Remove-AzPolicyDefinition -Name $policyDefName1 -Force -BackwardCompatible) -and $remove
158157
$remove = (Remove-AzPolicyDefinition -Name $policyDefName2 -Force -BackwardCompatible) -and $remove
159-
$remove = (Remove-ResourceGroup -Name $rgname) -and $remove
160158

161159
Assert-AreEqual True $remove
162160

‎src/Resources/Policy.Autorest/test/Backcompat/PolicyAssignmentEnforcementMode.Tests.ps1

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
# setup the Pester environment for policy backcompat tests
22
. (Join-Path $PSScriptRoot 'Common.ps1') 'Backcompat-PolicyAssignmentEnforcementMode'
33

4-
Describe 'Backcompat-PolicyAssignmentEnforcementMode' -Tag 'LiveOnly' {
4+
Describe 'Backcompat-PolicyAssignmentEnforcementMode' {
55

66
BeforeAll {
77
# setup
8-
$rgname = Get-ResourceGroupName
8+
$rgname = $env.rgname
99
$policyName = Get-ResourceName
1010
$testPA = Get-ResourceName
1111
$test2 = Get-ResourceName
1212
$location = "westus"
1313

1414
# make a new resource group and policy definition
15-
$rg = New-ResourceGroup -Name $rgname -Location $location
1615
$policy = New-AzPolicyDefinition -Name $policyName -Policy "$testFilesFolder\SamplePolicyDefinition.json" -Description $description -BackwardCompatible
1716

1817
# assign the policy definition to the resource group
19-
$actual = New-AzPolicyAssignment -Name $testPA -PolicyDefinition $policy -Scope $rg.ResourceId -Description $description -Location $location -EnforcementMode DoNotEnforce -BackwardCompatible
18+
$actual = New-AzPolicyAssignment -Name $testPA -PolicyDefinition $policy -Scope $env.scope -Description $description -Location $location -EnforcementMode DoNotEnforce -BackwardCompatible
2019
}
2120

2221
It 'make a policy assignment' {
2322
{
2423
# get the assignment back and validate
25-
$expected = Get-AzPolicyAssignment -Name $testPA -Scope $rg.ResourceId -BackwardCompatible
24+
$expected = Get-AzPolicyAssignment -Name $testPA -Scope $env.scope -BackwardCompatible
2625
Assert-AreEqual $expected.Name $actual.Name
2726
Assert-AreEqual Microsoft.Authorization/policyAssignments $actual.ResourceType
2827
Assert-AreEqual $expected.PolicyAssignmentId $actual.PolicyAssignmentId
2928
Assert-AreEqual $expected.Properties.PolicyDefinitionId $policy.PolicyDefinitionId
30-
Assert-AreEqual $expected.Properties.Scope $rg.ResourceId
29+
Assert-AreEqual $expected.Properties.Scope $env.scope
3130
Assert-AreEqual $expected.Properties.EnforcementMode $actual.Properties.EnforcementMode
3231
Assert-AreEqual $expected.Properties.EnforcementMode $enforcementModeDoNotEnforce
3332
Assert-AreEqual $location $actual.Location
@@ -64,7 +63,7 @@ Describe 'Backcompat-PolicyAssignmentEnforcementMode' -Tag 'LiveOnly' {
6463
It 'make another policy assignment without enforcement mode' {
6564
{
6665
# make another policy assignment without an enforcementMode, validate default mode is set
67-
$withoutEnforcementMode = New-AzPolicyAssignment -Name $test2 -Scope $rg.ResourceId -PolicyDefinition $policy -Description $description -BackwardCompatible
66+
$withoutEnforcementMode = New-AzPolicyAssignment -Name $test2 -Scope $env.scope -PolicyDefinition $policy -Description $description -BackwardCompatible
6867
Assert-AreEqual $enforcementModeDefault $withoutEnforcementMode.Properties.EnforcementMode
6968

7069
# set an enforcement mode to the new assignment using the SET cmdlet
@@ -80,17 +79,16 @@ Describe 'Backcompat-PolicyAssignmentEnforcementMode' -Tag 'LiveOnly' {
8079
It 'enforcement mode in policy assignment list' {
8180
{
8281
# verify enforcement mode is returned in collection GET
83-
$list = Get-AzPolicyAssignment -Scope $rg.ResourceId -BackwardCompatible | ?{ $_.Name -in @($testPA, $test2) }
82+
$list = Get-AzPolicyAssignment -Scope $env.scope -BackwardCompatible | ?{ $_.Name -in @($testPA, $test2) }
8483
Assert-AreEqual 2 @($list.Properties.EnforcementMode | Select -Unique).Count
8584
} | Should -Not -Throw
8685
}
8786

8887
AfterAll {
8988
# clean up
90-
$remove = Remove-AzPolicyAssignment -Name $testPA -Scope $rg.ResourceId -BackwardCompatible
91-
$remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $rg.ResourceId -BackwardCompatible) -and $remove
89+
$remove = Remove-AzPolicyAssignment -Name $testPA -Scope $env.scope -BackwardCompatible
90+
$remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $env.scope -BackwardCompatible) -and $remove
9291
$remove = (Remove-AzPolicyDefinition -Name $policyName -Force -BackwardCompatible) -and $remove
93-
$remove = (Remove-ResourceGroup -Name $rgname) -and $remove
9492
Assert-AreEqual True $remove
9593

9694
Write-Host -ForegroundColor Magenta "Cleanup complete."

‎src/Resources/Policy.Autorest/test/Backcompat/PolicyAssignmentSystemAssignedIdentity.Tests.ps1

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
# setup the Pester environment for policy backcompat tests
22
. (Join-Path $PSScriptRoot 'Common.ps1') 'Backcompat-PolicyAssignmentSystemAssignedIdentity'
33

4-
Describe 'Backcompat-PolicyAssignmentSystemAssignedIdentity' -Tag 'LiveOnly' {
4+
Describe 'Backcompat-PolicyAssignmentSystemAssignedIdentity' {
55

66
BeforeAll {
77
# setup
8-
$rgname = Get-ResourceGroupName
8+
$rgname = $env.rgname
99
$policyName = Get-ResourceName
1010
$testPA = Get-ResourceName
1111
$test2 = Get-ResourceName
1212
$location = "westus"
1313

1414
# make a new resource group and policy definition
15-
$rg = New-ResourceGroup -Name $rgname -Location $location
1615
$policy = New-AzPolicyDefinition -Name $policyName -Policy "$testFilesFolder\SamplePolicyDefinition.json" -Description $description -BackwardCompatible
1716
# assign the policy definition with system MSI to the resource group
18-
$actual = New-AzPolicyAssignment -Name $testPA -PolicyDefinition $policy -Scope $rg.ResourceId -Description $description -IdentityType SystemAssigned -Location $location -BackwardCompatible
17+
$actual = New-AzPolicyAssignment -Name $testPA -PolicyDefinition $policy -Scope $env.scope -Description $description -IdentityType SystemAssigned -Location $location -BackwardCompatible
1918
}
2019

2120
It 'make a policy assignment at RG scope with MSI' {
2221
{
2322
# get the assignment back and validate
24-
$expected = Get-AzPolicyAssignment -Name $testPA -Scope $rg.ResourceId -BackwardCompatible
23+
$expected = Get-AzPolicyAssignment -Name $testPA -Scope $env.scope -BackwardCompatible
2524
Assert-AreEqual $expected.Name $actual.Name
2625
Assert-AreEqual Microsoft.Authorization/policyAssignments $actual.ResourceType
2726
Assert-AreEqual $expected.PolicyAssignmentId $actual.PolicyAssignmentId
2827
Assert-AreEqual $expected.Properties.PolicyDefinitionId $policy.PolicyDefinitionId
29-
Assert-AreEqual $expected.Properties.Scope $rg.ResourceId
28+
Assert-AreEqual $expected.Properties.Scope $env.scope
3029
Assert-AreEqual "SystemAssigned" $expected.Identity.IdentityType
3130
Assert-NotNull $expected.Identity.PrincipalId
3231
Assert-NotNull $expected.Identity.TenantId
@@ -62,7 +61,7 @@ Describe 'Backcompat-PolicyAssignmentSystemAssignedIdentity' -Tag 'LiveOnly' {
6261
It 'make another policy assignment without MSI' {
6362
{
6463
# make another policy assignment without an identity
65-
$withoutIdentityResult = New-AzPolicyAssignment -Name $test2 -Scope $rg.ResourceId -PolicyDefinition $policy -Description $description -BackwardCompatible
64+
$withoutIdentityResult = New-AzPolicyAssignment -Name $test2 -Scope $env.scope -PolicyDefinition $policy -Description $description -BackwardCompatible
6665
Assert-Null $withoutIdentityResult.Identity
6766
Assert-Null $withoutIdentityResult.Location
6867
# add an identity to the new assignment using set
@@ -78,7 +77,7 @@ Describe 'Backcompat-PolicyAssignmentSystemAssignedIdentity' -Tag 'LiveOnly' {
7877
It 'list policy assignment with MSI' {
7978
{
8079
# verify identity is returned in collection GET
81-
$list = Get-AzPolicyAssignment -Scope $rg.ResourceId -BackwardCompatible | ?{ $_.Name -in @($testPA, $test2) }
80+
$list = Get-AzPolicyAssignment -Scope $env.scope -BackwardCompatible | ?{ $_.Name -in @($testPA, $test2) }
8281
Assert-AreEqual "SystemAssigned" ($list.Identity.IdentityType | Select -Unique)
8382
Assert-AreEqual 2 @($list.Identity.PrincipalId | Select -Unique).Count
8483
Assert-AreEqual 1 @($list.Identity.TenantId | Select -Unique).Count
@@ -89,10 +88,9 @@ Describe 'Backcompat-PolicyAssignmentSystemAssignedIdentity' -Tag 'LiveOnly' {
8988

9089
AfterAll {
9190
# clean up
92-
$remove = Remove-AzPolicyAssignment -Name $testPA -Scope $rg.ResourceId -BackwardCompatible
93-
$remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $rg.ResourceId -BackwardCompatible) -and $remove
91+
$remove = Remove-AzPolicyAssignment -Name $testPA -Scope $env.scope -BackwardCompatible
92+
$remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $env.scope -BackwardCompatible) -and $remove
9493
$remove = (Remove-AzPolicyDefinition -Name $policyName -Force -BackwardCompatible) -and $remove
95-
$remove = (Remove-ResourceGroup -Name $rgname) -and $remove
9694
Assert-AreEqual True $remove
9795

9896
Write-Host -ForegroundColor Magenta "Cleanup complete."

0 commit comments

Comments
 (0)