diff --git a/atst/domain/csp/cloud/azure_cloud_provider.py b/atst/domain/csp/cloud/azure_cloud_provider.py index 85feae24..1ee1ad1c 100644 --- a/atst/domain/csp/cloud/azure_cloud_provider.py +++ b/atst/domain/csp/cloud/azure_cloud_provider.py @@ -90,7 +90,6 @@ class AzureSDKProvider(object): self.credentials = credentials self.identity = identity self.azure_exceptions = exceptions - self.requests_exceptions = requests.exceptions self.secrets = secrets self.requests = requests self.cloud = AZURE_PUBLIC_CLOUD @@ -306,22 +305,21 @@ class AzureCloudProvider(CloudProviderInterface): headers=create_tenant_headers, timeout=30, ) + result.raise_for_status() - except self.requests_exceptions.ConnectionError: + except self.sdk.requests.ConnectionError: app.logger.error( f"Could not create tenant. Connection Error", exc_info=1, ) raise ConnectionException("connection error creating tenant") - except self.requests_exceptions.Timeout: + except self.sdk.requests.Timeout: app.logger.error( f"Could not create tenant. Request timed out.", exc_info=1, ) raise ConnectionException("timout error creating tenant") - try: - response.raise_for_status() - except requests_exceptions.HTTPError: + except self.sdk.requests.HTTPError: raise UnknownServerException("azure application error creating tenant") if result.status_code == 200: diff --git a/tests/mock_azure.py b/tests/mock_azure.py index ce85a396..f5cfba17 100644 --- a/tests/mock_azure.py +++ b/tests/mock_azure.py @@ -63,6 +63,11 @@ def mock_policy(): return Mock(spec=policy) +def mock_azure_exceptions(): + from azure.core import exceptions + + return Mock(spec=exceptions) + def mock_adal(): import adal @@ -99,6 +104,7 @@ class MockAzureSDK(object): self.graphrbac = mock_graphrbac() self.credentials = mock_credentials() self.identity = mock_identity() + self.azure_exceptions = mock_azure_exceptions() self.policy = mock_policy() self.secrets = mock_secrets() self.requests = mock_requests()