From f9a45e68bb3c37d2000adb6c4ca49c15a3c909d0 Mon Sep 17 00:00:00 2001 From: Philip Kalinsky Date: Fri, 6 Mar 2020 10:50:06 -0500 Subject: [PATCH] tenant admin pw reset use secrets lib, csp calls do not return the result data class --- atat/domain/csp/cloud/azure_cloud_provider.py | 4 +--- atat/domain/csp/cloud/mock_cloud_provider.py | 2 -- tests/domain/cloud/test_azure_csp.py | 1 - tests/domain/test_portfolio_state_machine.py | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/atat/domain/csp/cloud/azure_cloud_provider.py b/atat/domain/csp/cloud/azure_cloud_provider.py index 82f64bbb..61cd5ea4 100644 --- a/atat/domain/csp/cloud/azure_cloud_provider.py +++ b/atat/domain/csp/cloud/azure_cloud_provider.py @@ -1,5 +1,4 @@ import json -import random import string from secrets import token_hex, token_urlsafe from uuid import uuid4 @@ -1603,8 +1602,7 @@ class AzureCloudProvider(CloudProviderInterface): "passwordProfile": { "forceChangePasswordNextSignIn": True, "forceChangePasswordNextSignInWithMfa": False, - "password": payload.new_password - or "".join(random.choice(string.ascii_letters) for i in range(15)), + "password": payload.new_password or token_urlsafe(16), } } diff --git a/atat/domain/csp/cloud/mock_cloud_provider.py b/atat/domain/csp/cloud/mock_cloud_provider.py index a69874ad..8027d379 100644 --- a/atat/domain/csp/cloud/mock_cloud_provider.py +++ b/atat/domain/csp/cloud/mock_cloud_provider.py @@ -52,7 +52,6 @@ from .models import ( TenantAdminOwnershipCSPPayload, TenantAdminOwnershipCSPResult, TenantAdminCredentialResetCSPPayload, - TenantAdminCredentialResetCSPResult, TenantCSPPayload, TenantCSPResult, TenantPrincipalAppCSPPayload, @@ -343,7 +342,6 @@ class MockCloudProvider(CloudProviderInterface): self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION) self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION) self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION) - return TenantAdminCredentialResetCSPResult() def create_tenant_principal_ownership( self, payload: TenantPrincipalOwnershipCSPPayload diff --git a/tests/domain/cloud/test_azure_csp.py b/tests/domain/cloud/test_azure_csp.py index 81425bb0..b2db5f93 100644 --- a/tests/domain/cloud/test_azure_csp.py +++ b/tests/domain/cloud/test_azure_csp.py @@ -57,7 +57,6 @@ from atat.domain.csp.cloud.models import ( TenantAdminOwnershipCSPPayload, TenantAdminOwnershipCSPResult, TenantAdminCredentialResetCSPPayload, - TenantAdminCredentialResetCSPResult, TenantCSPPayload, TenantCSPResult, TenantPrincipalAppCSPPayload, diff --git a/tests/domain/test_portfolio_state_machine.py b/tests/domain/test_portfolio_state_machine.py index ab7f4414..9fc69323 100644 --- a/tests/domain/test_portfolio_state_machine.py +++ b/tests/domain/test_portfolio_state_machine.py @@ -305,9 +305,9 @@ def test_fsm_transition_start( FSMStates.INITIAL_MGMT_GROUP_CREATED, FSMStates.INITIAL_MGMT_GROUP_VERIFICATION_CREATED, FSMStates.TENANT_ADMIN_OWNERSHIP_CREATED, - FSMStates.TENANT_ADMIN_CREDENTIAL_RESET_CREATED, FSMStates.TENANT_PRINCIPAL_OWNERSHIP_CREATED, FSMStates.BILLING_OWNER_CREATED, + FSMStates.TENANT_ADMIN_CREDENTIAL_RESET_CREATED, FSMStates.COMPLETED, ]