Update

Jefajers · Feb 29, 2024 · d4d3093 · d4d3093
1 parent 2d111c4
commit d4d3093
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 85 deletions.
diff --git a/src/tests/functional/Microsoft.Authorization/policyAssignments/scenario.ps1 b/src/tests/functional/Microsoft.Authorization/policyAssignments/scenario.ps1
@@ -40,10 +40,8 @@ Describe "Scenario - policyAssignments" {
         $changeSet = @(
             "D`t$script:file"
         )
-        $deleteSetContents = '-- '
-        $deleteSetContents += $script:file
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $script:file)
+        [string[]]$deleteSetContents = "-- $script:file"
+        [string[]]$deleteSetContents += (Get-Content $script:file)
         Remove-Item -Path $script:file -Force
         try {
             Write-PSFMessage -Level Debug -Message "Deletion Scenario $script:resourceType starting: $script:file" -FunctionName "Functional Tests"

diff --git a/src/tests/functional/Microsoft.Authorization/roleAssignments/scenario.ps1 b/src/tests/functional/Microsoft.Authorization/roleAssignments/scenario.ps1
@@ -40,10 +40,8 @@ Describe "Scenario - roleAssignments" {
         $changeSet = @(
             "D`t$script:file"
         )
-        $deleteSetContents = '-- '
-        $deleteSetContents += $script:file
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $script:file)
+        [string[]]$deleteSetContents = "-- $script:file"
+        [string[]]$deleteSetContents += (Get-Content $script:file)
         Remove-Item -Path $script:file -Force
         try {
             Write-PSFMessage -Level Debug -Message "Deletion Scenario $script:resourceType starting: $script:file" -FunctionName "Functional Tests"

diff --git a/src/tests/integration/Repository.Tests.ps1 b/src/tests/integration/Repository.Tests.ps1
@@ -388,47 +388,20 @@ Describe "Repository" {
             "D`t$script:locksFile",
             "D`t$script:resourceGroupRemovalSupportFile"
         )
-        $deleteSetContents = '-- '
-        $deleteSetContents += $script:policyAssignmentsFile
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $Script:policyAssignmentsFile)
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += '-- '
-        $deleteSetContents += $Script:policyDefinitionsFile
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $Script:policyDefinitionsFile)
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += '-- '
-        $deleteSetContents += $Script:policySetDefinitionsFile
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $Script:policySetDefinitionsFile)
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += '-- '
-        $deleteSetContents += $Script:policyExemptionsFile
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $Script:policyExemptionsFile)
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += '-- '
-        $deleteSetContents += $Script:roleAssignmentsFile
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $Script:roleAssignmentsFile)
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += '-- '
-        $deleteSetContents += $Script:locksFile
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $Script:locksFile)
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += '-- '
-        $deleteSetContents += $script:resourceGroupRemovalSupportFile
-        $deleteSetContents += [Environment]::NewLine
-        $deleteSetContents += (Get-Content $script:resourceGroupRemovalSupportFile)
-        Remove-Item -Path $script:policyAssignmentsFile -Force
-        Remove-Item -Path $Script:policyDefinitionsFile -Force
-        Remove-Item -Path $Script:policySetDefinitionsFile -Force
-        Remove-Item -Path $Script:policyExemptionsFile -Force
-        Remove-Item -Path $Script:roleAssignmentsFile -Force
-        Remove-Item -Path $Script:locksFile -Force
-        Remove-Item -Path $script:resourceGroupRemovalSupportFile -Force
+        [string[]]$deleteSetContents = "-- $script:policyAssignmentsFile"
+        [string[]]$deleteSetContents += (Get-Content $Script:policyAssignmentsFile)
+        [string[]]$deleteSetContents = "-- $Script:policyDefinitionsFile"
+        [string[]]$deleteSetContents += (Get-Content $Script:policyDefinitionsFile)
+        [string[]]$deleteSetContents = "-- $Script:policySetDefinitionsFile"
+        [string[]]$deleteSetContents += (Get-Content $Script:policySetDefinitionsFile)
+        [string[]]$deleteSetContents = "-- $Script:policyExemptionsFile"
+        [string[]]$deleteSetContents += (Get-Content $Script:policyExemptionsFile)
+        [string[]]$deleteSetContents = "-- $Script:roleAssignmentsFile"
+        [string[]]$deleteSetContents += (Get-Content $Script:roleAssignmentsFile)
+        [string[]]$deleteSetContents = "-- $Script:locksFile"
+        [string[]]$deleteSetContents += (Get-Content $Script:locksFile)
+        [string[]]$deleteSetContents = "-- $script:resourceGroupRemovalSupportFile"
+        [string[]]$deleteSetContents += (Get-Content $script:resourceGroupRemovalSupportFile)
         Invoke-AzOpsPush -ChangeSet $changeSet -DeleteSetContents $deleteSetContents
     }
 
