r/role_definition: removing the double-check

azurerm/internal/services/authorization/role_definition_resource.go

@@ -264,10 +264,6 @@ func resourceArmRoleDefinitionRead(d *schema.ResourceData, meta interface{}) err
 		return err
 	}
 
-	d.Set("scope", roleDefinitionId.Scope)
-	d.Set("role_definition_id", roleDefinitionId.RoleID)
-	d.Set("role_definition_resource_id", roleDefinitionId.ResourceID)
-
 	resp, err := client.Get(ctx, roleDefinitionId.Scope, roleDefinitionId.RoleID)
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
@@ -276,9 +272,13 @@ func resourceArmRoleDefinitionRead(d *schema.ResourceData, meta interface{}) err
 			return nil
 		}
 
-		return fmt.Errorf("Error loading Role Definition %q: %+v", d.Id(), err)
+		return fmt.Errorf("retrieving Role Definition %q: %+v", d.Id(), err)
 	}
 
+	d.Set("scope", roleDefinitionId.Scope)
+	d.Set("role_definition_id", roleDefinitionId.RoleID)
+	d.Set("role_definition_resource_id", roleDefinitionId.ResourceID)
+
 	if props := resp.RoleDefinitionProperties; props != nil {
 		d.Set("name", props.RoleName)
 		d.Set("description", props.Description)
@@ -302,7 +302,10 @@ func resourceArmRoleDefinitionDelete(d *schema.ResourceData, meta interface{}) e
 	ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, _ := parse.RoleDefinitionId(d.Id())
+	id, err := parse.RoleDefinitionId(d.Id())
+	if err != nil {
+		return err
+	}
 
 	resp, err := client.Delete(ctx, id.Scope, id.RoleID)
 	if err != nil {
@@ -328,15 +331,10 @@ func roleDefinitionEventualConsistencyUpdate(ctx context.Context, client azuresd
 		}
 
 		respCreatedOn := *resp.RoleDefinitionProperties.CreatedOn
-		respUpdatedOn := *resp.RoleDefinitionProperties.UpdatedOn
 		if respCreatedOn == expectedUpdateDate {
 			// a new role definition is created and eventually (~5s) reconciled
 			return resp, "Pending", nil
 		}
-		if respUpdatedOn != expectedUpdateDate {
-			// however the updatedOn should match the new date, to show this has been reconciled
-			return resp, "Pending", nil
-		}
 
 		return resp, "Updated", nil
 	}