Skip to content

Commit

Permalink
Merge pull request #3631 from levesquesamuel/Dev
Browse files Browse the repository at this point in the history
EXORemoteDomain - Implement a wait/retry mecanism - Fixes #3628
  • Loading branch information
NikCharlebois authored Aug 31, 2023
2 parents 8719955 + 23f715f commit d7fec90
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 1 deletion.
42 changes: 41 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,46 @@
# Change log for Microsoft365DSC

# UNRELEASED
* EXORemoteDomain
* Implemented a wait/retry mecanism between the New-RemoteDomain and Set-RemoteDomain to avoid timeout.
FIXES [#3628](https://github.com/microsoft/Microsoft365DSC/issues/3628)

# 1.23.830.1

* O365SearchAndintelligenceConfigurations
* Removed support for Service Principal Auth, which the cmdlet never supported.
* SPOHomeSite
* Fixes an issue if no home site exists
FIXES [#3577](https://github.com/microsoft/Microsoft365DSC/issues/3577)
* DEPENDENCIES
* Updated Microsoft.Graph to version 2.4.0.
* Updated ReverseDSC to version 2.0.0.18
* MISC
* Fixes an issue with the generic export CIM Instance logic.
FIXES [#3610](https://github.com/microsoft/Microsoft365DSC/issues/3610)

# 1.23.823.1

* AADAuthorizationPolicy
* Fix issue with property PermissionGrantPolicyIdsAssignedToDefaultUserRole
FIXES [#3594](https://github.com/microsoft/Microsoft365DSC/issues/3594)
* AADGroupsSettings
* Add support for enabling sensitivity labels in M365-groups
* EXOSafeAttachmentPolicy
* Deprecated ActionOnError Parameter
FIXES [#3579](https://github.com/microsoft/Microsoft365DSC/issues/3579)
* IntuneEndpointDetectionAndResponsePolicyWindows10
* Initial release
FIXES [#3349](https://github.com/microsoft/Microsoft365DSC/issues/3349)
* O365OrgSettings
* Updated logic of the Get to return null if permissions are not granted for
a given API.
* Updated the list of required permissions.
* DEPENDENCIES
* Updated Microsoft.Graph dependencies to version 2.3.0
* Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.174.

# 1.23.809.1

* AADGroup
* Fixed Get-TargetResource not to use the parameters that should be set, preventing an empty delta on Set-TargetResource
Expand Down Expand Up @@ -3481,4 +3521,4 @@ MISC
* Initial Release
* SPOSite
* Added default value for Storage Quota;
* Fixed an issue with site creation that could result in infinite loops;
* Fixed an issue with site creation that could result in infinite loops;
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,16 @@ function Set-TargetResource
}
New-RemoteDomain -Name $Name -DomainName $DomainName

$tries = 1
$remoteDomain = $null
do
{
Write-Verbose -Message 'Waiting for 10 seconds'
Start-Sleep -Seconds 10
$remoteDomain = Get-RemoteDomain -Identity $Name -ErrorAction SilentlyContinue
$tries++
} until ($null -eq $remoteDomain -or $tries -le 12)

# Configure new remote domain
$RemoteDomainParams.Remove('DomainName') | Out-Null
Set-RemoteDomain @RemoteDomainParams
Expand Down

0 comments on commit d7fec90

Please sign in to comment.