@@ -1112,54 +1085,44 @@ Describe "Repository" {
             $changeSet = @(
                 "D`t$script:policyDefinitionsDepFile"
             )
-            $DeleteSetContents += '-- '
-            $DeleteSetContents += $Script:policyDefinitionsDepFile
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $Script:policyDefinitionsDepFile)
+            [string[]]$deleteSetContents = "-- $Script:policyDefinitionsDepFile"
+            [string[]]$deleteSetContents += (Get-Content $Script:policyDefinitionsDepFile)
             Remove-Item -Path $Script:policyDefinitionsDepFile -Force
             {Invoke-AzOpsPush -ChangeSet $changeSet -DeleteSetContents $deleteSetContents -WhatIf:$true} | Should -Throw
         }
         It "Deletion of policySetDefinitionsFile with assignment dependency should fail" {
             $changeSet = @(
                 "D`t$script:policySetDefinitionsDepFile"
             )
-            $DeleteSetContents = '-- '
-            $DeleteSetContents += $Script:policySetDefinitionsDepFile
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $Script:policySetDefinitionsDepFile)
+            [string[]]$deleteSetContents = "--  $Script:policySetDefinitionsDepFile"
+            [string[]]$deleteSetContents += (Get-Content $Script:policySetDefinitionsDepFile)
             Remove-Item -Path $Script:policySetDefinitionsDepFile -Force
             {Invoke-AzOpsPush -ChangeSet $changeSet -DeleteSetContents $deleteSetContents -WhatIf:$true} | Should -Throw
         }
         It "Deletion of policyDefinitionsFile with setDefinition dependency should fail" {
             $changeSet = @(
                 "D`t$script:policyDefinitionsDep2File"
             )
-            $DeleteSetContents = '-- '
-            $DeleteSetContents += $script:policyDefinitionsDep2File
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $script:policyDefinitionsDep2File)
+            [string[]]$deleteSetContents = "-- $script:policyDefinitionsDep2File"
+            [string[]]$deleteSetContents += (Get-Content $script:policyDefinitionsDep2File)
             Remove-Item -Path $script:policyDefinitionsDep2File -Force
             {Invoke-AzOpsPush -ChangeSet $changeSet -DeleteSetContents $deleteSetContents -WhatIf:$true} | Should -Throw
         }
         It "Deletion of policyAssignmentFile with role assignment dependency should fail" {
             $changeSet = @(
                 "D`t$script:policyAssignmentsDepFile"
             )
-            $DeleteSetContents = '-- '
-            $DeleteSetContents += $script:policyAssignmentsDepFile
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $script:policyAssignmentsDepFile)
+            [string[]]$deleteSetContents = "-- $script:policyAssignmentsDepFile"
+            [string[]]$deleteSetContents += (Get-Content $script:policyAssignmentsDepFile)
             Remove-Item -Path $script:policyAssignmentsDepFile -Force
             {Invoke-AzOpsPush -ChangeSet $changeSet -DeleteSetContents $deleteSetContents -WhatIf:$true} | Should -Throw
         }
         It "Deletion of policyAssignmentFile with lock dependency should fail" {
             $changeSet = @(
                 "D`t$script:policyAssignmentsDep2File"
             )
-            $DeleteSetContents = '-- '
-            $DeleteSetContents += $script:policyAssignmentsDep2File
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $script:policyAssignmentsDep2File)
+            [string[]]$deleteSetContents = "-- $script:policyAssignmentsDep2File"
+            [string[]]$deleteSetContents += (Get-Content $script:policyAssignmentsDep2File)
             Remove-Item -Path $script:policyAssignmentsDep2File -Force
             {Invoke-AzOpsPush -ChangeSet $changeSet -DeleteSetContents $deleteSetContents -WhatIf:$true} | Should -Throw
         }
@@ -1294,34 +1257,26 @@ Describe "Repository" {
                 "A`t$($script:deployCustomLock.FullName)"
             )
             {Invoke-AzOpsPush -ChangeSet $changeSet} | Should -Not -Throw
-            Start-Sleep -Seconds 5
+            Start-Sleep -Seconds 10
             $changeSet = @(
                 "D`t$($script:deployCustomRt.FullName[0])",
                 "D`t$($script:deployCustomLock.FullName)",
                 "D`t$script:policyAssignmentsDeletionFile"
             )
-            $DeleteSetContents = '-- '
-            $DeleteSetContents += $script:deployCustomRt.FullName[0]
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $script:deployCustomRt.FullName[0])
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += '-- '
-            $DeleteSetContents += $script:deployCustomLock.FullName
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $script:deployCustomLock.FullName)
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += '-- '
-            $DeleteSetContents += $script:policyAssignmentsDeletionFile
-            $DeleteSetContents += [Environment]::NewLine
-            $DeleteSetContents += (Get-Content $script:policyAssignmentsDeletionFile)
+            [string[]]$deleteSetContents = "-- $($script:deployCustomRt.FullName[0])"
+            [string[]]$deleteSetContents += (Get-Content $script:deployCustomRt.FullName[0])
+            [string[]]$deleteSetContents += "-- $($script:deployCustomLock.FullName)"
+            [string[]]$deleteSetContents += (Get-Content $script:deployCustomLock.FullName)
+            [string[]]$deleteSetContents += "-- $script:policyAssignmentsDeletionFile"
+            [string[]]$deleteSetContents += (Get-Content $script:policyAssignmentsDeletionFile)
             Remove-Item -Path $script:deployCustomRt.FullName[0] -Force
             Remove-Item -Path $script:deployCustomLock.FullName -Force
             Remove-Item -Path $script:policyAssignmentsDeletionFile -Force
             {Invoke-AzOpsPush -ChangeSet $changeSet -DeleteSetContents $deleteSetContents -WhatIf:$false} | Should -Not -Throw
             Set-PSFConfig -FullName AzOps.Core.CustomTemplateResourceDeletion -Value $false
             Start-Sleep -Seconds 30
             (Get-AzResource -ResourceGroupName $script:resourceGroupCustomDeletion.ResourceGroupName).Count | Should -Be 0
-            Get-AzPolicyAssignment -Id $script:policyAssignmentsDeletion.ResourceId -ErrorAction SilentlyContinue | Should -BeNullOrEmpty
+            Get-AzPolicyAssignment -Id $script:policyAssignmentsDeletion.ResourceId -ErrorAction SilentlyContinue | Should -Be $Null
         }
         #endregion
     }