Address copilot core review

Author: Bernd Verst

src/durabletask/azext_durabletask/_format.py

@@ -6,11 +6,21 @@
 from collections import OrderedDict
 
 
+def _get_resource_group(result):
+    """Derive the resource group name from the resource id."""
+    resource_id = result.get('id', '')
+    if resource_id:
+        from azure.mgmt.core.tools import parse_resource_id
+        parsed = parse_resource_id(resource_id)
+        return parsed.get('resource_group', '')
+    return ''
+
+
 def scheduler_table_format(result):
     """Format a single scheduler for table output."""
     return OrderedDict([
         ('Name', result.get('name', '')),
-        ('ResourceGroup', result.get('resourceGroup', '')),
+        ('ResourceGroup', _get_resource_group(result)),
         ('Location', result.get('location', '')),
         ('State', result.get('properties', {}).get('provisioningState', '')),
         ('SKU', result.get('properties', {}).get('sku', {}).get('name', '')),
@@ -27,7 +37,7 @@ def taskhub_table_format(result):
     """Format a single task hub for table output."""
     return OrderedDict([
         ('Name', result.get('name', '')),
-        ('ResourceGroup', result.get('resourceGroup', '')),
+        ('ResourceGroup', _get_resource_group(result)),
         ('State', result.get('properties', {}).get('provisioningState', '')),
     ])
 

src/durabletask/azext_durabletask/_scheduler.py

@@ -8,6 +8,7 @@
 from .aaz.latest.durabletask.scheduler import Show as _SchedulerShow
 from .aaz.latest.durabletask.taskhub import Show as _TaskHubShow
 from azure.cli.core.azclierror import ValidationError, ResourceNotFoundError
+from azure.core.exceptions import HttpResponseError
 
 import logging
 logger = logging.getLogger(__name__)
@@ -155,11 +156,13 @@ def _resolve_user_assigned_identity(cli_ctx, identity_resource_id):
                                          subscription_id=sub)
     try:
         identity = msi_client.user_assigned_identities.get(rg, name)
-    except Exception as ex:
-        raise ResourceNotFoundError(
-            f"User-assigned identity '{identity_resource_id}' not found. "
-            "Please verify the resource ID."
-        ) from ex
+    except HttpResponseError as ex:
+        if ex.status_code == 404:
+            raise ResourceNotFoundError(
+                f"User-assigned identity '{identity_resource_id}' not found. "
+                "Please verify the resource ID."
+            ) from ex
+        raise
 
     if identity is None or identity.principal_id is None:
         raise ResourceNotFoundError(
@@ -243,11 +246,13 @@ def _get_functionapp_identity(cli_ctx, target_name, target_resource_group, targe
                                          subscription_id=target_subscription)
     try:
         app = web_client.web_apps.get(target_resource_group, target_name)
-    except Exception as ex:
-        raise ResourceNotFoundError(
-            f"Function app '{target_name}' not found in resource group "
-            f"'{target_resource_group}'. Please verify the name and resource group."
-        ) from ex
+    except HttpResponseError as ex:
+        if ex.status_code == 404:
+            raise ResourceNotFoundError(
+                f"Function app '{target_name}' not found in resource group "
+                f"'{target_resource_group}'. Please verify the name and resource group."
+            ) from ex
+        raise
 
     if app is None or app.name is None:
         raise ResourceNotFoundError(
@@ -275,11 +280,13 @@ def _get_containerapp_identity(cli_ctx, target_name, target_resource_group, targ
                                         api_version='2024-03-01')
     try:
         app = ca_client.container_apps.get(target_resource_group, target_name)
-    except Exception as ex:
-        raise ResourceNotFoundError(
-            f"Container app '{target_name}' not found in resource group "
-            f"'{target_resource_group}'. Please verify the name and resource group."
-        ) from ex
+    except HttpResponseError as ex:
+        if ex.status_code == 404:
+            raise ResourceNotFoundError(
+                f"Container app '{target_name}' not found in resource group "
+                f"'{target_resource_group}'. Please verify the name and resource group."
+            ) from ex
+        raise
 
     if app is None or app.name is None:
         raise ResourceNotFoundError(
@@ -433,12 +440,14 @@ def attach_scheduler(cmd, resource_group_name, scheduler_name, task_hub_name,  #
             "scheduler_name": scheduler_name,
             "name": task_hub_name,
         })
-    except Exception as ex:
-        raise ResourceNotFoundError(
-            f"Task hub '{task_hub_name}' not found under scheduler '{scheduler_name}' "
-            f"in resource group '{resource_group_name}'. "
-            "Please verify the task hub name."
-        ) from ex
+    except HttpResponseError as ex:
+        if ex.status_code == 404:
+            raise ResourceNotFoundError(
+                f"Task hub '{task_hub_name}' not found under scheduler '{scheduler_name}' "
+                f"in resource group '{resource_group_name}'. "
+                "Please verify the task hub name."
+            ) from ex
+        raise
 
     # Step 2: Resolve the identity to use for role assignment
     if identity: