Skip to content

Bug fix: Type fixes for beta commands - Issue #1164 #1175

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

Merged
merged 8 commits into from
Oct 29, 2024
Merged

Bug fix: Type fixes for beta commands - Issue #1164 #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f87b97a
Add-EntraBetaScopedRoleMembership type fix
SteveMutungi254 Oct 28, 2024
c778fc6
Changing open type to [Microsoft.Open.MSGraph.Model.MsRoleMemberInfo]
SteveMutungi254 Oct 28, 2024
11eb44e
Adding MsRoleMemberInfo type
SteveMutungi254 Oct 28, 2024
d0bc35c
Replacing ObjectId with Id
SteveMutungi254 Oct 28, 2024
4109705
Adding missing declaration
SteveMutungi254 Oct 28, 2024
5c8c043
Remove variable based on reviewer comments
SteveMutungi254 Oct 29, 2024
8ee990d
Fix build error for missing type - Microsoft.Open.MSGraph.Model.MsRol…
SteveMutungi254 Oct 29, 2024
059ddf7
Fixing build error - ObjectId as the course
SteveMutungi254 Oct 29, 2024
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
5 changes: 2 additions & 3 deletions module/EntraBeta/customizations/Add-EntraBetaScopedRoleMembership.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
[Parameter(ParameterSetName = "InvokeByDynamicParameters")]
[System.String] $AdministrativeUnitObjectId,
[Parameter(ParameterSetName = "InvokeByDynamicParameters")]
[Microsoft.Open.AzureAD.Model.RoleMemberInfo] $RoleMemberInfo,
[Microsoft.Open.MSGraph.Model.MsRoleMemberInfo] $RoleMemberInfo,
[Alias('ObjectId')]
[Parameter(Mandatory = $true, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
[System.String] $AdministrativeUnitId
)
PROCESS {
$params = @{}
$customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand

if($null -ne $PSBoundParameters["ErrorAction"])
{
$params["ErrorAction"] = $PSBoundParameters["ErrorAction"]
Expand Down Expand Up @@ -75,7 +74,7 @@
{
$TmpValue = $PSBoundParameters["RoleMemberInfo"]
$Value = @{
id = ($TmpValue).ObjectId
id = ($TmpValue).Id
} | ConvertTo-Json
$params["RoleMemberInfo"] = $Value
}
Expand Down
3 changes: 3 additions & 0 deletions module/EntraBeta/customizations/Types.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,8 @@
public System.String Origin;
public System.String Value;
"@
"Microsoft.Open.MSGraph.Model.MsRoleMemberInfo"=@"
public System.String Id;
"@
}

17 changes: 6 additions & 11 deletions ...powershell-beta/Microsoft.Graph.Entra.Beta/Add-EntraBetaScopedRoleMembership.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,12 @@ For delegated scenarios, the calling user needs at least the Privileged Role Adm

```powershell
Connect-Entra -Scopes 'RoleManagement.ReadWrite.Directory'
$User = Get-EntraBetaUser -SearchString 'MarkWood'
$Role = Get-EntraBetaDirectoryRole -Filter "DisplayName eq '<directory-role-display-name>'"
$Unit = Get-EntraBetaAdministrativeUnit -Filter "DisplayName eq '<administrativeunit-display-name>'"
$RoleMember = New-Object -TypeName Microsoft.Open.AzureAD.Model.RoleMemberInfo
$RoleMember.ObjectId = $User.ObjectId
$params = @{
AdministrativeUnitId = $Unit.ObjectId
RoleObjectId = $Role.ObjectId
RoleMemberInfo = $RoleMember
}
Add-EntraBetaScopedRoleMembership @params
$user = Get-EntraBetaUser -UserId 'SawyerM@contoso.com'
$role = Get-EntraBetaDirectoryRole -Filter "DisplayName eq 'Helpdesk Administrator'"
$administrativeUnit = Get-EntraBetaAdministrativeUnit -Filter "DisplayName eq 'Pacific Administrative Unit'"
$roleMember = New-Object -TypeName Microsoft.Open.MSGraph.Model.MsRoleMemberInfo
$roleMember.Id = $user.Id
Add-EntraBetaScopedRoleMembership -AdministrativeUnitId $administrativeUnit.Id -RoleObjectId $role.Id -RoleMemberInfo $roleMember
```

```Output
Expand Down
20 changes: 10 additions & 10 deletions test/module/EntraBeta/Add-EntraBetaScopedRoleMembership.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ BeforeAll {
Describe "Add-EntraBetaScopedRoleMembership" {
Context "Test for Add-EntraBetaScopedRoleMembership" {
It "Should add a user to the specified role within the specified administrative unit" {
$RoleMember = New-Object -TypeName Microsoft.Open.AzureAD.Model.RoleMemberInfo
$RoleMember.ObjectId = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$RoleMember = New-Object -TypeName Microsoft.Open.MSGraph.Model.MsRoleMemberInfo
$RoleMember.Id = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$result = Add-EntraBetaScopedRoleMembership -AdministrativeUnitId "0e3840ee-40b6-4b72-827b-c06e1f59d2be" -RoleObjectId "135c35cd-85c2-4543-b86c-8f6dbedea4cf" -RoleMemberInfo $RoleMember
$result | Should -Not -BeNullOrEmpty
$result.Id | Should -Be "zTVcE8KFQ0W4bI9tvt6kz-5AOA62QHJLgnvAbh9Z0r7uQTWi6U_yTLYoEC66749-U"
Expand All @@ -42,8 +42,8 @@ Describe "Add-EntraBetaScopedRoleMembership" {
Should -Invoke -CommandName New-MgBetaDirectoryAdministrativeUnitScopedRoleMember -ModuleName Microsoft.Graph.Entra.Beta -Times 1
}
It "Should add a user to the specified role within the specified administrative unit with alias" {
$RoleMember = New-Object -TypeName Microsoft.Open.AzureAD.Model.RoleMemberInfo
$RoleMember.ObjectId = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$RoleMember = New-Object -TypeName Microsoft.Open.MSGraph.Model.MsRoleMemberInfo
$RoleMember.Id = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$result = Add-EntraBetaScopedRoleMembership -ObjectId "0e3840ee-40b6-4b72-827b-c06e1f59d2be" -RoleObjectId "135c35cd-85c2-4543-b86c-8f6dbedea4cf" -RoleMemberInfo $RoleMember
$result | Should -Not -BeNullOrEmpty
$result.Id | Should -Be "zTVcE8KFQ0W4bI9tvt6kz-5AOA62QHJLgnvAbh9Z0r7uQTWi6U_yTLYoEC66749-U"
Expand Down Expand Up @@ -71,8 +71,8 @@ Describe "Add-EntraBetaScopedRoleMembership" {
{ Add-EntraBetaScopedRoleMembership -AdministrativeUnitId "0e3840ee-40b6-4b72-827b-c06e1f59d2be" -RoleMemberInfo "" } | Should -Throw "Cannot process argument transformation on parameter 'RoleMemberInfo'*"
}
It "Result should contain Alias properties"{
$RoleMember = New-Object -TypeName Microsoft.Open.AzureAD.Model.RoleMemberInfo
$RoleMember.ObjectId = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$RoleMember = New-Object -TypeName Microsoft.Open.MSGraph.Model.MsRoleMemberInfo
$RoleMember.Id = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$result = Add-EntraBetaScopedRoleMembership -AdministrativeUnitId "0e3840ee-40b6-4b72-827b-c06e1f59d2be" -RoleObjectId "135c35cd-85c2-4543-b86c-8f6dbedea4cf" -RoleMemberInfo $RoleMember
$result.ObjectId | should -Be "zTVcE8KFQ0W4bI9tvt6kz-5AOA62QHJLgnvAbh9Z0r7uQTWi6U_yTLYoEC66749-U"
$result.RoleObjectId | should -Be "cccccccc-85c2-4543-b86c-cccccccccccc"
Expand All @@ -91,8 +91,8 @@ Describe "Add-EntraBetaScopedRoleMembership" {
$params.AdministrativeUnitId1 | Should -Be "0e3840ee-40b6-4b72-827b-c06e1f59d2be"
}
It "Should contain RoleId in parameters when passed RoleObjectId to it" {
$RoleMember = New-Object -TypeName Microsoft.Open.AzureAD.Model.RoleMemberInfo
$RoleMember.ObjectId = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$RoleMember = New-Object -TypeName Microsoft.Open.MSGraph.Model.MsRoleMemberInfo
$RoleMember.Id = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"

$result = Add-EntraBetaScopedRoleMembership -AdministrativeUnitId "0e3840ee-40b6-4b72-827b-c06e1f59d2be" -RoleObjectId "135c35cd-85c2-4543-b86c-8f6dbedea4cf" -RoleMemberInfo $RoleMember
$params = Get-Parameters -data $result.Parameters
Expand All @@ -101,8 +101,8 @@ Describe "Add-EntraBetaScopedRoleMembership" {
It "Should contain 'User-Agent' header" {
$userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion Add-EntraBetaScopedRoleMembership"
$userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion Add-EntraBetaScopedRoleMembership"
$RoleMember = New-Object -TypeName Microsoft.Open.AzureAD.Model.RoleMemberInfo
$RoleMember.ObjectId = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"
$RoleMember = New-Object -TypeName Microsoft.Open.MSGraph.Model.MsRoleMemberInfo
$RoleMember.Id = "a23541ee-4fe9-4cf2-b628-102ebaef8f7e"

Add-EntraBetaScopedRoleMembership -AdministrativeUnitId "0e3840ee-40b6-4b72-827b-c06e1f59d2be" -RoleObjectId "135c35cd-85c2-4543-b86c-8f6dbedea4cf" -RoleMemberInfo $RoleMember

Expand Down