azurerm_pim_eligible_role_assignment - user atScope() as filter (#29781)

ziyeqf · web-flow · commit 9199c15e6e0a · 2025-06-19T14:38:57.000-06:00
* [ENHANCEMENT] * `azurerm_pim_eligible_role_assignment` - improve filter used during List request to prevent internal server errors
diff --git a/internal/services/authorization/pim_eligible_role_assignment_resource.go b/internal/services/authorization/pim_eligible_role_assignment_resource.go
@@ -685,7 +685,7 @@ func findRoleEligibilitySchedule(ctx context.Context, client *roleeligibilitysch
 	}
 
 	schedulesResult, err := client.ListForScopeComplete(ctx, *scopeId, roleeligibilityschedules.ListForScopeOperationOptions{
-		Filter: pointer.To(fmt.Sprintf("(principalId eq '%s')", id.PrincipalId)),
+		Filter: pointer.To(fmt.Sprintf("(principalId eq '%s') and atScope()", id.PrincipalId)),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("listing Role Eligiblity Schedules for %s: %+v", scopeId, err)

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ func findRoleEligibilitySchedule(ctx context.Context, client *roleeligibilitysch`
`685`	`685`	`}`
`686`	`686`
`687`	`687`	`schedulesResult, err := client.ListForScopeComplete(ctx, *scopeId, roleeligibilityschedules.ListForScopeOperationOptions{`
`688`		`- Filter: pointer.To(fmt.Sprintf("(principalId eq '%s')", id.PrincipalId)),`
	`688`	`+ Filter: pointer.To(fmt.Sprintf("(principalId eq '%s') and atScope()", id.PrincipalId)),`
`689`	`689`	`})`
`690`	`690`	`if err != nil {`
`691`	`691`	`return nil, fmt.Errorf("listing Role Eligiblity Schedules for %s: %+v", scopeId, err)`