Added check if account group already exists during failure recovery (#446)

Removing recovering local groups if the corresponding account group is
already attached to the workspace.

Author: fannijako

src/databricks/labs/ucx/workspace_access/groups.py

@@ -258,6 +258,12 @@ def _validate_selected_groups(self, group_names: list[str]):
         return valid_group_names
 
     def ws_local_group_deletion_recovery(self):
+        account_groups_reflected_on_the_workspace = {
+            g.display_name
+            for g in self._ws.groups.list(attributes="id,displayName,meta")
+            if g.meta.resource_type == "Group" and g.display_name not in self._SYSTEM_GROUPS
+        }
+
         workspace_groups = {_.display_name for _ in self._workspace_groups}
         source_groups = [
             g
@@ -271,8 +277,12 @@ def ws_local_group_deletion_recovery(self):
         )
 
         for backup_group in source_groups:
+            source_groups_name = backup_group.display_name.removeprefix(self._backup_group_prefix)
+            if source_groups_name in account_groups_reflected_on_the_workspace:
+                logger.info(f"Group {source_groups_name} already exists on the workspace level, skipping")
+                continue
             ws_local_group = self._ws.groups.create(
-                display_name=backup_group.display_name.removeprefix(self._backup_group_prefix),
+                display_name=source_groups_name,
                 meta=backup_group.meta,
                 entitlements=backup_group.entitlements,
                 roles=backup_group.roles,

tests/integration/workspace_access/test_groups.py

@@ -186,7 +186,7 @@ def test_id_validity(ws: WorkspaceClient, make_ucx_group):
 
 
 def test_recover_from_ws_local_deletion(ws, make_ucx_group):
-    ws_group, _ = make_ucx_group()
+    ws_group, acc_group = make_ucx_group()
     ws_group_two, _ = make_ucx_group()
 
     group_manager = GroupManager(ws, GroupsConfig(auto=True))
@@ -195,6 +195,7 @@ def test_recover_from_ws_local_deletion(ws, make_ucx_group):
     # simulate disaster
     ws.groups.delete(ws_group.id)
     ws.groups.delete(ws_group_two.id)
+    group_manager._reflect_account_group_to_workspace(acc_group)
 
     # recovery run from a debug notebook
     group_manager = GroupManager(ws, GroupsConfig(auto=True))
@@ -208,17 +209,10 @@ def test_recover_from_ws_local_deletion(ws, make_ucx_group):
     for gi in group_manager.migration_state.groups:
         recovered_state[gi.workspace.display_name] = gi.workspace
 
-    assert sorted([member.display for member in ws_group.members]) == sorted(
-        [member.display for member in recovered_state[ws_group.display_name].members]
-    )
     assert sorted([member.display for member in ws_group_two.members]) == sorted(
         [member.display for member in recovered_state[ws_group_two.display_name].members]
     )
 
-    assert sorted([member.value for member in ws_group.members]) == sorted(
-        [member.value for member in recovered_state[ws_group.display_name].members]
-    )
-
     assert sorted([member.value for member in ws_group_two.members]) == sorted(
         [member.value for member in recovered_state[ws_group_two.display_name].members]
     )