From 668aa89edf86fdeecf1da17432df44fe249d5d8a Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 25 Feb 2020 13:39:36 -0500 Subject: [PATCH] fix circular import --- atst/domain/csp/cloud/__init__.py | 4 ---- atst/jobs.py | 3 ++- atst/models/portfolio.py | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/atst/domain/csp/cloud/__init__.py b/atst/domain/csp/cloud/__init__.py index c3cc5dc0..99128d9c 100644 --- a/atst/domain/csp/cloud/__init__.py +++ b/atst/domain/csp/cloud/__init__.py @@ -1,7 +1,3 @@ from .azure_cloud_provider import AzureCloudProvider from .cloud_provider_interface import CloudProviderInterface from .mock_cloud_provider import MockCloudProvider -from .utils import ( - generate_mail_nickname, - generate_user_principal_name, -) diff --git a/atst/jobs.py b/atst/jobs.py index dcfb4bf3..b3e5643b 100644 --- a/atst/jobs.py +++ b/atst/jobs.py @@ -6,7 +6,8 @@ from azure.core.exceptions import AzureError from atst.database import db from atst.domain.application_roles import ApplicationRoles from atst.domain.applications import Applications -from atst.domain.csp.cloud import CloudProviderInterface, generate_user_principal_name +from atst.domain.csp.cloud import CloudProviderInterface +from atst.domain.csp.cloud.utils import generate_user_principal_name from atst.domain.csp.cloud.exceptions import GeneralCSPException from atst.domain.csp.cloud.models import ( ApplicationCSPPayload, diff --git a/atst/models/portfolio.py b/atst/models/portfolio.py index 0243b215..fdf5613b 100644 --- a/atst/models/portfolio.py +++ b/atst/models/portfolio.py @@ -12,7 +12,7 @@ from sqlalchemy_json import NestedMutableJson from atst.database import db import atst.models.mixins as mixins import atst.models.types as types -from atst.domain.csp.cloud import generate_mail_nickname +from atst.domain.csp.cloud.utils import generate_mail_nickname from atst.domain.permission_sets import PermissionSets from atst.models.base import Base from atst.models.portfolio_role import PortfolioRole, Status as PortfolioRoleStatus