pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First step in breaking out cloud.py

Browse Source 
Move cloud.py to a module init. Move policy with it. Update related unit tests. Also adds a patch to state machine test to prevent randomness in mock from failing test.
This commit is contained in:
tomdds 2020-01-26 13:01:37 -05:00
parent f08d53d7a0
commit d02d47615e
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
atst/domain/csp/cloud.py → atst/domain/csp/cloud/__init__.py
View File

@ -1,4 +1,5 @@
import re import re
from secrets import token_urlsafe
from typing import Dict, List, Optional from typing import Dict, List, Optional
from uuid import uuid4 from uuid import uuid4
@ -177,7 +178,7 @@ class BaseCSPPayload(AliasModel):
class TenantCSPPayload(BaseCSPPayload): class TenantCSPPayload(BaseCSPPayload):
user_id: str user_id: str
password: str password: Optional[str]
domain_name: str domain_name: str
first_name: str first_name: str
last_name: str last_name: str
@ -1070,7 +1071,7 @@ class AzureCloudProvider(CloudProviderInterface):
sp_token = self._get_sp_token(payload.creds) sp_token = self._get_sp_token(payload.creds)
if sp_token is None: if sp_token is None:
raise AuthenticationException("Could not resolve token for tenant creation") raise AuthenticationException("Could not resolve token for tenant creation")
payload.password = token_urlsafe(16)
create_tenant_body = payload.dict(by_alias=True) create_tenant_body = payload.dict(by_alias=True)
create_tenant_headers = { create_tenant_headers = {

0
atst/domain/csp/policy.py → atst/domain/csp/cloud/policy.py
View File

2
script/include/test_functions.inc.sh
View File

@ -8,7 +8,7 @@ run_python_lint() {
} }
run_python_typecheck() { run_python_typecheck() {
run_command "mypy --ignore-missing-imports --follow-imports=skip atst/domain/csp/cloud.py" run_command "mypy --ignore-missing-imports --follow-imports=skip atst/domain/csp/cloud/__init__.py"
return $? return $?
} }

2
tests/domain/cloud/test_policy.py
View File

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

11
tests/domain/test_portfolio_state_machine.py
View File

@ -1,5 +1,6 @@
import pytest import pytest
import re import re
from unittest import mock
from tests.factories import ( from tests.factories import (
PortfolioStateMachineFactory, PortfolioStateMachineFactory,
@ -81,7 +82,10 @@ def test_state_machine_initialization(portfolio):
assert ["reset", "fail", create_trigger] == started_triggers assert ["reset", "fail", create_trigger] == started_triggers
def test_fsm_transition_start(portfolio: Portfolio): @mock.patch("atst.domain.csp.cloud.MockCloudProvider")
def test_fsm_transition_start(mock_cloud_provider, portfolio: Portfolio):
mock_cloud_provider._authorize.return_value = None
mock_cloud_provider._maybe_raise.return_value = None
sm: PortfolioStateMachine = PortfolioStateMachineFactory.create(portfolio=portfolio) sm: PortfolioStateMachine = PortfolioStateMachineFactory.create(portfolio=portfolio)
assert sm.portfolio assert sm.portfolio
assert sm.state == FSMStates.UNSTARTED assert sm.state == FSMStates.UNSTARTED
@ -103,7 +107,7 @@ def test_fsm_transition_start(portfolio: Portfolio):
] ]
# Should source all creds for portfolio? might be easier to manage than per-step specific ones # Should source all creds for portfolio? might be easier to manage than per-step specific ones
creds = {"username": "mock-cloud", "password": "shh"} creds = {"username": "mock-cloud", "password": "shh"} # pragma: allowlist secret
if portfolio.csp_data is not None: if portfolio.csp_data is not None:
csp_data = portfolio.csp_data csp_data = portfolio.csp_data
else: else:
@ -118,7 +122,7 @@ def test_fsm_transition_start(portfolio: Portfolio):
portfolio_data = { portfolio_data = {
"user_id": user_id, "user_id": user_id,
"password": "jklfsdNCVD83nklds2#202", "password": "jklfsdNCVD83nklds2#202", # pragma: allowlist secret
"domain_name": domain_name, "domain_name": domain_name,
"first_name": ppoc.first_name, "first_name": ppoc.first_name,
"last_name": ppoc.last_name, "last_name": ppoc.last_name,
@ -143,7 +147,6 @@ def test_fsm_transition_start(portfolio: Portfolio):
config = {"billing_account_name": "billing_account_name"} config = {"billing_account_name": "billing_account_name"}
for expected_state in expected_states: for expected_state in expected_states:
print(expected_state)
collected_data = dict( collected_data = dict(
list(csp_data.items()) + list(portfolio_data.items()) + list(config.items()) list(csp_data.items()) + list(portfolio_data.items()) + list(config.items())
) )