Update atst to atat

This commit is contained in:
leigh-mil
2020-02-28 16:01:45 -05:00
parent 6eb48239cf
commit c2814416fb
215 changed files with 735 additions and 746 deletions

View File

@@ -1,13 +1,13 @@
import pytest
from atst.domain.authnid import AuthenticationContext
from atst.domain.authnid.crl import (
from atat.domain.authnid import AuthenticationContext
from atat.domain.authnid.crl import (
CRLCache,
CRLRevocationException,
CRLInvalidException,
)
from atst.domain.exceptions import UnauthenticatedError, NotFoundError
from atst.domain.users import Users
from atat.domain.exceptions import UnauthenticatedError, NotFoundError
from atat.domain.users import Users
from tests.mocks import DOD_SDN_INFO, DOD_SDN, FIXTURE_EMAIL_ADDRESS
from tests.factories import UserFactory

View File

@@ -7,13 +7,13 @@ from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.serialization import Encoding
from OpenSSL import crypto
from atst.domain.authnid.crl import (
from atat.domain.authnid.crl import (
CRLCache,
CRLRevocationException,
CRLInvalidException,
NoOpCRLCache,
)
from atst.domain.authnid.crl.util import (
from atat.domain.authnid.crl.util import (
load_crl_locations_cache,
serialize_crl_locations_cache,
CRLParseError,

View File

@@ -1,5 +1,5 @@
import pytest
import atst.domain.authnid.utils as utils
import atat.domain.authnid.utils as utils
from tests.mocks import DOD_SDN, FIXTURE_EMAIL_ADDRESS

View File

@@ -1,4 +1,4 @@
from atst.domain.csp.reports import prepare_azure_reporting_data
from atat.domain.csp.reports import prepare_azure_reporting_data
from tests.factories import PortfolioFactory
from decimal import Decimal
import pendulum

View File

@@ -8,7 +8,7 @@ import pytest
from tests.factories import ApplicationFactory, EnvironmentFactory
from tests.mock_azure import AUTH_CREDENTIALS, mock_azure
from atst.domain.csp.cloud.exceptions import (
from atat.domain.csp.cloud.exceptions import (
AuthenticationException,
UserProvisioningException,
ConnectionException,
@@ -16,8 +16,8 @@ from atst.domain.csp.cloud.exceptions import (
SecretException,
DomainNameException,
)
from atst.domain.csp.cloud import AzureCloudProvider
from atst.domain.csp.cloud.models import (
from atat.domain.csp.cloud import AzureCloudProvider
from atat.domain.csp.cloud.models import (
AdminRoleDefinitionCSPPayload,
AdminRoleDefinitionCSPResult,
ApplicationCSPPayload,
@@ -69,7 +69,7 @@ from atst.domain.csp.cloud.models import (
UserCSPPayload,
UserRoleCSPPayload,
)
from atst.domain.csp.cloud.exceptions import UserProvisioningException
from atat.domain.csp.cloud.exceptions import UserProvisioningException
BILLING_ACCOUNT_NAME = "52865e4c-52e8-5a6c-da6b-c58f0814f06f:7ea5de9d-b8ce-4901-b1c5-d864320c7b03_2019-05-31"
@@ -1599,7 +1599,7 @@ class TestGenerateValidDomainName:
return True
monkeypatch.setattr(
"atst.domain.csp.cloud.AzureCloudProvider.validate_domain_name",
"atat.domain.csp.cloud.AzureCloudProvider.validate_domain_name",
_validate_domain_name,
)
assert mock_azure.generate_valid_domain_name(tenant_name) == tenant_name
@@ -1609,7 +1609,7 @@ class TestGenerateValidDomainName:
return False
monkeypatch.setattr(
"atst.domain.csp.cloud.AzureCloudProvider.validate_domain_name",
"atat.domain.csp.cloud.AzureCloudProvider.validate_domain_name",
_validate_domain_name,
)
with pytest.raises(DomainNameException):
@@ -1626,7 +1626,7 @@ class TestGenerateValidDomainName:
return True
monkeypatch.setattr(
"atst.domain.csp.cloud.AzureCloudProvider.validate_domain_name",
"atat.domain.csp.cloud.AzureCloudProvider.validate_domain_name",
_validate_domain_name,
)
assert mock_azure.generate_valid_domain_name(tenant_name) != tenant_name

View File

@@ -1,4 +1,4 @@
from atst.domain.csp.files import AzureFileService
from atat.domain.csp.files import AzureFileService
from azure.storage.blob.models import Blob

View File

@@ -1,7 +1,7 @@
import pytest
from atst.domain.csp import MockCloudProvider
from atst.domain.csp.cloud.models import (
from atat.domain.csp import MockCloudProvider
from atat.domain.csp.cloud.models import (
EnvironmentCSPPayload,
EnvironmentCSPResult,
TenantCSPPayload,

View File

@@ -2,7 +2,7 @@ import pytest
from pydantic import ValidationError
from atst.domain.csp.cloud.models import (
from atat.domain.csp.cloud.models import (
AZURE_MGMNT_PATH,
KeyVaultCredentials,
ManagementGroupCSPPayload,

View File

@@ -1,4 +1,4 @@
from atst.domain.csp.cloud.policy import AzurePolicyManager, AzurePolicy
from atat.domain.csp.cloud.policy import AzurePolicyManager, AzurePolicy
def test_portfolio_definitions():

View File

@@ -1,10 +1,10 @@
import pytest
from atst.domain.application_roles import ApplicationRoles
from atst.domain.environment_roles import EnvironmentRoles
from atst.domain.exceptions import NotFoundError
from atst.domain.permission_sets import PermissionSets
from atst.models import ApplicationRoleStatus
from atat.domain.application_roles import ApplicationRoles
from atat.domain.environment_roles import EnvironmentRoles
from atat.domain.exceptions import NotFoundError
from atat.domain.permission_sets import PermissionSets
from atat.models import ApplicationRoleStatus
from tests.factories import *

View File

@@ -2,12 +2,12 @@ import pendulum
import pytest
from uuid import uuid4
from atst.models import CSPRole, ApplicationRoleStatus
from atst.domain.application_roles import ApplicationRoles
from atst.domain.applications import Applications
from atst.domain.environment_roles import EnvironmentRoles
from atst.domain.exceptions import AlreadyExistsError, NotFoundError
from atst.domain.permission_sets import PermissionSets
from atat.models import CSPRole, ApplicationRoleStatus
from atat.domain.application_roles import ApplicationRoles
from atat.domain.applications import Applications
from atat.domain.environment_roles import EnvironmentRoles
from atat.domain.exceptions import AlreadyExistsError, NotFoundError
from atat.domain.permission_sets import PermissionSets
from tests.factories import (
ApplicationFactory,

View File

@@ -1,12 +1,12 @@
import pytest
from atst.domain.applications import Applications
from atst.domain.audit_log import AuditLog
from atst.domain.exceptions import UnauthorizedError
from atst.domain.permission_sets import PermissionSets
from atst.domain.portfolios import Portfolios
from atst.domain.users import Users
from atst.models.portfolio_role import Status as PortfolioRoleStatus
from atat.domain.applications import Applications
from atat.domain.audit_log import AuditLog
from atat.domain.exceptions import UnauthorizedError
from atat.domain.permission_sets import PermissionSets
from atat.domain.portfolios import Portfolios
from atat.domain.users import Users
from atat.models.portfolio_role import Status as PortfolioRoleStatus
from tests.factories import (
ApplicationFactory,
ApplicationInvitationFactory,

View File

@@ -1,6 +1,6 @@
from flask import make_response, session
from atst.domain.auth import logout
from atat.domain.auth import logout
def _write_session(app):
@@ -19,7 +19,7 @@ def test_logout_destroys_session(app):
def test_logout_logs_dod_id_for_current_user(monkeypatch, mock_logger):
dod_id = "3434343434"
monkeypatch.setattr("atst.domain.auth._current_dod_id", lambda: dod_id)
monkeypatch.setattr("atat.domain.auth._current_dod_id", lambda: dod_id)
logout()
assert dod_id in mock_logger.messages[-1]

View File

@@ -7,12 +7,12 @@ from tests.factories import (
PortfolioFactory,
PortfolioRoleFactory,
)
from atst.domain.authz import Authorization, user_can_access
from atst.domain.authz.decorator import user_can_access_decorator
from atst.domain.permission_sets import PermissionSets
from atst.domain.exceptions import UnauthorizedError
from atst.models.permissions import Permissions
from atst.domain.portfolio_roles import PortfolioRoles
from atat.domain.authz import Authorization, user_can_access
from atat.domain.authz.decorator import user_can_access_decorator
from atat.domain.permission_sets import PermissionSets
from atat.domain.exceptions import UnauthorizedError
from atat.models.permissions import Permissions
from atat.domain.portfolio_roles import PortfolioRoles
from tests.utils import FakeLogger
@@ -222,7 +222,7 @@ def test_user_can_access_decorator_logs_access(
set_current_user(user)
monkeypatch.setattr(
"atst.domain.authz.decorator.check_access", lambda *a, **k: True
"atat.domain.authz.decorator.check_access", lambda *a, **k: True
)
num_msgs = len(mock_logger.messages)
_do_something()
@@ -233,7 +233,7 @@ def test_user_can_access_decorator_logs_access(
def _unauthorized(*a, **k):
raise UnauthorizedError(user, "do something")
monkeypatch.setattr("atst.domain.authz.decorator.check_access", _unauthorized)
monkeypatch.setattr("atat.domain.authz.decorator.check_access", _unauthorized)
num_msgs = len(mock_logger.messages)
with pytest.raises(UnauthorizedError):
_do_something()

View File

@@ -1,7 +1,7 @@
import pytest
from atst.domain.environment_roles import EnvironmentRoles
from atst.models import EnvironmentRole, ApplicationRoleStatus
from atat.domain.environment_roles import EnvironmentRoles
from atat.models import EnvironmentRole, ApplicationRoleStatus
from tests.factories import *

View File

@@ -1,10 +1,10 @@
import pytest
from uuid import uuid4
from atst.domain.environments import Environments
from atst.domain.environment_roles import EnvironmentRoles
from atst.domain.exceptions import AlreadyExistsError, DisabledError, NotFoundError
from atst.models.environment_role import CSPRole, EnvironmentRole
from atat.domain.environments import Environments
from atat.domain.environment_roles import EnvironmentRoles
from atat.domain.exceptions import AlreadyExistsError, DisabledError, NotFoundError
from atat.models.environment_role import CSPRole, EnvironmentRole
from tests.factories import (
ApplicationFactory,

View File

@@ -2,16 +2,16 @@ import pytest
import re
import pendulum
from atst.domain.audit_log import AuditLog
from atst.domain.invitations import (
from atat.domain.audit_log import AuditLog
from atat.domain.invitations import (
ExpiredError,
InvitationError,
NotFoundError,
PortfolioInvitations,
WrongUserError,
)
from atst.models import InvitationStatus
from atst.models.portfolio_role import Status as PortfolioRoleStatus
from atat.models import InvitationStatus
from atat.models.portfolio_role import Status as PortfolioRoleStatus
from tests.factories import (
PortfolioFactory,

View File

@@ -1,7 +1,7 @@
import pytest
from atst.domain.permission_sets import PermissionSets
from atst.domain.exceptions import NotFoundError
from atst.utils import first_or_none
from atat.domain.permission_sets import PermissionSets
from atat.domain.exceptions import NotFoundError
from atat.utils import first_or_none
def test_get_all():

View File

@@ -1,8 +1,8 @@
from atst.domain.permission_sets import PermissionSets
from atst.domain.portfolio_roles import PortfolioRoles
from atst.domain.users import Users
from atst.models.permissions import Permissions
from atst.models.portfolio_role import Status as PortfolioRoleStatus
from atat.domain.permission_sets import PermissionSets
from atat.domain.portfolio_roles import PortfolioRoles
from atat.domain.users import Users
from atat.models.permissions import Permissions
from atat.models.portfolio_role import Status as PortfolioRoleStatus
from tests.factories import (
PortfolioFactory,

View File

@@ -17,16 +17,16 @@ from tests.factories import (
UserFactory,
)
from atst.models import FSMStates, PortfolioStateMachine, TaskOrder
from atst.models.mixins.state_machines import (
from atat.models import FSMStates, PortfolioStateMachine, TaskOrder
from atat.models.mixins.state_machines import (
AzureStages,
StageStates,
_build_csp_states,
_build_transitions,
compose_state,
)
from atst.models.portfolio import Portfolio
from atst.models.portfolio_state_machine import (
from atat.models.portfolio import Portfolio
from atat.models.portfolio_state_machine import (
StateMachineMisconfiguredError,
_stage_state_to_stage_name,
_stage_to_classname,
@@ -277,7 +277,7 @@ def test_state_machine_initialization(state_machine):
@pytest.mark.state_machine
@patch("atst.domain.csp.cloud.MockCloudProvider")
@patch("atat.domain.csp.cloud.MockCloudProvider")
def test_fsm_transition_start(
mock_cloud_provider, state_machine: PortfolioStateMachine
):

View File

@@ -1,21 +1,21 @@
import pytest
from uuid import uuid4
from atst.domain.exceptions import NotFoundError, UnauthorizedError
from atst.domain.portfolios import (
from atat.domain.exceptions import NotFoundError, UnauthorizedError
from atat.domain.portfolios import (
Portfolios,
PortfolioError,
PortfolioDeletionApplicationsExistError,
PortfolioStateMachines,
)
from atst.domain.portfolio_roles import PortfolioRoles
from atst.domain.applications import Applications
from atst.domain.application_roles import ApplicationRoles
from atst.domain.environments import Environments
from atst.domain.permission_sets import PermissionSets, PORTFOLIO_PERMISSION_SETS
from atst.models.application_role import Status as ApplicationRoleStatus
from atst.models.portfolio_role import Status as PortfolioRoleStatus
from atst.models import FSMStates
from atat.domain.portfolio_roles import PortfolioRoles
from atat.domain.applications import Applications
from atat.domain.application_roles import ApplicationRoles
from atat.domain.environments import Environments
from atat.domain.permission_sets import PermissionSets, PORTFOLIO_PERMISSION_SETS
from atat.models.application_role import Status as ApplicationRoleStatus
from atat.models.portfolio_role import Status as PortfolioRoleStatus
from atat.models import FSMStates
from tests.factories import (
ApplicationFactory,

View File

@@ -1,6 +1,6 @@
import pytest
from atst.domain.reports import Reports
from atat.domain.reports import Reports
from tests.factories import PortfolioFactory
from decimal import Decimal

View File

@@ -2,10 +2,10 @@ import pytest
import pendulum
from decimal import Decimal
from atst.domain.exceptions import AlreadyExistsError
from atst.domain.task_orders import TaskOrders
from atst.models import Attachment
from atst.models.task_order import TaskOrder, SORT_ORDERING, Status
from atat.domain.exceptions import AlreadyExistsError
from atat.domain.task_orders import TaskOrders
from atat.models import Attachment
from atat.models.task_order import TaskOrder, SORT_ORDERING, Status
from tests.factories import TaskOrderFactory, CLINFactory, PortfolioFactory

View File

@@ -1,9 +1,9 @@
import pytest
from uuid import uuid4
from atst.domain.users import Users
from atst.domain.exceptions import NotFoundError, AlreadyExistsError, UnauthorizedError
from atst.utils import pick
from atat.domain.users import Users
from atat.domain.exceptions import NotFoundError, AlreadyExistsError, UnauthorizedError
from atat.utils import pick
from tests.factories import UserFactory