Merge pull request #3415 from NikCharlebois/Fix-#3402

FIXES #3402
microsoft · Jun 26, 2023 · fa13d52 · fa13d52
2 parents 5505c22 + 1ccfb9b
commit fa13d52
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,6 @@
 * IntuneDeviceEnrollmentPlatformRestriction
   * Fixes an error where the WindowsMobileRestriction property was still being assessed dispite it being deprecated.
     FIXES [#3407](https://github.com/microsoft/Microsoft365DSC/issues/3407)
-
 * DEPENDENCIES
   * Updated ReverseDSC to version 2.0.0.16.
 

diff --git a/...s/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 b/...s/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1
@@ -74,34 +74,29 @@ function Get-TargetResource
     {
         $AvailabilityConfigs = Get-AvailabilityConfig -ErrorAction Stop
 
-        if ($null -ne $AvailabilityConfigs)
+        if ($null -ne $AvailabilityConfigs -and $null -ne $AvailabilityConfigs.OrgWideAccount)
         {
             $AvailabilityConfig = ($AvailabilityConfigs | Where-Object -FilterScript { $_.OrgWideAccount -IMatch $OrgWideAccount })
         }
-
         if ($null -eq $AvailabilityConfig)
         {
             Write-Verbose -Message "Availability config for $($OrgWideAccount) does not exist."
-
             return $nullReturn
         }
-        else
-        {
-            $result = @{
-                OrgWideAccount        = $AvailabilityConfig.OrgWideAccount
-                Ensure                = 'Present'
-                Credential            = $Credential
-                ApplicationId         = $ApplicationId
-                CertificateThumbprint = $CertificateThumbprint
-                CertificatePath       = $CertificatePath
-                CertificatePassword   = $CertificatePassword
-                Managedidentity       = $ManagedIdentity.IsPresent
-                TenantId              = $TenantId
-            }
-
-            Write-Verbose -Message "Found Availability Config for $($OrgWideAccount)"
-            return $result
+        $result = @{
+            OrgWideAccount        = $AvailabilityConfig.OrgWideAccount
+            Ensure                = 'Present'
+            Credential            = $Credential
+            ApplicationId         = $ApplicationId
+            CertificateThumbprint = $CertificateThumbprint
+            CertificatePath       = $CertificatePath
+            CertificatePassword   = $CertificatePassword
+            Managedidentity       = $ManagedIdentity.IsPresent
+            TenantId              = $TenantId
         }
+
+        Write-Verbose -Message "Found Availability Config for $($OrgWideAccount)"
+        return $result
     }
     catch
     {
@@ -348,8 +343,13 @@ function Export-TargetResource
             return ''
         }
 
+        $OrgWideValue = "NotConfigured"
+        if ($null -ne $AvailabilityConfig.OrgWideAccount)
+        {
+            $OrgWideValue = $AvailabilityConfig.OrgWideAccount.ToString()
+        }
         $Params = @{
-            OrgWideAccount        = $AvailabilityConfig.OrgWideAccount.ToString()
+            OrgWideAccount        = $OrgWideValue
             Credential            = $Credential
             ApplicationId         = $ApplicationId
             TenantId              = $TenantId