Enhance integration tests for Set-SqlDscServerPermission by restoring CreateEndpoint permission for persistent role

Author: johlju

tests/Integration/Commands/ConvertTo-SqlDscServerPermission.Integration.Tests.ps1

@@ -152,7 +152,6 @@ Describe 'ConvertTo-SqlDscServerPermission' -Tag @('Integration_SQL2017', 'Integ
             # Get permissions for the SqlDscIntegrationTestRole_Persistent server role
             $serverPermissionInfo = Get-SqlDscServerPermission -ServerObject $script:serverObject -Name 'SqlDscIntegrationTestRole_Persistent' -ErrorAction 'Stop'
 
-            # Only proceed if we have permission data to work with
             $result = ConvertTo-SqlDscServerPermission -ServerPermissionInfo $serverPermissionInfo
 
             # Validate the result structure
@@ -170,10 +169,9 @@ Describe 'ConvertTo-SqlDscServerPermission' -Tag @('Integration_SQL2017', 'Integ
 
             # Verify that the CreateEndpoint permission granted by Grant-SqlDscServerPermission test is present
             $grantPermission = $result | Where-Object { $_.State -eq 'Grant' }
-            if ($grantPermission)
-            {
-                $grantPermission.Permission | Should -Contain 'CreateEndpoint' -Because 'CreateEndpoint permission should have been granted by Grant-SqlDscServerPermission integration test'
-            }
+
+            $grantPermission | Should -Not -BeNullOrEmpty
+            $grantPermission.Permission | Should -Contain 'CreateEndpoint' -Because 'CreateEndpoint permission should have been granted by Grant-SqlDscServerPermission integration test'
         }
     }
 

tests/Integration/Commands/Set-SqlDscServerPermission.Integration.Tests.ps1

@@ -60,6 +60,10 @@ Describe 'Set-SqlDscServerPermission' -Tag @('Integration_SQL2017', 'Integration
         Grant-SqlDscServerPermission -Login $script:loginObject -Permission @('ViewServerState') -Force -ErrorAction 'SilentlyContinue'
         Grant-SqlDscServerPermission -Login $script:loginObject -Permission @('ViewAnyDefinition') -Force -ErrorAction 'SilentlyContinue'
 
+        # Restore the CreateEndpoint permission on the persistent role that other tests depend on
+        $script:roleObject = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'Stop'
+        Grant-SqlDscServerPermission -ServerRole $script:roleObject -Permission 'CreateEndpoint' -Force -ErrorAction 'SilentlyContinue'
+
         Disconnect-SqlDscDatabaseEngine -ServerObject $script:serverObject
     }