fix: corriger la logique de nettoyage des ressources et mettre à jour les noms d'enregistrement d'application

Author: Justrebl

labs/mcp-prm-oauth/clean-up-resources.ipynb

@@ -20,13 +20,13 @@
     "import utils\n",
     "\n",
     "deployment_name = os.path.basename(os.path.dirname(globals()['__vsc_ipynb_file__']))\n",
-    "resource_group = f\"lab-{deployment_name}-115\"\n",
+    "resource_group = f\"lab-{deployment_name}\"\n",
     "\n",
     "utils.cleanup_resources(deployment_name, resource_group_name=resource_group)\n",
     "\n",
     "# The lab also creates an Entra ID app registration for the MCP endpoint (when you don't bring your own `mcpClientId`). It lives in Microsoft Entra ID, not in the resource group, so it must be deleted separately.\n",
     "\n",
-    "app_registration_name = f\"lab-{deployment_name}-app4135676\"\n",
+    "app_registration_name = f\"lab-{deployment_name}-app\"\n",
     "\n",
     "print(f\"Searching for app with display name {app_registration_name}...\")\n",
     "output = utils.run(f\"az ad app list --filter \\\"displayName eq '{app_registration_name}'\\\"\", \"Retrieved app registration\", \"Failed to get the app registration\")\n",
@@ -54,7 +54,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.13"
+   "version": "3.12.-1"
   }
  },
  "nbformat": 4,

labs/mcp-prm-oauth/mcp-prm-oauth.ipynb

@@ -335,7 +335,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.13"
+   "version": "3.12.-1"
   }
  },
  "nbformat": 4,

shared/utils.py

@@ -140,20 +140,6 @@ def cleanup_resources(deployment_name, resource_group_name = None):
                     output = run(f"az keyvault delete -n {resource['name']} -g {resource_group_name}", f"Key Vault '{resource['name']}' deleted", f"Failed to delete Key Vault '{resource['name']}'")
                     output = run(f"az keyvault purge -n {resource['name']} --location \"{resource['location']}\"", f"Key Vault '{resource['name']}' purged", f"Failed to purge Key Vault '{resource['name']}'")
 
-            # Delete Container Apps first, then their managed environments
-            output = run(f"az containerapp list -g {resource_group_name}", f"Listed Container Apps", f"Failed to list Container Apps")
-            if output.success and output.json_data:
-                for resource in output.json_data:
-                    print_info(f"Deleting Container App '{resource['name']}' in resource group '{resource_group_name}'...")
-                    output = run(f"az containerapp delete -n {resource['name']} -g {resource_group_name} -y", f"Container App '{resource['name']}' deleted", f"Failed to delete Container App '{resource['name']}'")
-
-            # Delete Container Apps environments after the apps have been removed
-            output = run(f"az containerapp env list -g {resource_group_name}", f"Listed Container Apps environments", f"Failed to list Container Apps environments")
-            if output.success and output.json_data:
-                for resource in output.json_data:
-                    print_info(f"Deleting Container Apps environment '{resource['name']}' in resource group '{resource_group_name}'...")
-                    output = run(f"az containerapp env delete -n {resource['name']} -g {resource_group_name} -y", f"Container Apps environment '{resource['name']}' deleted", f"Failed to delete Container Apps environment '{resource['name']}'")
-
             # Delete the resource group last
             print_message(f"🧹 Deleting resource group '{resource_group_name}'...")
             output = run(f"az group delete --name {resource_group_name} -y", f"Resource group '{resource_group_name}' deleted", f"Failed to delete resource group '{resource_group_name}'")