ARO: Fail if resource doesn't exist on delete

Azure · Jun 23, 2021 · 6e5e639 · 6e5e639
1 parent 8a1ea35
commit 6e5e639
Show file tree

Hide file tree

Showing 7 changed files with 4,716 additions and 5,735 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/aro/custom.py b/src/azure-cli/azure/cli/command_modules/aro/custom.py
@@ -145,7 +145,11 @@ def aro_delete(cmd, client, resource_group_name, resource_name, no_wait=False):
 
     try:
         oc = client.get(resource_group_name, resource_name)
-    except (CloudError, HttpOperationError) as e:
+    except CloudError as e:
+        if e.status_code == 404:
+            raise ResourceNotFoundError(e.message) from e
+        logger.info(e.message)
+    except HttpOperationError as e:
         logger.info(e.message)
 
     aad = AADManager(cmd.cli_ctx)

diff --git a/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_create.yaml b/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_create.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_delete.yaml b/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_delete.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_list.yaml b/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_list.yaml
diff --git a/...-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_list_credentials.yaml b/...-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_list_credentials.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_show.yaml b/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_show.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_update.yaml b/src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_update.yaml