Merge pull request #5656 from NikCharlebois/Various-Fixes

Removed dependency on Graph to retrieve user info
microsoft · Jan 22, 2025 · fdfb259 · fdfb259
2 parents 2cd3bfe + 9e0d0c1
commit fdfb259
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,10 @@
     FIXES [#5602](https://github.com/microsoft/Microsoft365DSC/issues/5602)
 * AADServicePrincipal
   * FIXES [#5549](https://github.com/microsoft/Microsoft365DSC/issues/5549)
+* EXOAvailabilityConfig
+  * Removed dependency on Microsoft Graph to retrieve user information.
+* EXODistributionGroup
+  * Removed dependency on Microsoft Graph to retrieve user information.
 * EXOHostedContentFilterPolicy
   * Use correct parameter `DesiredValues` given to `Test-M365DSCParameterState`,
     contrary to `EXOTenantAllowBlockListItems` these resources are not affected

diff --git a/...DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1 b/...DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1
@@ -354,7 +354,6 @@ function Test-TargetResource
 
     Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)"
     Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)"
-
     $testResult = $true
     foreach ($reviewer in $Reviewers)
     {

diff --git a/...DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1 b/...DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1
@@ -235,8 +235,7 @@ function Test-TargetResource
     Write-Verbose -Message "Testing configuration of the Azure AD Authentication Requirement for a user with UPN {$UserPrincipalName}"
 
     $CurrentValues = Get-TargetResource @PSBoundParameters
-    $ValuesToCheck = ([Hashtable]$PSBoundParameters).clone()
-
+    $ValuesToCheck = ([Hashtable]$PSBoundParameters).Clone()
     $testResult = $true
 
     $CurrentValues.remove('Id') | Out-Null

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringProfile/MSFT_AADFilteringProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADFilteringProfile/MSFT_AADFilteringProfile.psm1
@@ -369,7 +369,6 @@ function Test-TargetResource
 
     Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)"
     Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)"
-
     $testResult = $true
 
     #Compare Cim instances

diff --git a/...osoft365DSC/DSCResources/MSFT_AzureVerifiedIdFaceCheck/MSFT_AzureVerifiedIdFaceCheck.psm1 b/...osoft365DSC/DSCResources/MSFT_AzureVerifiedIdFaceCheck/MSFT_AzureVerifiedIdFaceCheck.psm1
@@ -362,6 +362,10 @@ function Export-TargetResource
         $j = 1
         foreach ($resourceGroup in $resourceGroups)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
             $displayedKey = $resourceGroup.ResourceGroupName
             Write-Host "    |---[$j/$($resourceGroups.Length)] $displayedKey" -NoNewline
 

diff --git a/...s/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 b/...s/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1
@@ -58,9 +58,6 @@ function Get-TargetResource
             -InboundParameters $PSBoundParameters
     }
 
-    $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
-        -InboundParameters $PSBoundParameters
-
     #Ensure the proper dependencies are installed in the current environment.
     Confirm-M365DSCDependencies
 
@@ -83,8 +80,8 @@ function Get-TargetResource
 
         if ($null -ne $AvailabilityConfigs -and $null -ne $AvailabilityConfigs.OrgWideAccount)
         {
-            $user = Get-MgUser -UserId $OrgWideAccount -ErrorAction Stop
-            $AvailabilityConfig = ($AvailabilityConfigs | Where-Object -FilterScript { $_.OrgWideAccount -IMatch $user.UserId })
+            $user = Get-User -Identity $OrgWideAccount -ErrorAction Stop
+            $AvailabilityConfig = ($AvailabilityConfigs | Where-Object -FilterScript { $_.OrgWideAccount -IMatch $user.Id })
         }
         if ($null -eq $AvailabilityConfig)
         {

diff --git a/...les/Microsoft365DSC/DSCResources/MSFT_EXODistributionGroup/MSFT_EXODistributionGroup.psm1 b/...les/Microsoft365DSC/DSCResources/MSFT_EXODistributionGroup/MSFT_EXODistributionGroup.psm1
@@ -294,7 +294,7 @@ function Get-TargetResource
             {
                 try
                 {
-                    $user = Get-MgUser -UserId $user -ErrorAction Stop
+                    $user = Get-User -Identity $user -ErrorAction Stop
                     $ManagedByValue += $user.UserPrincipalName
                 }
                 catch
@@ -311,7 +311,7 @@ function Get-TargetResource
             {
                 try
                 {
-                    $user = Get-MgUser -UserId $user -ErrorAction Stop
+                    $user = Get-User -Identity $user -ErrorAction Stop
                     $ModeratedByValue += $user.UserPrincipalName
                 }
                 catch

diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXODistributionGroup.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXODistributionGroup.Tests.ps1
@@ -123,7 +123,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                 }
 
 
-                Mock -CommandName Get-MgUser -MockWith {
+                Mock -CommandName Get-User -MockWith {
                     return @{
                         UserPrincipalName = '[email protected]'
                     }
@@ -189,7 +189,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                     Credential                         = $Credential
                 }
 
-                Mock -CommandName Get-MgUser -MockWith {
+                Mock -CommandName Get-User -MockWith {
                     return @{
                         UserPrincipalName = '[email protected]'
                     }
@@ -250,7 +250,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                     Credential                         = $Credential
                 }
 
-                Mock -CommandName Get-MgUser -MockWith {
+                Mock -CommandName Get-User -MockWith {
                     return @{
                         UserPrincipalName = '[email protected]'
                     }
@@ -301,7 +301,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                     Credential = $Credential
                 }
 
-                Mock -CommandName Get-MgUser -MockWith {
+                Mock -CommandName Get-User -MockWith {
                     return @{
                         UserPrincipalName = '[email protected]'
                     }