From dc815d4a5245e73a70d081e3c94aa7a096f041fa Mon Sep 17 00:00:00 2001 From: jessicamack Date: Mon, 8 Sep 2025 15:59:34 -0400 Subject: [PATCH 1/2] make role assignment sync logging more descriptive --- ansible_base/resource_registry/tasks/sync.py | 38 +++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/ansible_base/resource_registry/tasks/sync.py b/ansible_base/resource_registry/tasks/sync.py index 774d1584f..f2613fe57 100644 --- a/ansible_base/resource_registry/tasks/sync.py +++ b/ansible_base/resource_registry/tasks/sync.py @@ -705,38 +705,50 @@ def _sync_assignments(self): to_delete = local_assignments - remote_assignments to_create = remote_assignments - local_assignments - deleted_count = 0 - created_count = 0 - error_count = 0 + deleted_assignments = [] + created_assigments = [] + errored_assignments = [] # Delete local assignments that don't exist remotely for assignment_tuple in to_delete: if delete_local_assignment(assignment_tuple): - deleted_count += 1 - self.write( + delete_msg = ( f"DELETED assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" ) + self.write(delete_msg) + self.results["deleted_assignments"].append(delete_msg) else: - error_count += 1 + error_msg = ( + f"ERRORED while DELETING assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" + " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" + ) + self.write(error_msg) + self.results["errored_assignments"].append(error_msg) # Create local assignments that exist remotely but not locally for assignment_tuple in to_create: if create_local_assignment(assignment_tuple): - created_count += 1 - self.write( + created_msg = ( f"CREATED assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" ) + self.write(created_msg) + self.results["created_assigments"].append(created_msg) else: - error_count += 1 + error_msg = ( + f"ERRORED while CREATING assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" + " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" + ) + self.write(error_msg) + self.results["errored_assignments"].append(error_msg) - self.write(f"Assignment sync completed: Created {created_count} | Deleted {deleted_count} | Errors {error_count}") + self.write(f"Assignment sync completed: Created {len(created_assigments)} | Deleted {len(deleted_assignments)} | Errors {len(errored_assignments)}") # Store results for reporting - self.results["assignments_created"] = [created_count] - self.results["assignments_deleted"] = [deleted_count] - self.results["assignment_errors"] = [error_count] + self.results["assignments_created"] = created_assigments + self.results["assignments_deleted"] = deleted_assignments + self.results["assignment_errors"] = errored_assignments except Exception as e: self.write(f"Assignment sync failed: {e}") From abafc5f74ff3d79a2d488f4ecb3fe1067fd63a0c Mon Sep 17 00:00:00 2001 From: jessicamack Date: Tue, 9 Sep 2025 12:30:20 -0400 Subject: [PATCH 2/2] fix f-string with line break --- ansible_base/resource_registry/tasks/sync.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible_base/resource_registry/tasks/sync.py b/ansible_base/resource_registry/tasks/sync.py index f2613fe57..fd5b58174 100644 --- a/ansible_base/resource_registry/tasks/sync.py +++ b/ansible_base/resource_registry/tasks/sync.py @@ -714,14 +714,14 @@ def _sync_assignments(self): if delete_local_assignment(assignment_tuple): delete_msg = ( f"DELETED assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" - " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" + f" -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" ) self.write(delete_msg) self.results["deleted_assignments"].append(delete_msg) else: error_msg = ( f"ERRORED while DELETING assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" - " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" + f" -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" ) self.write(error_msg) self.results["errored_assignments"].append(error_msg) @@ -731,14 +731,14 @@ def _sync_assignments(self): if create_local_assignment(assignment_tuple): created_msg = ( f"CREATED assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" - " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" + f" -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" ) self.write(created_msg) self.results["created_assigments"].append(created_msg) else: error_msg = ( f"ERRORED while CREATING assignment {assignment_tuple.assignment_type} {assignment_tuple.actor_ansible_id}" - " -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" + f" -> {assignment_tuple.role_definition_name} on {assignment_tuple.ansible_id_or_pk or 'global'}" ) self.write(error_msg) self.results["errored_assignments"].append(error_msg)