From d65109e2e918430c6da735597fb9febb91030067 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Mon, 9 Jun 2025 17:01:37 +0800 Subject: [PATCH 1/4] Remove msrestazure dependency from aem --- src/aem/azext_aem/custom.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/aem/azext_aem/custom.py b/src/aem/azext_aem/custom.py index 4cffb66175a..5ce139c1b3c 100644 --- a/src/aem/azext_aem/custom.py +++ b/src/aem/azext_aem/custom.py @@ -10,9 +10,9 @@ from azure.cli.core.util import sdk_no_wait from azure.cli.core.profiles import ResourceType, get_sdk from azure.cli.core.commands.client_factory import get_mgmt_service_client, get_data_service_client +from azure.core.exceptions import HttpResponseError from azure.mgmt.compute.models import ResourceIdentityType -from msrestazure.tools import parse_resource_id -from msrestazure.azure_exceptions import CloudError +from azure.mgmt.core.tools import parse_resource_id from knack.util import CLIError from knack.log import get_logger @@ -265,11 +265,9 @@ def _create_role_assignments_for_scopes(self, scopes): self._roles_client.role_assignments.create(scope, assignment_name, params_role_assignment) created = True - except CloudError as cex: + except HttpResponseError as cex: logger.info("Error during role assignment %s", cex) - if ((not cex.error) or (not cex.error.error) or - (PRINCIPAL_NOT_FOUND_ERROR != cex.error.error.lower())): - raise + raise if (not created) and ((datetime.now() - start_time).total_seconds() < MAX_WAIT_TIME_FOR_SP_SECONDS): logger.info("Error during role assignment - waiting 5 seconds before next attempt") From 20e56ff4fe3bbe96cb9a93384380d3b70f7bde9a Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Mon, 9 Jun 2025 17:08:02 +0800 Subject: [PATCH 2/4] upgrade version --- src/aem/HISTORY.rst | 3 +++ src/aem/setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/aem/HISTORY.rst b/src/aem/HISTORY.rst index 334dcbbe512..bcd6093fe0e 100644 --- a/src/aem/HISTORY.rst +++ b/src/aem/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +0.3.1 ++++++ +* Remove msrestazure dependency 0.3.0 +++++ diff --git a/src/aem/setup.py b/src/aem/setup.py index d30bab25b70..ccf212626df 100644 --- a/src/aem/setup.py +++ b/src/aem/setup.py @@ -8,7 +8,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "0.3.0" +VERSION = "0.3.1" CLASSIFIERS = [ 'Development Status :: 4 - Beta', From b5f43ec281a810be42369c1c28bcb010df92c0f0 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Mon, 9 Jun 2025 17:15:37 +0800 Subject: [PATCH 3/4] version --- src/aem/HISTORY.rst | 2 +- src/aem/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aem/HISTORY.rst b/src/aem/HISTORY.rst index bcd6093fe0e..9041ec860ed 100644 --- a/src/aem/HISTORY.rst +++ b/src/aem/HISTORY.rst @@ -2,7 +2,7 @@ Release History =============== -0.3.1 +1.0.0 +++++ * Remove msrestazure dependency diff --git a/src/aem/setup.py b/src/aem/setup.py index ccf212626df..a51e48edee8 100644 --- a/src/aem/setup.py +++ b/src/aem/setup.py @@ -8,7 +8,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "0.3.1" +VERSION = "1.0.0" CLASSIFIERS = [ 'Development Status :: 4 - Beta', From 331a71ccd414f915846049383d0655fbcce470a3 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Tue, 10 Jun 2025 15:30:54 +0800 Subject: [PATCH 4/4] refine --- src/aem/azext_aem/custom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/aem/azext_aem/custom.py b/src/aem/azext_aem/custom.py index 5ce139c1b3c..9c66015dbe2 100644 --- a/src/aem/azext_aem/custom.py +++ b/src/aem/azext_aem/custom.py @@ -267,7 +267,9 @@ def _create_role_assignments_for_scopes(self, scopes): created = True except HttpResponseError as cex: logger.info("Error during role assignment %s", cex) - raise + if ((not cex.error) or (not cex.error.code) or + (PRINCIPAL_NOT_FOUND_ERROR != cex.error.code.lower())): + raise if (not created) and ((datetime.now() - start_time).total_seconds() < MAX_WAIT_TIME_FOR_SP_SECONDS): logger.info("Error during role assignment - waiting 5 seconds before next attempt")