From e9d120ecae307a19f92c5bc671792d32177c635d Mon Sep 17 00:00:00 2001 From: Philip Kalinsky Date: Tue, 25 Feb 2020 13:46:09 -0500 Subject: [PATCH] rename csp method disable_user arg --- atst/domain/csp/cloud/azure_cloud_provider.py | 4 ++-- atst/domain/csp/cloud/mock_cloud_provider.py | 2 +- tests/domain/cloud/test_azure_csp.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atst/domain/csp/cloud/azure_cloud_provider.py b/atst/domain/csp/cloud/azure_cloud_provider.py index ba799fe4..af893df2 100644 --- a/atst/domain/csp/cloud/azure_cloud_provider.py +++ b/atst/domain/csp/cloud/azure_cloud_provider.py @@ -311,7 +311,7 @@ class AzureCloudProvider(CloudProviderInterface): management_group_id=management_group_id, ) - def disable_user(self, tenant_id, cloud_id): + def disable_user(self, tenant_id, role_assignment_cloud_id): sp_token = self._get_tenant_principal_token(tenant_id) if sp_token is None: raise AuthenticationException("Could not resolve token in disable user") @@ -321,7 +321,7 @@ class AzureCloudProvider(CloudProviderInterface): try: result = self.sdk.requests.delete( - f"{self.sdk.cloud.endpoints.resource_manager}/{cloud_id}?api-version=2015-07-01", + f"{self.sdk.cloud.endpoints.resource_manager}/{role_assignment_cloud_id}?api-version=2015-07-01", headers=headers, timeout=30, ) diff --git a/atst/domain/csp/cloud/mock_cloud_provider.py b/atst/domain/csp/cloud/mock_cloud_provider.py index 87f78b3b..f73044f5 100644 --- a/atst/domain/csp/cloud/mock_cloud_provider.py +++ b/atst/domain/csp/cloud/mock_cloud_provider.py @@ -417,7 +417,7 @@ class MockCloudProvider(CloudProviderInterface): self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION) return self._id() - def disable_user(self, tenant_id, cloud_id): + def disable_user(self, tenant_id, role_assignment_cloud_id): self._authorize(auth_credentials) self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION) self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION) diff --git a/tests/domain/cloud/test_azure_csp.py b/tests/domain/cloud/test_azure_csp.py index 3592f2d4..de085100 100644 --- a/tests/domain/cloud/test_azure_csp.py +++ b/tests/domain/cloud/test_azure_csp.py @@ -210,7 +210,7 @@ def test_disable_user(mock_azure: AzureCloudProvider): assignment_guid = str(uuid4()) management_group_id = str(uuid4()) - assignment_id = f"/providers/Microsoft.Management/managementGroups/{management_group_id}/providers/Microsoft.Authorization/roleAssignments/{assignment_guid}" + assignment_id = f"/providers/Microsoft.Management/managementGroups/{management_group_id}/providers/Microsoft.Authorization/roleAssignments/{assignment_guid}" mock_result = Mock() mock_result.json.return_value = {