Skip to content

{AKS} az aks update: Remove the error that could not create a role assignment error when the role assignment already exists #6053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 1 commit into from
Mar 26, 2023
Merged

{AKS} az aks update: Remove the error that could not create a role assignment error when the role assignment already exists #6053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/aks-preview/azext_aks_preview/_roleassignments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@

import time
import uuid

from azext_aks_preview._client_factory import (
get_auth_management_client,
get_graph_rbac_management_client,
)
from azure.core.exceptions import HttpResponseError, ResourceExistsError
from azure.graphrbac.models import GetObjectsParameters
from knack.log import get_logger
from knack.util import CLIError
from msrestazure.azure_exceptions import CloudError
from azext_aks_preview._client_factory import get_auth_management_client, get_graph_rbac_management_client

logger = get_logger(__name__)

Expand Down Expand Up @@ -127,12 +132,12 @@ def add_role_assignment(cli_ctx, role, service_principal_msi_id, is_service_prin
create_role_assignment(
cli_ctx, role, service_principal_msi_id, is_service_principal, scope=scope)
break
except CloudError as ex:
if ex.message == 'The role assignment already exists.':
except (CloudError, HttpResponseError) as ex:
if isinstance(ex, ResourceExistsError) or "The role assignment already exists." in ex.message:
break
logger.info(ex.message)
except: # pylint: disable=bare-except
pass
except Exception as ex: # pylint: disable=broad-except
logger.error(str(ex))
time.sleep(delay + delay * x)
else:
return False
Expand Down