Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed MSFT_AADEntitlementManagementConnectedOrganization: cannot crea… #3739

Merged
merged 2 commits into from
Oct 3, 2023
Merged

Fixed MSFT_AADEntitlementManagementConnectedOrganization: cannot crea… #3739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ee04c3
Fixed MSFT_AADEntitlementManagementConnectedOrganization: cannot crea…
sandrola Oct 3, 2023
1c4a500
Use $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl
sandrola Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# UNRELEASED

* AADEntitlementManagementConnectedOrganization
* Fixed [[#3738](https://github.com/microsoft/Microsoft365DSC/issues/3738)]
* EXOCalendarProcessing
* Initial release.
* DEPENDENCIES
Expand Down
6 changes: 4 additions & 2 deletions ...ntManagementConnectedOrganization/MSFT_AADEntitlementManagementConnectedOrganization.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,10 @@ function Set-TargetResource
$CreateParameters.$key = Convert-M365DSCDRGComplexTypeToHashtable -ComplexObject $CreateParameters.$key
}
}

$newConnectedOrganization = New-MgBetaEntitlementManagementConnectedOrganization -BodyParameter $CreateParameters
$TenantId = $CreateParameters.IdentitySources.ExternalTenantId
$url = $Global:MSCloudLoginConnectionProfile.MicrosoftGraph.ResourceUrl + "beta/tenantRelationships/microsoft.graph.findTenantInformationByTenantId(tenantId='$tenantid')"
$DomainName = (Invoke-MgGraphRequest -Method 'GET' -Uri $url).defaultDomainName
$newConnectedOrganization = New-MgBetaEntitlementManagementConnectedOrganization -Description $CreateParameters.Description -DisplayName $CreateParameters.DisplayName -State $CreateParameters.State -DomainName $DomainName

foreach ($sponsor in $ExternalSponsors)
{
Expand Down
3 changes: 3 additions & 0 deletions ...t/Microsoft365DSC/Microsoft365DSC.AADEntitlementManagementConnectedOrganization.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Mock -CommandName New-M365DSCConnection -MockWith {
return 'Credentials'
}
Mock -CommandName Invoke-MgGraphRequest -MockWith {
return @{}
}

# Mock Write-Host to hide output during the tests
Mock -CommandName Write-Host -MockWith {
Expand Down