Use more specific imports for cloud models and exceptions.

atst/domain/csp/cloud/__init__.py

@@ -1,5 +1,3 @@
-from .exceptions import *
+from .azure_cloud_provider import AzureCloudProvider
-from .models import *
 from .cloud_provider_interface import CloudProviderInterface
 from .mock_cloud_provider import MockCloudProvider
-from .azure_cloud_provider import AzureCloudProvider

atst/domain/csp/cloud/cloud_provider_interface.py

@@ -124,4 +124,3 @@ class CloudProviderInterface:
         exception if an error occurs while creating a subscription.
         """
         raise NotImplementedError()
-

atst/domain/csp/cloud/mock_cloud_provider.py

@@ -1,8 +1,35 @@
 from uuid import uuid4
 
+from atst.domain.csp.cloud.exceptions import (
+    BaselineProvisionException,
+    EnvironmentCreationException,
+    GeneralCSPException,
+    UserProvisioningException,
+    UserRemovalException,
+)
+from atst.domain.csp.cloud.models import BillingProfileTenantAccessCSPResult
+
 from .cloud_provider_interface import CloudProviderInterface
-from .exceptions import *
+from .exceptions import (
-from .models import *
+    AuthenticationException,
+    AuthorizationException,
+    ConnectionException,
+    UnknownServerException,
+)
+from .models import (
+    BillingInstructionCSPPayload,
+    BillingInstructionCSPResult,
+    BillingProfileCreationCSPPayload,
+    BillingProfileCreationCSPResult,
+    BillingProfileVerificationCSPPayload,
+    BillingProfileVerificationCSPResult,
+    TaskOrderBillingCreationCSPPayload,
+    TaskOrderBillingCreationCSPResult,
+    TaskOrderBillingVerificationCSPPayload,
+    TaskOrderBillingVerificationCSPResult,
+    TenantCSPPayload,
+    TenantCSPResult,
+)
 
 
 class MockCloudProvider(CloudProviderInterface):

atst/jobs.py

@@ -9,7 +9,8 @@ from atst.models import (
     EnvironmentRole,
     PortfolioJobFailure,
 )
-from atst.domain.csp.cloud import CloudProviderInterface, GeneralCSPException
+from atst.domain.csp.cloud.exceptions import GeneralCSPException
+from atst.domain.csp.cloud import CloudProviderInterface
 from atst.domain.environments import Environments
 from atst.domain.portfolios import Portfolios
 from atst.domain.environment_roles import EnvironmentRoles

atst/routes/applications/settings.py

@@ -13,7 +13,7 @@ from atst.domain.environments import Environments
 from atst.domain.applications import Applications
 from atst.domain.application_roles import ApplicationRoles
 from atst.domain.audit_log import AuditLog
-from atst.domain.csp.cloud import GeneralCSPException
+from atst.domain.csp.cloud.exceptions import GeneralCSPException
 from atst.domain.common import Paginator
 from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.invitations import ApplicationInvitations

tests/domain/cloud/test_azure_csp.py

@@ -1,17 +1,19 @@
 from unittest.mock import Mock
-
 from uuid import uuid4
 
-from atst.domain.csp.cloud import (
+from tests.factories import ApplicationFactory, EnvironmentFactory
-    AzureCloudProvider,
+from tests.mock_azure import AUTH_CREDENTIALS, mock_azure
-    BillingProfileCreationCSPResult,
+
+from atst.domain.csp.cloud import AzureCloudProvider
+from atst.domain.csp.cloud.models import (
+    BillingInstructionCSPPayload,
+    BillingInstructionCSPResult,
     BillingProfileCreationCSPPayload,
+    BillingProfileCreationCSPResult,
     BillingProfileTenantAccessCSPPayload,
     BillingProfileTenantAccessCSPResult,
     BillingProfileVerificationCSPPayload,
     BillingProfileVerificationCSPResult,
-    BillingInstructionCSPPayload,
-    BillingInstructionCSPResult,
     TaskOrderBillingCreationCSPPayload,
     TaskOrderBillingCreationCSPResult,
     TaskOrderBillingVerificationCSPPayload,
@@ -20,10 +22,6 @@ from atst.domain.csp.cloud import (
     TenantCSPResult,
 )
 
-from tests.mock_azure import mock_azure, AUTH_CREDENTIALS
-from tests.factories import EnvironmentFactory, ApplicationFactory
-
-
 creds = {
     "home_tenant_id": "tenant_id",
     "client_id": "client_id",
@@ -150,7 +148,7 @@ def test_create_tenant(mock_azure: AzureCloudProvider):
         **dict(
             creds=creds,
             user_id="admin",
-            password="JediJan13$coot",
+            password="JediJan13$coot",  # pragma: allowlist secret
             domain_name="jediccpospawnedtenant2",
             first_name="Tedry",
             last_name="Tenet",

tests/routes/applications/test_settings.py

@@ -12,7 +12,7 @@ from atst.domain.application_roles import ApplicationRoles
 from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.invitations import ApplicationInvitations
 from atst.domain.common import Paginator
-from atst.domain.csp.cloud import GeneralCSPException
+from atst.domain.csp.cloud.exceptions import GeneralCSPException
 from atst.domain.permission_sets import PermissionSets
 from atst.models.application_role import Status as ApplicationRoleStatus
 from atst.models.environment_role import CSPRole, EnvironmentRole