Merge pull request #4266 from NikCharlebois/EXOIntegration

Updated Integration Tests for EXO
microsoft · Jan 30, 2024 · 8f614c0 · 8f614c0
2 parents 6c61af4 + 3986ef8
commit 8f614c0
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 # UNRELEASED
 
+* EXOHostedContentFilterRule
+  * Changed logic to retrieve the Rules by name. Using the Policy's name instead.
 * TeamsEmergencyCallRoutingPolicy
   * Fix deletion of resource
     FIXES [#4261](https://github.com/microsoft/Microsoft365DSC/issues/4261)

diff --git a/...CResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 b/...CResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1
@@ -96,7 +96,7 @@ function Get-TargetResource
 
         try
         {
-            $HostedConnectionFilterPolicys = Get-HostedConnectionFilterPolicy -ErrorAction Stop
+            $HostedConnectionFilterPolicy = Get-HostedConnectionFilterPolicy -Identity $Identity -ErrorAction Stop
         }
         catch
         {
@@ -107,10 +107,9 @@ function Get-TargetResource
             return $nullReturn
         }
 
-        $HostedConnectionFilterPolicy = $HostedConnectionFilterPolicys | Where-Object -FilterScript { $_. Identity -eq $Identity }
         if (-not $HostedConnectionFilterPolicy)
         {
-            Write-Verbose -Message "HostedConnectionFilterPolicy $($Identity) does not exist."
+            Write-Verbose -Message "HostedConnectionFilterPolicy [$($Identity)] does not exist."
             return $nullReturn
         }
         else
@@ -234,9 +233,7 @@ function Set-TargetResource
     $ConnectionMode = New-M365DSCConnection -Workload 'ExchangeOnline' `
         -InboundParameters $PSBoundParameters
 
-    $HostedConnectionFilterPolicys = Get-HostedConnectionFilterPolicy
-
-    $HostedConnectionFilterPolicy = $HostedConnectionFilterPolicys | Where-Object -FilterScript { $_.Identity -eq $Identity }
+    $CurrentInstance = Get-TargetResource @PSBoundParameters
 
     $HostedConnectionFilterPolicyParams = [System.Collections.Hashtable]($PSBoundParameters)
     $HostedConnectionFilterPolicyParams.Remove('Ensure') | Out-Null
@@ -257,22 +254,26 @@ function Set-TargetResource
         $HostedConnectionFilterPolicyParams.Remove('RuleScope') | Out-Null
     }
 
-    if (('Present' -eq $Ensure ) -and ($null -eq $HostedConnectionFilterPolicy))
+    if (('Present' -eq $Ensure ) -and $CurrentInstance.Ensure -eq 'Absent')
     {
         $HostedConnectionFilterPolicyParams += @{
             Name = $HostedConnectionFilterPolicyParams.Identity
         }
         $HostedConnectionFilterPolicyParams.Remove('Identity') | Out-Null
         if ($PSBoundParameters.MakeDefault)
         {
+            Write-Verbose -Message "Creating New Default Policy {$Identity}"
             New-HostedConnectionFilterPolicy @HostedConnectionFilterPolicyParams -MakeDefault
         }
         else
         {
+            Write-Verbose -Message "Creating New Policy {$Identity}"
             New-HostedConnectionFilterPolicy @HostedConnectionFilterPolicyParams
         }
+
+        Write-Verbose -Message "With Parameters: $(Convert-M365DscHashtableToString -Hashtable $HostedConnectionFilterPolicyParams)"
     }
-    elseif (('Present' -eq $Ensure ) -and ($HostedConnectionFilterPolicy))
+    elseif (('Present' -eq $Ensure ) -and $CurrentInstance.Ensure -eq 'Present')
     {
         if ($PSBoundParameters.MakeDefault)
         {
@@ -283,9 +284,9 @@ function Set-TargetResource
             Set-HostedConnectionFilterPolicy @HostedConnectionFilterPolicyParams -Confirm:$false
         }
     }
-    elseif (('Absent' -eq $Ensure ) -and ($HostedConnectionFilterPolicy))
+    elseif (('Absent' -eq $Ensure ) -and $CurrentInstance.Ensure -eq 'Present')
     {
-        Write-Verbose -Message "Removing HostedConnectionFilterPolicy $($Identity) "
+        Write-Verbose -Message "Removing HostedConnectionFilterPolicy $($Identity)"
         Remove-HostedConnectionFilterPolicy -Identity $Identity -Confirm:$false
     }
 }

diff --git a/...t365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 b/...t365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1
@@ -114,7 +114,7 @@ function Get-TargetResource
     {
         try
         {
-            $HostedContentFilterRules = Get-HostedContentFilterRule -ErrorAction Stop
+            $HostedContentFilterRule = Get-HostedContentFilterRule -Identity $HostedContentFilterPolicy -ErrorAction Stop
         }
         catch
         {
@@ -123,8 +123,6 @@ function Get-TargetResource
                 -Exception $_ `
                 -Source $MyInvocation.MyCommand.ModuleName
         }
