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

rename csp method disable_user arg

Browse Source
This commit is contained in:
Philip Kalinsky 2020-02-25 13:46:09 -05:00
parent 08ca093eda
commit e9d120ecae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/csp/cloud/azure_cloud_provider.py
View File

@ -311,7 +311,7 @@ class AzureCloudProvider(CloudProviderInterface):
management_group_id=management_group_id, 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) sp_token = self._get_tenant_principal_token(tenant_id)
if sp_token is None: if sp_token is None:
raise AuthenticationException("Could not resolve token in disable user") raise AuthenticationException("Could not resolve token in disable user")
@ -321,7 +321,7 @@ class AzureCloudProvider(CloudProviderInterface):
try: try:
result = self.sdk.requests.delete( 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, headers=headers,
timeout=30, timeout=30,
) )

2
atst/domain/csp/cloud/mock_cloud_provider.py
View File

@ -417,7 +417,7 @@ class MockCloudProvider(CloudProviderInterface):
self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION) self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION)
return self._id() 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._authorize(auth_credentials)
self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION) self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION)
self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION) self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION)

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

@ -210,7 +210,7 @@ def test_disable_user(mock_azure: AzureCloudProvider):
assignment_guid = str(uuid4()) assignment_guid = str(uuid4())
management_group_id = 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 = Mock()
mock_result.json.return_value = { mock_result.json.return_value = {