Merge pull request #455 from SSvilen/addresslistfix

xExchAddressList: Remove creating of scriptblock for RecipientFilter
dsccommunity · May 12, 2020 · 39c1c86 · 39c1c86
2 parents b05ae3e + 8dd8d23
commit 39c1c86
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,8 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
   $env:Temp and reused every time DSC check runs, instead of creating a new
   module every time.
   - Added AD Permissions parameter for xExchReceiveConnector.
+  - xExchAddressList: Removing the scriptblock creation for RecipientFilter
+  property in Get-TargetResource.
   - Adding missing TlsAuthLevel to xExchSendConnector Get-TargetResource function. 
   - Small bug fix in xExchangeHelper module.
 

diff --git a/source/DSCResources/MSFT_xExchAddressList/MSFT_xExchAddressList.psm1 b/source/DSCResources/MSFT_xExchAddressList/MSFT_xExchAddressList.psm1
@@ -114,14 +114,7 @@ function Get-TargetResource
         {
             if ($addressList.$property -and $addressListProperties -contains $property)
             {
-                if ($property -eq 'RecipientFilter')
-                {
-                    $returnValue[$property] = "{$($addressList.$property)}"
-                }
-                else
-                {
-                    $returnValue[$property] = $addressList.$property
-                }
+                $returnValue[$property] = $addressList.$property
             }
         }
     }

diff --git a/tests/Unit/MSFT_xExchAddressList.tests.ps1 b/tests/Unit/MSFT_xExchAddressList.tests.ps1
@@ -90,7 +90,7 @@ try
                 Mock -CommandName Get-AddressList -Verifiable -MockWith { return [PSCustomObject] $getAddressCustomFilterOutput }
 
                 $returnValue = Get-TargetResource @getTargetResourceParams
-                $returnValue['RecipientFilter'] | Should -Be '{(RecipientType -eq "UserMailbox")}'
+                $returnValue['RecipientFilter'] | Should -Be '(RecipientType -eq "UserMailbox")'
             }
 
             Context 'When Addresslist is not present' {