Refactor Get-SqlDscServerPermission to simplify role check logic

Author: johlju

source/Public/Get-SqlDscServerPermission.ps1

@@ -105,7 +105,7 @@ function Get-SqlDscServerPermission
             $false
         }
 
-        $isRole = if ($checkRole -and -not $isLogin)
+        $isRole = if ($checkRole)
         {
             Test-SqlDscIsRole @testSqlDscIsPrincipalParameters
         }

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

@@ -123,7 +123,7 @@ Describe 'Get-SqlDscServerPermission' -Tag @('Integration_SQL2016', 'Integration
         Context 'When getting permissions for invalid principals' {
             It 'Should throw error for non-existent login with ErrorAction Stop' {
                 { Get-SqlDscServerPermission -ServerObject $script:serverObject -Name 'NonExistentLogin123' -ErrorAction 'Stop' } |
-                    Should -Throw -ExpectedMessage "*does not exist*"
+                    Should -Throw -ExpectedMessage "*is not a login nor role*"
             }
 
             It 'Should return null for non-existent login with ErrorAction SilentlyContinue' {
@@ -134,7 +134,7 @@ Describe 'Get-SqlDscServerPermission' -Tag @('Integration_SQL2016', 'Integration
 
             It 'Should throw error for non-existent server role with ErrorAction Stop' {
                 { Get-SqlDscServerPermission -ServerObject $script:serverObject -Name 'NonExistentRole123' -ErrorAction 'Stop' } |
-                    Should -Throw -ExpectedMessage "*does not exist*"
+                    Should -Throw -ExpectedMessage "*is not a login nor role*"
             }
 
             It 'Should return null for non-existent server role with ErrorAction SilentlyContinue' {
@@ -192,12 +192,12 @@ Describe 'Get-SqlDscServerPermission' -Tag @('Integration_SQL2016', 'Integration
 
             It 'Should throw error when looking for login as role' {
                 { Get-SqlDscServerPermission -ServerObject $script:serverObject -Name 'sa' -PrincipalType 'Role' -ErrorAction 'Stop' } |
-                    Should -Throw -ExpectedMessage "*does not exist*"
+                    Should -Throw -ExpectedMessage "*is not a login nor role*"
             }
 
             It 'Should throw error when looking for role as login' {
                 { Get-SqlDscServerPermission -ServerObject $script:serverObject -Name 'sysadmin' -PrincipalType 'Login' -ErrorAction 'Stop' } |
-                    Should -Throw -ExpectedMessage "*does not exist*"
+                    Should -Throw -ExpectedMessage "*is not a login nor role*"
             }
 
             It 'Should return null when looking for login as role with SilentlyContinue' {

tests/Unit/Public/Get-SqlDscServerPermission.Tests.ps1

@@ -28,7 +28,7 @@ BeforeAll {
 
     $env:SqlServerDscCI = $true
 
-    Import-Module -Name $script:dscModuleName
+    Import-Module -Name $script:dscModuleName -Force
 
     # Loading mocked classes
     Add-Type -Path (Join-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath '../Stubs') -ChildPath 'SMO.cs')
@@ -244,14 +244,16 @@ Describe 'Get-SqlDscServerPermission' -Tag 'Public' {
                 }
             }
 
-            It 'Should call Test-SqlDscIsLogin but not Test-SqlDscIsRole when login is found' {
+            It 'Should call both Test-SqlDscIsLogin and Test-SqlDscIsRole' {
                 $null = Get-SqlDscServerPermission -ServerObject $mockServerObject -Name 'TestPrincipal' -ErrorAction 'SilentlyContinue'
 
                 Should -Invoke -CommandName Test-SqlDscIsLogin -ParameterFilter {
                     $ServerObject.Equals($mockServerObject) -and $Name -eq 'TestPrincipal'
                 } -Exactly -Times 1
 
-                Should -Invoke -CommandName Test-SqlDscIsRole -Exactly -Times 0
+                Should -Invoke -CommandName Test-SqlDscIsRole -ParameterFilter {
+                    $ServerObject.Equals($mockServerObject) -and $Name -eq 'TestPrincipal'
+                } -Exactly -Times 1
             }
         }
 
@@ -266,7 +268,7 @@ Describe 'Get-SqlDscServerPermission' -Tag 'Public' {
                 }
             }
 
-            It 'Should call both Test-SqlDscIsLogin and Test-SqlDscIsRole when login is not found' {
+            It 'Should call both Test-SqlDscIsLogin and Test-SqlDscIsRole' {
                 $null = Get-SqlDscServerPermission -ServerObject $mockServerObject -Name 'TestPrincipal' -ErrorAction 'SilentlyContinue'
 
                 Should -Invoke -CommandName Test-SqlDscIsLogin -ParameterFilter {
@@ -334,14 +336,16 @@ Describe 'Get-SqlDscServerPermission' -Tag 'Public' {
                 }
             }
 
-            It 'Should call Test-SqlDscIsLogin but not Test-SqlDscIsRole when login is found' {
+            It 'Should call both Test-SqlDscIsLogin and Test-SqlDscIsRole when both types are specified' {
                 $null = Get-SqlDscServerPermission -ServerObject $mockServerObject -Name 'TestPrincipal' -PrincipalType 'Login', 'Role' -ErrorAction 'SilentlyContinue'
 
                 Should -Invoke -CommandName Test-SqlDscIsLogin -ParameterFilter {
                     $ServerObject.Equals($mockServerObject) -and $Name -eq 'TestPrincipal'
                 } -Exactly -Times 1
 
-                Should -Invoke -CommandName Test-SqlDscIsRole -Exactly -Times 0
+                Should -Invoke -CommandName Test-SqlDscIsRole -ParameterFilter {
+                    $ServerObject.Equals($mockServerObject) -and $Name -eq 'TestPrincipal'
+                } -Exactly -Times 1
             }
         }
     }