Merge remote-tracking branch 'upstream/Dev' into Dev

microsoft · Jan 23, 2024 · df168e1 · df168e1
2 parents 0d4f35b + dce9ea3
commit df168e1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,8 @@
 * EXOActiveSyncDeviceAccessRule
   * Changed the way Identity is determined by using a combination of the
     QueryString and Characteristic parameters.
+* EXOAddressList
+  * Fixed an issue trying to create a new instance when DisplayName is empty.
 * SCAutoSensitivityLabelRule
   * Correct export indentation, which caused an issue with report conversion to JSON.
   FIXES [[#4240](https://github.com/microsoft/Microsoft365DSC/issues/4240)]

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1
@@ -430,10 +430,14 @@ function Set-TargetResource
                 ConditionalCustomAttribute9  = $ConditionalCustomAttribute9
                 ConditionalDepartment        = $ConditionalDepartment
                 ConditionalStateOrProvince   = $ConditionalStateOrProvince
-                DisplayName                  = $DisplayName
                 IncludedRecipients           = $IncludedRecipients
                 Confirm                      = $false
             }
+
+            if (-not [System.String]::IsNullOrEmpty($DisplayName))
+            {
+                $NewAddressListParams.Add('DisplayName', $DisplayName)
+            }
         }
         New-AddressList @NewAddressListParams
     }

diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOAntiPhishRule/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOAntiPhishRule/1-Create.ps1
@@ -12,6 +12,7 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
+    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         EXOAntiPhishRule 'ConfigureAntiPhishRule'
@@ -25,8 +26,7 @@ Configuration Example
             AntiPhishPolicy           = "Our Rule"
             RecipientDomainIs         = $null
             Enabled                   = $True
-            SentToMemberOf            = @("msteams_bb15d4@contoso.onmicrosoft.com")
-            Priority                  = 1
+            SentToMemberOf            = @("executives@$Domain")
             Ensure                    = "Present"
             Credential                = $Credscredential
         }

diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOAntiPhishRule/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOAntiPhishRule/2-Update.ps1
@@ -12,6 +12,7 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
+    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         EXOAntiPhishRule 'ConfigureAntiPhishRule'
@@ -21,12 +22,11 @@ Configuration Example
             ExceptIfSentTo            = $null
             SentTo                    = $null
             ExceptIfRecipientDomainIs = $null
-            Comments                  = $null
+            Comments                  = "This is an updated comment." # Updated Property
             AntiPhishPolicy           = "Our Rule"
             RecipientDomainIs         = $null
             Enabled                   = $True
-            SentToMemberOf            = @("msteams_bb15d4@contoso.onmicrosoft.com")
-            Priority                  = 2 # Updated Property
+            SentToMemberOf            = @("executives@$Domain")
             Ensure                    = "Present"
             Credential                = $Credscredential
         }

diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOCalendarProcessing/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOCalendarProcessing/2-Update.ps1
@@ -13,9 +13,9 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
+    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
-        $Domain = $Credscredential.Username.Split('@')[1]
         EXOCalendarProcessing "CalendarProcessing"
         {
             AddAdditionalResponse                = $False;

diff --git a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Create.Tests.ps1 b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.EXO.Create.Tests.ps1
@@ -91,8 +91,7 @@
                     AntiPhishPolicy           = "Our Rule"
                     RecipientDomainIs         = $null
                     Enabled                   = $True
-                    SentToMemberOf            = @("msteams_bb15d4@contoso.onmicrosoft.com")
-                    Priority                  = 1
+                    SentToMemberOf            = @("executives@$Domain")
                     Ensure                    = "Present"
                     Credential                = $Credscredential
                 }

diff --git a/docs/docs/resources/exchange/EXOAntiPhishRule.md b/docs/docs/resources/exchange/EXOAntiPhishRule.md
@@ -60,6 +60,7 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
+    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         EXOAntiPhishRule 'ConfigureAntiPhishRule'
@@ -73,8 +74,7 @@ Configuration Example
             AntiPhishPolicy           = "Our Rule"
             RecipientDomainIs         = $null
             Enabled                   = $True
-            SentToMemberOf            = @("msteams_bb15d4@contoso.onmicrosoft.com")
-            Priority                  = 1
+            SentToMemberOf            = @("executives@$Domain")
             Ensure                    = "Present"
             Credential                = $Credscredential
         }
@@ -97,6 +97,7 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
+    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
         EXOAntiPhishRule 'ConfigureAntiPhishRule'
@@ -106,12 +107,11 @@ Configuration Example
             ExceptIfSentTo            = $null
             SentTo                    = $null
             ExceptIfRecipientDomainIs = $null
-            Comments                  = $null
+            Comments                  = "This is an updated comment." # Updated Property
             AntiPhishPolicy           = "Our Rule"
             RecipientDomainIs         = $null
             Enabled                   = $True
-            SentToMemberOf            = @("msteams_bb15d4@contoso.onmicrosoft.com")
-            Priority                  = 2 # Updated Property
+            SentToMemberOf            = @("executives@$Domain")
             Ensure                    = "Present"
             Credential                = $Credscredential
         }

diff --git a/docs/docs/resources/exchange/EXOCalendarProcessing.md b/docs/docs/resources/exchange/EXOCalendarProcessing.md
@@ -88,9 +88,9 @@ Configuration Example
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
+    $Domain = $Credscredential.Username.Split('@')[1]
     node localhost
     {
-        $Domain = $Credscredential.Username.Split('@')[1]
         EXOCalendarProcessing "CalendarProcessing"
         {
             AddAdditionalResponse                = $False;