Merge pull request #2958 from NikCharlebois/Fix-#2523

Fix #2523
microsoft · Mar 2, 2023 · 749a557 · 749a557
2 parents 901a464 + 6c18051
commit 749a557
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # UNRELEASED
 
+* EXOManagementRoleAssignment
+  * Added delays before disconnecting from EXO to ensure new permissions are applied.
+    FIXES [#2523](https://github.com/microsoft/Microsoft365DSC/issues/2523)
 * MISC
   * Updated logic for drift detection to be case insensitive.
     FIXES [#2873](https://github.com/microsoft/Microsoft365DSC/issues/2873)

diff --git a/...65DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1 b/...65DSC/DSCResources/MSFT_EXOManagementRoleAssignment/MSFT_EXOManagementRoleAssignment.psm1
@@ -117,7 +117,7 @@ function Get-TargetResource
 
     try
     {
-        $roleAssignment = Get-ManagementRoleAssignment -Identity $Name -ErrorAction Stop
+        $roleAssignment = Get-ManagementRoleAssignment -Identity $Name -ErrorAction SilentlyContinue
 
         if ($null -eq $roleAssignment)
         {
@@ -280,7 +280,6 @@ function Set-TargetResource
         [Switch]
         $ManagedIdentity
     )
-
     Write-Verbose -Message "Setting Management Role Assignment for $Name"
 
     $currentManagementRoleConfig = Get-TargetResource @PSBoundParameters
@@ -327,13 +326,13 @@ function Set-TargetResource
     {
         Write-Verbose -Message "Management Role Assignment'$($Name)' does not exist but it should. Create and configure it."
         # Create Management Role
-        New-ManagementRoleAssignment @NewManagementRoleParams
+        New-ManagementRoleAssignment @NewManagementRoleParams | Out-Null
     }
     # CASE: Management Role exists but it shouldn't;
     elseif ($Ensure -eq 'Absent' -and $currentManagementRoleConfig.Ensure -eq 'Present')
     {
         Write-Verbose -Message "Management Role Assignment'$($Name)' exists but it shouldn't. Remove it."
-        Remove-ManagementRoleAssignment -Identity $Name -Confirm:$false -Force
+        Remove-ManagementRoleAssignment -Identity $Name -Confirm:$false -Force | Out-Null
     }
     # CASE: Management Role exists and it should, but has different values than the desired ones
     elseif ($Ensure -eq 'Present' -and $currentManagementRoleConfig.Ensure -eq 'Present')
@@ -347,26 +346,31 @@ function Set-TargetResource
         $NewManagementRoleParams.Remove('App') | Out-Null
         $NewManagementRoleParams.Remove('Policy') | Out-Null
         $NewManagementRoleParams.Remove('SecurityGroup') | Out-Null
-        Set-ManagementRoleAssignment @NewManagementRoleParams
+        Set-ManagementRoleAssignment @NewManagementRoleParams | Out-Null
     }
 
     # Wait for the permission to be applied
     $testResults = $false
-    $retries = 6
+    $retries = 12
+    $count = 1
     do
     {
         Write-Verbose -Message "Testing to ensure changes were applied."
         $testResults = Test-TargetResource @PSBoundParameters
         if (-not $testResults)
         {
+            Write-Verbose -Message "Test-TargetResource returned $false. Waiting for a total of $(($count * 10).ToString()) out of $(($retries * 10).ToString())"
             Start-Sleep -Seconds 10
         }
         $retries--
+        $count++
     } while (-not $testResults -and $retries -gt 0)
 
     # Need to force reconnect to Exchange for the new permissions to kick in.
     if ($null -ne $Global:MSCloudLoginConnectionProfile.ExchangeOnline)
     {
+        Write-Verbose -Message "Waiting for 20 seconds for new permissions to be effective."
+        Start-Sleep 20
         Write-Verbose -Message "Disconnecting from Exchange Online"
         $Global:MSCloudLoginConnectionProfile.ExchangeOnline.Disconnect()
      }