diff --git a/CHANGELOG.md b/CHANGELOG.md index 2163ff3677..8174d26263 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SqlDatabase - Fixed logic in `Set-SqlDscDatabaseProperty` so pipeline input is properly handled in the cmdlet's `Process` block. ([issue #2456](https://github.com/dsccommunity/SqlServerDsc/issues/2456)) +- SqlRole + - Fix if statements checking the parameters are present. ([issue #1702](https://github.com/dsccommunity/SqlServerDsc/issues/1702)) ### Changed diff --git a/source/DSCResources/DSC_SqlRole/DSC_SqlRole.psm1 b/source/DSCResources/DSC_SqlRole/DSC_SqlRole.psm1 index 36ae7b302f..afa74e579b 100644 --- a/source/DSCResources/DSC_SqlRole/DSC_SqlRole.psm1 +++ b/source/DSCResources/DSC_SqlRole/DSC_SqlRole.psm1 @@ -57,8 +57,7 @@ function Get-TargetResource if ($sqlServerObject) { Write-Verbose -Message ( - $script:localizedData.GetProperties ` - -f $ServerRoleName + $script:localizedData.GetProperties -f $ServerRoleName ) if ($sqlServerRoleObject = $sqlServerObject.Roles[$ServerRoleName]) @@ -84,8 +83,8 @@ function Get-TargetResource ServerName = $ServerName InstanceName = $InstanceName Members = $membersInRole - MembersToInclude = $null - MembersToExclude = $null + MembersToInclude = @() + MembersToExclude = @() } } @@ -237,7 +236,7 @@ function Set-TargetResource $correctedParameters = Get-CorrectedMemberParameters @originalParameters - if ($Members) + if ($PSBoundParameters.ContainsKey('Members')) { $memberNamesInRoleObject = $sqlServerObject.Roles[$ServerRoleName].EnumMemberNames() @@ -263,7 +262,7 @@ function Set-TargetResource } else { - if ($MembersToInclude) + if ($PSBoundParameters.ContainsKey('MembersToInclude')) { $memberNamesInRoleObject = $sqlServerObject.Roles[$ServerRoleName].EnumMemberNames() @@ -278,7 +277,7 @@ function Set-TargetResource } } - if ($MembersToExclude) + if ($PSBoundParameters.ContainsKey('MembersToExclude')) { $memberNamesInRoleObject = $sqlServerObject.Roles[$ServerRoleName].EnumMemberNames() @@ -428,9 +427,9 @@ function Test-TargetResource } else { - if ($Members) + if ($PSBoundParameters.ContainsKey('Members')) { - if ( $null -ne (Compare-Object -ReferenceObject $getTargetResourceResult.Members -DifferenceObject $correctedParameters.Members)) + if ($null -ne (Compare-Object -ReferenceObject $getTargetResourceResult.Members -DifferenceObject $correctedParameters.Members)) { Write-Verbose -Message ( $script:localizedData.DesiredMembersNotPresent ` @@ -442,7 +441,7 @@ function Test-TargetResource } else { - if ($MembersToInclude) + if ($PSBoundParameters.ContainsKey('MembersToInclude')) { foreach ($memberToInclude in $correctedParameters.MembersToInclude) { @@ -458,7 +457,7 @@ function Test-TargetResource } } - if ($MembersToExclude) + if ($PSBoundParameters.ContainsKey('MembersToExclude')) { foreach ($memberToExclude in $correctedParameters.MembersToExclude) {