-
-        $HostedContentFilterRule = $HostedContentFilterRules | Where-Object -FilterScript { $_.Identity -eq $Identity }
         if (-not $HostedContentFilterRule)
         {
             Write-Verbose -Message "HostedContentFilterRule $($Identity) does not exist."
@@ -316,6 +314,7 @@ function Set-TargetResource
             Remove-HostedContentFilterRule -Identity $Identity -Confirm:$false
         }
         Write-Verbose -Message "Creating new HostedContentFilterRule {$Identity}"
+        Write-Verbose -Message "With Parameters: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)"
         $CreationParams.Add('Name', $Identity)
         $CreationParams.Remove('Identity') | Out-Null
         New-HostedContentFilterRule @CreationParams
@@ -332,6 +331,7 @@ function Set-TargetResource
         $UpdateParams.Remove('CertificatePassword') | Out-Null
         $UpdateParams.Remove('ManagedIdentity') | Out-Null
         $UpdateParams.Remove('Enabled') | Out-Null
+        $UpdateParams.Identity = $HostedContentFilterPolicy
         if ($CurrentValues.HostedContentFilterPolicy -eq $UpdateParams.HostedContentFilterPolicy )
         {
             $UpdateParams.Remove('HostedContentFilterPolicy') | Out-Null
@@ -456,6 +456,7 @@ function Test-TargetResource
     $ValuesToCheck.Remove('CertificatePath') | Out-Null
     $ValuesToCheck.Remove('CertificatePassword') | Out-Null
     $ValuesToCheck.Remove('ManagedIdentity') | Out-Null
+    $ValuesToCheck.Remove('Identity') | Out-Null
 
     $TestResult = Test-M365DSCParameterState -CurrentValues $CurrentValues `
         -Source $($MyInvocation.MyCommand.Source) `

diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOHostedConnectionFilterPolicy/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOHostedConnectionFilterPolicy/1-Create.ps1
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOHostedConnectionFilterPolicy/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOHostedConnectionFilterPolicy/2-Update.ps1
@@ -16,12 +16,12 @@ Configuration Example
     {
         EXOHostedConnectionFilterPolicy 'ConfigureHostedConnectionFilterPolicy'
         {
-            Identity         = "Integration Policy"
+            Identity         = "Default"
             AdminDisplayName = ""
             EnableSafeList   = $True # Updated Property
             IPAllowList      = @()
             IPBlockList      = @()
-            MakeDefault      = $False
+            MakeDefault      = $True
             Ensure           = "Present"
             Credential       = $Credscredential
         }

diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOHostedConnectionFilterPolicy/3-Remove.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOHostedConnectionFilterPolicy/3-Remove.ps1
diff --git a/Modules/Microsoft365DSC/Examples/Resources/EXOOnPremisesOrganization/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOOnPremisesOrganization/1-Create.ps1
@@ -27,7 +27,25 @@ Configuration Example
             OutboundConnector = 'Contoso Outbound Connector'
             Ensure            = 'Present'
             Credential        = $Credscredential
-            DependsOn         = "[EXOOutboundConnector]ConfigureOutboundConnector"
+            DependsOn         = "[EXOOutboundConnector]OutboundDependency"
+        }
+        EXOOutboundConnector 'OutboundDependency'
+        {
+            Identity                      = "Contoso Outbound Connector"
+            AllAcceptedDomains            = $False
+            CloudServicesMailEnabled      = $False
+            Comment                       = "Outbound connector to Contoso"
+            ConnectorSource               = "Default"
+            ConnectorType                 = "Partner"
+            Enabled                       = $True
+            IsTransportRuleScoped         = $False
+            RecipientDomains              = "contoso.com"
+            RouteAllMessagesViaOnPremises = $False
+            TlsDomain                     = "*.contoso.com"
+            TlsSettings                   = "DomainValidation"
+            UseMxRecord                   = $True
+            Ensure                        = "Present"
+            Credential                    = $Credscredential
         }
     }
 }