Updated ServicePrincipalAppRole customizations (#1161) (#1162)

alflokken · web-flow · commit ab529e048a3c · 2024-10-31T14:41:44.000+03:00
diff --git a/module/Entra/customizations/Get-EntraServicePrincipalAppRoleAssignedTo.ps1 b/module/Entra/customizations/Get-EntraServicePrincipalAppRoleAssignedTo.ps1
@@ -3,7 +3,7 @@
 # ------------------------------------------------------------------------------
 @{
     SourceName = "Get-AzureADServiceAppRoleAssignedTo"
-    TargetName = "Get-MgServicePrincipalAppRoleAssignment"
+    TargetName = "Get-MgServicePrincipalAppRoleAssignedTo"
     Parameters =  @(
         @{
             SourceName = "ObjectId"
diff --git a/module/Entra/customizations/Get-EntraServicePrincipalAppRoleAssignment.ps1 b/module/Entra/customizations/Get-EntraServicePrincipalAppRoleAssignment.ps1
@@ -3,7 +3,7 @@
 # ------------------------------------------------------------------------------
 @{
     SourceName = "Get-AzureADServiceAppRoleAssignment"
-    TargetName = "Get-MgServicePrincipalAppRoleAssignedTo"
+    TargetName = "Get-MgServicePrincipalAppRoleAssignment"
     Parameters = @(
         @{
             SourceName = "ObjectId"
diff --git a/module/EntraBeta/customizations/Get-EntraBetaServicePrincipalAppRoleAssignedTo.ps1 b/module/EntraBeta/customizations/Get-EntraBetaServicePrincipalAppRoleAssignedTo.ps1
@@ -3,7 +3,7 @@
 # ------------------------------------------------------------------------------
 @{
     SourceName = "Get-AzureADServiceAppRoleAssignedTo"
-    TargetName = "Get-MgBetaServicePrincipalAppRoleAssignment"
+    TargetName = "Get-MgBetaServicePrincipalAppRoleAssignedTo"
     Parameters =  @(
         @{
             SourceName = "ObjectId"
diff --git a/module/EntraBeta/customizations/Get-EntraBetaServicePrincipalAppRoleAssignment.ps1 b/module/EntraBeta/customizations/Get-EntraBetaServicePrincipalAppRoleAssignment.ps1
@@ -3,7 +3,7 @@
 # ------------------------------------------------------------------------------
 @{
     SourceName = "Get-AzureADServiceAppRoleAssignment"
-    TargetName = "Get-MgBetaServicePrincipalAppRoleAssignedTo"
+    TargetName = "Get-MgBetaServicePrincipalAppRoleAssignment"
     Parameters = @(
         @{
             SourceName = "ObjectId"
diff --git a/test/module/Entra/Get-EntraServicePrincipalAppRoleAssignedTo.Tests.ps1 b/test/module/Entra/Get-EntraServicePrincipalAppRoleAssignedTo.Tests.ps1
@@ -23,7 +23,7 @@ BeforeAll {
         )
     }
 
-    Mock -CommandName Get-MgServicePrincipalAppRoleAssignment -MockWith $scriptblock -ModuleName Microsoft.Graph.Entra
+    Mock -CommandName Get-MgServicePrincipalAppRoleAssignedTo -MockWith $scriptblock -ModuleName Microsoft.Graph.Entra
 }
   
 Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {
@@ -33,14 +33,14 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {
             $result | Should -Not -BeNullOrEmpty
             $result.PrincipalId | should -Be '4d8fcb23-adc7-4d47-9328-2420eb1075ef'
 
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
         }
         It "Should execute successfully with Alias" {
             $result =  Get-EntraServicePrincipalAppRoleAssignedTo -ObjectId  "4d8fcb23-adc7-4d47-9328-2420eb1075ef"
             $result | Should -Not -BeNullOrEmpty
             $result.PrincipalId | should -Be '4d8fcb23-adc7-4d47-9328-2420eb1075ef'
 
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
         }
         It "Should fail when ServicePrincipalId is empty" {
             { Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId } | Should -Throw "Missing an argument for parameter 'ServicePrincipalId'.*" 
@@ -52,13 +52,13 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {
             $result = Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef" -All 
             $result | Should -Not -BeNullOrEmpty            
             
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
         }                
         It "Should return top  app role assignments " {
             $result =  Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef" -top 1
             $result | Should -Not -BeNullOrEmpty
 
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
         }
         It "Should fail when Top is empty" {
                 { Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef" -Top } | Should -Throw "Missing an argument for parameter 'Top'*"
@@ -71,7 +71,7 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {
             $result.ObjectID | should -Be "I8uPTcetR02TKCQg6xB170ZWgaqJluBEqPHHxTxJ9Hs"
         } 
         It "Should contain ServicePrincipalId in parameters when passed ServicePrincipalId to it" {
-            Mock -CommandName Get-MgServicePrincipalAppRoleAssignment -MockWith {$args} -ModuleName Microsoft.Graph.Entra
+            Mock -CommandName Get-MgServicePrincipalAppRoleAssignedTo -MockWith {$args} -ModuleName Microsoft.Graph.Entra
 
             $result = Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef"
             $params = Get-Parameters -data $result
@@ -83,7 +83,7 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {
             $result= Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef"
             $result | Should -Not -BeNullOrEmpty
             $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion Get-EntraServicePrincipalAppRoleAssignedTo"
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment -ModuleName Microsoft.Graph.Entra -Times 1 -ParameterFilter {
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo -ModuleName Microsoft.Graph.Entra -Times 1 -ParameterFilter {
                 $Headers.'User-Agent' | Should -Be $userAgentHeaderValue
                 $true
             }
diff --git a/test/module/Entra/Get-EntraServicePrincipalAppRoleAssignment.Tests.ps1 b/test/module/Entra/Get-EntraServicePrincipalAppRoleAssignment.Tests.ps1
@@ -23,7 +23,7 @@ BeforeAll {
         )
     }
 
-    Mock -CommandName Get-MgServicePrincipalAppRoleAssignedTo -MockWith $scriptblock -ModuleName Microsoft.Graph.Entra
+    Mock -CommandName Get-MgServicePrincipalAppRoleAssignment -MockWith $scriptblock -ModuleName Microsoft.Graph.Entra
 }
   
 Describe "Get-EntraServiceAppRoleAssigned" {
@@ -33,14 +33,14 @@ Describe "Get-EntraServiceAppRoleAssigned" {
             $result | Should -Not -BeNullOrEmpty
             $result.ResourceId | should -Be '021510b7-e753-40aa-b668-29753295ca34'
 
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
         }
         It "Should execute successfully with Alias" {
             $result =  Get-EntraServicePrincipalAppRoleAssignment -ObjectId "021510b7-e753-40aa-b668-29753295ca34"
             $result | Should -Not -BeNullOrEmpty
             $result.ResourceId | should -Be '021510b7-e753-40aa-b668-29753295ca34'
 
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
         }
         It "Should fail when ServicePrincipalId is empty" {
             { Get-EntraServicePrincipalAppRoleAssignment -ServicePrincipalId } | Should -Throw "Missing an argument for parameter 'ServicePrincipalId'.*" 
@@ -52,14 +52,14 @@ Describe "Get-EntraServiceAppRoleAssigned" {
             $result = Get-EntraServicePrincipalAppRoleAssignment -ServicePrincipalId "021510b7-e753-40aa-b668-29753295ca34" -All 
             $result | Should -Not -BeNullOrEmpty            
             
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
         }
                    
         It "Should return top service principal application role assignment." {
             $result =  Get-EntraServicePrincipalAppRoleAssignment -ServicePrincipalId "021510b7-e753-40aa-b668-29753295ca34" -top 1
             $result | Should -Not -BeNullOrEmpty
 
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo  -ModuleName Microsoft.Graph.Entra -Times 1
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment  -ModuleName Microsoft.Graph.Entra -Times 1
         }
         It "Should fail when Top is empty" {
                 { Get-EntraServicePrincipalAppRoleAssignment -ServicePrincipalId "021510b7-e753-40aa-b668-29753295ca34" -Top } | Should -Throw "Missing an argument for parameter 'Top'*"
@@ -72,7 +72,7 @@ Describe "Get-EntraServiceAppRoleAssigned" {
             $result.ObjectId | should -Be "qjltmaz9l02qPcgftHNirITXiOnmHR5GmW_oEXl_ZL8"
         } 
         It "Should contain ServicePrincipalId in parameters when passed ObjectId to it" {
-            Mock -CommandName Get-MgServicePrincipalAppRoleAssignedTo -MockWith {$args} -ModuleName Microsoft.Graph.Entra
+            Mock -CommandName Get-MgServicePrincipalAppRoleAssignment -MockWith {$args} -ModuleName Microsoft.Graph.Entra
 
             $result = Get-EntraServicePrincipalAppRoleAssignment -ServicePrincipalId "021510b7-e753-40aa-b668-29753295ca34"
             $params = Get-Parameters -data $result
@@ -84,7 +84,7 @@ Describe "Get-EntraServiceAppRoleAssigned" {
             $result = Get-EntraServicePrincipalAppRoleAssignment -ServicePrincipalId "021510b7-e753-40aa-b668-29753295ca34"
             $result | Should -Not -BeNullOrEmpty
             $userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion Get-EntraServicePrincipalAppRoleAssignment"
-            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo -ModuleName Microsoft.Graph.Entra -Times 1 -ParameterFilter {
+            Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment -ModuleName Microsoft.Graph.Entra -Times 1 -ParameterFilter {
                 $Headers.'User-Agent' | Should -Be $userAgentHeaderValue
                 $true
            }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ BeforeAll {`
`23`	`23`	`)`
`24`	`24`	`}`
`25`	`25`
`26`		`- Mock -CommandName Get-MgServicePrincipalAppRoleAssignment -MockWith $scriptblock -ModuleName Microsoft.Graph.Entra`
	`26`	`+ Mock -CommandName Get-MgServicePrincipalAppRoleAssignedTo -MockWith $scriptblock -ModuleName Microsoft.Graph.Entra`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {`
`@@ -33,14 +33,14 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {`
`33`	`33`	`$result \| Should -Not -BeNullOrEmpty`
`34`	`34`	`$result.PrincipalId \| should -Be '4d8fcb23-adc7-4d47-9328-2420eb1075ef'`
`35`	`35`
`36`		`- Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment -ModuleName Microsoft.Graph.Entra -Times 1`
	`36`	`+ Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo -ModuleName Microsoft.Graph.Entra -Times 1`
`37`	`37`	`}`
`38`	`38`	`It "Should execute successfully with Alias" {`
`39`	`39`	`$result = Get-EntraServicePrincipalAppRoleAssignedTo -ObjectId "4d8fcb23-adc7-4d47-9328-2420eb1075ef"`
`40`	`40`	`$result \| Should -Not -BeNullOrEmpty`
`41`	`41`	`$result.PrincipalId \| should -Be '4d8fcb23-adc7-4d47-9328-2420eb1075ef'`
`42`	`42`
`43`		`- Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment -ModuleName Microsoft.Graph.Entra -Times 1`
	`43`	`+ Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo -ModuleName Microsoft.Graph.Entra -Times 1`
`44`	`44`	`}`
`45`	`45`	`It "Should fail when ServicePrincipalId is empty" {`
`46`	`46`	`{ Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId } \| Should -Throw "Missing an argument for parameter 'ServicePrincipalId'.*"`
`@@ -52,13 +52,13 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {`
`52`	`52`	`$result = Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef" -All`
`53`	`53`	`$result \| Should -Not -BeNullOrEmpty`
`54`	`54`
`55`		`- Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment -ModuleName Microsoft.Graph.Entra -Times 1`
	`55`	`+ Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo -ModuleName Microsoft.Graph.Entra -Times 1`
`56`	`56`	`}`
`57`	`57`	`It "Should return top app role assignments " {`
`58`	`58`	`$result = Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef" -top 1`
`59`	`59`	`$result \| Should -Not -BeNullOrEmpty`
`60`	`60`
`61`		`- Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment -ModuleName Microsoft.Graph.Entra -Times 1`
	`61`	`+ Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo -ModuleName Microsoft.Graph.Entra -Times 1`
`62`	`62`	`}`
`63`	`63`	`It "Should fail when Top is empty" {`
`64`	`64`	`{ Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef" -Top } \| Should -Throw "Missing an argument for parameter 'Top'*"`
`@@ -71,7 +71,7 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {`
`71`	`71`	`$result.ObjectID \| should -Be "I8uPTcetR02TKCQg6xB170ZWgaqJluBEqPHHxTxJ9Hs"`
`72`	`72`	`}`
`73`	`73`	`It "Should contain ServicePrincipalId in parameters when passed ServicePrincipalId to it" {`
`74`		`- Mock -CommandName Get-MgServicePrincipalAppRoleAssignment -MockWith {$args} -ModuleName Microsoft.Graph.Entra`
	`74`	`+ Mock -CommandName Get-MgServicePrincipalAppRoleAssignedTo -MockWith {$args} -ModuleName Microsoft.Graph.Entra`
`75`	`75`
`76`	`76`	`$result = Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef"`
`77`	`77`	`$params = Get-Parameters -data $result`
`@@ -83,7 +83,7 @@ Describe "Get-EntraServicePrincipalAppRoleAssignedTo" {`
`83`	`83`	`$result= Get-EntraServicePrincipalAppRoleAssignedTo -ServicePrincipalId "4d8fcb23-adc7-4d47-9328-2420eb1075ef"`
`84`	`84`	`$result \| Should -Not -BeNullOrEmpty`
`85`	`85`	`$userAgentHeaderValue = "PowerShell/$psVersion EntraPowershell/$entraVersion Get-EntraServicePrincipalAppRoleAssignedTo"`
`86`		`- Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignment -ModuleName Microsoft.Graph.Entra -Times 1 -ParameterFilter {`
	`86`	`+ Should -Invoke -CommandName Get-MgServicePrincipalAppRoleAssignedTo -ModuleName Microsoft.Graph.Entra -Times 1 -ParameterFilter {`
`87`	`87`	`$Headers.'User-Agent' \| Should -Be $userAgentHeaderValue`
`88`	`88`	`$true`
`89`	`89`	`}`