fix import checks

hashicorp · May 15, 2024 · 348f48a · 348f48a
1 parent a195473
commit 348f48a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/services/authorization/pim_active_role_assignment_resource.go b/internal/services/authorization/pim_active_role_assignment_resource.go
@@ -228,7 +228,11 @@ func (r PimActiveRoleAssignmentResource) Create() sdk.ResourceFunc {
 
 			id := parse.NewPimRoleAssignmentID(config.Scope, config.RoleDefinitionId, config.PrincipalId)
 
-			if schedule, err := findRoleAssignmentSchedule(ctx, schedulesClient, id); err != nil && schedule != nil {
+			schedule, err := findRoleAssignmentSchedule(ctx, schedulesClient, id)
+			if err != nil {
+				return err
+			}
+			if schedule != nil {
 				return metadata.ResourceRequiresImport(r.ResourceType(), id)
 			}
 

diff --git a/internal/services/authorization/pim_eligible_role_assignment_resource.go b/internal/services/authorization/pim_eligible_role_assignment_resource.go
@@ -229,7 +229,11 @@ func (r PimEligibleRoleAssignmentResource) Create() sdk.ResourceFunc {
 
 			id := parse.NewPimRoleAssignmentID(config.Scope, config.RoleDefinitionId, config.PrincipalId)
 
-			if schedule, err := findRoleEligibilitySchedule(ctx, schedulesClient, id); err != nil && schedule != nil {
+			schedule, err := findRoleEligibilitySchedule(ctx, schedulesClient, id)
+			if err != nil {
+				return err
+			}
+			if schedule != nil {
 				return metadata.ResourceRequiresImport(r.ResourceType(), id)
 			}