Merge pull request #339 from NikCharlebois/FixIssue312

Fix Issue 312
microsoft · Jan 22, 2020 · e6e9da5 · e6e9da5
2 parents 1d2febe + a58bc92
commit e6e9da5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## UNRELEASED
 
+* EXOAcceptedDomain
+  * Fixed an issue where the domains were not properly extracted
+    if multiple domain matches a similar pattern;
 * EXOHostedOutboundSpamFilterPolicy
   * Fixed an error where the resource was not being extracted via
     the Graphical User Interface;

diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 b/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1
@@ -47,7 +47,7 @@ function Get-TargetResource
 
     $AllAcceptedDomains = Get-AcceptedDomain
 
-    $AcceptedDomain = ($AllAcceptedDomains | Where-Object -FilterScript { $_.Identity -IMatch $Identity })
+    $AcceptedDomain = $AllAcceptedDomains | Where-Object -FilterScript { $_.Identity -eq $Identity }
 
     if ($null -eq $AcceptedDomain)
     {

diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 b/Modules/Office365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1
@@ -665,6 +665,7 @@ function Export-TargetResource
         [System.Management.Automation.PSCredential]
         $GlobalAdminAccount
     )
+    $InformationPreference = 'Continue'
     #region Telemetry
     $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new()
     $data.Add("Resource", $MyInvocation.MyCommand.ModuleName)

diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAcceptedDomain.Tests.ps1 b/Tests/Unit/Office365DSC/Office365DSC.EXOAcceptedDomain.Tests.ps1
@@ -81,8 +81,8 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                 Set-TargetResource @testParams
             }
 
-            It "Should return Present from the Get method" {
-                (Get-TargetResource @testParams).Ensure | Should Be "Present"
+            It "Should return Absent from the Get method" {
+                (Get-TargetResource @testParams).Ensure | Should Be "Absent"
             }
         }