From 4ce33cc504712ac11f3294facd30d48ef0c45429 Mon Sep 17 00:00:00 2001 From: Tanmay Satam Date: Fri, 14 Mar 2025 11:36:34 -0400 Subject: [PATCH] Allow ensure_resource_permissions to tolerate missing subnets --- .../azure/cli/command_modules/aro/custom.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 index 93a427b60c2..89aed6eb92e 100644 --- a/src/azure-cli/azure/cli/command_modules/aro/custom.py +++ b/src/azure-cli/azure/cli/command_modules/aro/custom.py @@ -8,7 +8,8 @@ from base64 import b64decode import textwrap -from azure.core.exceptions import HttpResponseError +from azure.core.exceptions import HttpResponseError, \ + ResourceNotFoundError as CoreResourceNotFoundError from azure.mgmt.core.tools import resource_id, parse_resource_id import azure.mgmt.redhatopenshift.models as openshiftcluster @@ -462,11 +463,14 @@ def get_network_resources_from_subnets(cli_ctx, subnets, fail, oc): Please retry, if issue persists: raise azure support ticket""") logger.info("Failed to validate subnet '%s'", sn) - subnet = subnet_show(cli_ctx=cli_ctx)(command_args={ - "name": sid['resource_name'], - "vnet_name": sid['name'], - "resource_group": sid['resource_group'] - }) + try: + subnet = subnet_show(cli_ctx=cli_ctx)(command_args={ + "name": sid['resource_name'], + "vnet_name": sid['name'], + "resource_group": sid['resource_group']} + ) + except CoreResourceNotFoundError: + continue if subnet.get("routeTable", None): subnet_resources.add(subnet["routeTable"]["id"])