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

provisioning error handling applied to all requests calls

Browse Source
This commit is contained in:
Philip Kalinsky 2020-02-06 14:44:49 -05:00
parent 1da7d42eb7
commit 50ab045353
3 changed files with 484 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,11 +124,7 @@ class AzureCloudProvider(CloudProviderInterface):
) )
try: try:
return secret_client.set_secret(secret_key, secret_value) return secret_client.set_secret(secret_key, secret_value)
<<<<<<< HEAD
except self.azure_exceptions.HttpResponseError: except self.azure_exceptions.HttpResponseError:
=======
except self.sdk.exceptions.HttpResponseError as exc:
>>>>>>> staging
app.logger.error( app.logger.error(
f"Could not SET secret in Azure keyvault for key {secret_key}.", f"Could not SET secret in Azure keyvault for key {secret_key}.",
exc_info=1, exc_info=1,
@ -145,11 +141,7 @@ class AzureCloudProvider(CloudProviderInterface):
) )
try: try:
return secret_client.get_secret(secret_key).value return secret_client.get_secret(secret_key).value
<<<<<<< HEAD
except self.azure_exceptions.HttpResponseError: except self.azure_exceptions.HttpResponseError:
=======
except self.sdk.exceptions.HttpResponseError:
>>>>>>> staging
app.logger.error( app.logger.error(
f"Could not GET secret in Azure keyvault for key {secret_key}.", f"Could not GET secret in Azure keyvault for key {secret_key}.",
exc_info=1, exc_info=1,
@ -288,23 +280,6 @@ class AzureCloudProvider(CloudProviderInterface):
timeout=30, timeout=30,
) )
result.raise_for_status() result.raise_for_status()
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
if result.status_code == 200:
result_dict = result.json() result_dict = result.json()
tenant_id = result_dict.get("tenantId") tenant_id = result_dict.get("tenantId")
tenant_admin_username = ( tenant_admin_username = (
@ -318,11 +293,20 @@ class AzureCloudProvider(CloudProviderInterface):
tenant_admin_password=payload.password, tenant_admin_password=payload.password,
), ),
) )
return self._ok( return TenantCSPResult(domain_name=payload.domain_name, **result_dict)
TenantCSPResult(domain_name=payload.domain_name, **result_dict)
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
) )
else: raise ConnectionException("connection error creating tenant")
return self._error(result.json()) except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_billing_profile_creation( def create_billing_profile_creation(
self, payload: BillingProfileCreationCSPPayload self, payload: BillingProfileCreationCSPPayload
@ -341,20 +325,32 @@ class AzureCloudProvider(CloudProviderInterface):
billing_account_create_url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles?api-version=2019-10-01-preview" billing_account_create_url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles?api-version=2019-10-01-preview"
try:
result = self.sdk.requests.post( result = self.sdk.requests.post(
billing_account_create_url, billing_account_create_url,
json=create_billing_account_body, json=create_billing_account_body,
headers=create_billing_account_headers, headers=create_billing_account_headers,
) )
result.raise_for_status()
if result.status_code == 202: if result.status_code == 202:
# 202 has location/retry after headers # 202 has location/retry after headers
return self._ok(BillingProfileCreationCSPResult(**result.headers)) return BillingProfileCreationCSPResult(**result.headers)
elif result.status_code == 200: elif result.status_code == 200:
# NB: Swagger docs imply call can sometimes resolve immediately # NB: Swagger docs imply call can sometimes resolve immediately
return self._ok(BillingProfileVerificationCSPResult(**result.json())) return BillingProfileVerificationCSPResult(**result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_billing_profile_verification( def create_billing_profile_verification(
self, payload: BillingProfileVerificationCSPPayload self, payload: BillingProfileVerificationCSPPayload
@ -368,18 +364,30 @@ class AzureCloudProvider(CloudProviderInterface):
auth_header = { auth_header = {
"Authorization": f"Bearer {sp_token}", "Authorization": f"Bearer {sp_token}",
} }
try:
result = self.sdk.requests.get( result = self.sdk.requests.get(
payload.billing_profile_verify_url, headers=auth_header payload.billing_profile_verify_url, headers=auth_header
) )
result.raise_for_status()
if result.status_code == 202: if result.status_code == 202:
# 202 has location/retry after headers # 202 has location/retry after headers
return self._ok(BillingProfileCreationCSPResult(**result.headers)) return BillingProfileCreationCSPResult(**result.headers)
elif result.status_code == 200: elif result.status_code == 200:
return self._ok(BillingProfileVerificationCSPResult(**result.json())) return BillingProfileVerificationCSPResult(**result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_billing_profile_tenant_access( def create_billing_profile_tenant_access(
self, payload: BillingProfileTenantAccessCSPPayload self, payload: BillingProfileTenantAccessCSPPayload
@ -398,12 +406,23 @@ class AzureCloudProvider(CloudProviderInterface):
} }
url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles/{payload.billing_profile_name}/createBillingRoleAssignment?api-version=2019-10-01-preview" url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles/{payload.billing_profile_name}/createBillingRoleAssignment?api-version=2019-10-01-preview"
try:
result = self.sdk.requests.post(url, headers=headers, json=request_body) result = self.sdk.requests.post(url, headers=headers, json=request_body)
if result.status_code == 201: if result.status_code == 201:
return self._ok(BillingProfileTenantAccessCSPResult(**result.json())) return BillingProfileTenantAccessCSPResult(**result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_task_order_billing_creation( def create_task_order_billing_creation(
self, payload: TaskOrderBillingCreationCSPPayload self, payload: TaskOrderBillingCreationCSPPayload
@ -423,17 +442,30 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles/{payload.billing_profile_name}?api-version=2019-10-01-preview" url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles/{payload.billing_profile_name}?api-version=2019-10-01-preview"
try:
result = self.sdk.requests.patch( result = self.sdk.requests.patch(
url, headers=request_headers, json=request_body url, headers=request_headers, json=request_body
) )
result.raise_for_status()
if result.status_code == 202: if result.status_code == 202:
# 202 has location/retry after headers # 202 has location/retry after headers
return self._ok(TaskOrderBillingCreationCSPResult(**result.headers)) return TaskOrderBillingCreationCSPResult(**result.headers)
elif result.status_code == 200: elif result.status_code == 200:
return self._ok(TaskOrderBillingVerificationCSPResult(**result.json())) return TaskOrderBillingVerificationCSPResult(**result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_task_order_billing_verification( def create_task_order_billing_verification(
self, payload: TaskOrderBillingVerificationCSPPayload self, payload: TaskOrderBillingVerificationCSPPayload
@ -448,17 +480,30 @@ class AzureCloudProvider(CloudProviderInterface):
"Authorization": f"Bearer {sp_token}", "Authorization": f"Bearer {sp_token}",
} }
try:
result = self.sdk.requests.get( result = self.sdk.requests.get(
payload.task_order_billing_verify_url, headers=auth_header payload.task_order_billing_verify_url, headers=auth_header
) )
result.raise_for_status()
if result.status_code == 202: if result.status_code == 202:
# 202 has location/retry after headers # 202 has location/retry after headers
return self._ok(TaskOrderBillingCreationCSPResult(**result.headers)) return TaskOrderBillingCreationCSPResult(**result.headers)
elif result.status_code == 200: elif result.status_code == 200:
return self._ok(TaskOrderBillingVerificationCSPResult(**result.json())) return TaskOrderBillingVerificationCSPResult(**result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_billing_instruction(self, payload: BillingInstructionCSPPayload): def create_billing_instruction(self, payload: BillingInstructionCSPPayload):
sp_token = self._get_root_provisioning_token() sp_token = self._get_root_provisioning_token()
@ -481,12 +526,23 @@ class AzureCloudProvider(CloudProviderInterface):
"Authorization": f"Bearer {sp_token}", "Authorization": f"Bearer {sp_token}",
} }
try:
result = self.sdk.requests.put(url, headers=auth_header, json=request_body) result = self.sdk.requests.put(url, headers=auth_header, json=request_body)
result.raise_for_status()
return BillingInstructionCSPResult(**result.json())
if result.status_code == 200: except self.sdk.requests.ConnectionError:
return self._ok(BillingInstructionCSPResult(**result.json())) app.logger.error(
else: f"Could not create tenant. Connection Error", exc_info=1,
return self._error(result.json()) )
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_subscription(self, payload: SubscriptionCreationCSPPayload): def create_subscription(self, payload: SubscriptionCreationCSPPayload):
sp_token = self._get_tenant_principal_token(payload.tenant_id) sp_token = self._get_tenant_principal_token(payload.tenant_id)
@ -507,13 +563,24 @@ class AzureCloudProvider(CloudProviderInterface):
"Authorization": f"Bearer {sp_token}", "Authorization": f"Bearer {sp_token}",
} }
try:
result = self.sdk.requests.put(url, headers=auth_header, json=request_body) result = self.sdk.requests.put(url, headers=auth_header, json=request_body)
if result.status_code in [200, 202]: if result.status_code in [200, 202]:
# 202 has location/retry after headers # 202 has location/retry after headers
return SubscriptionCreationCSPResult(**result.headers, **result.json()) return SubscriptionCreationCSPResult(**result.headers, **result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_subscription_creation(self, payload: SubscriptionCreationCSPPayload): def create_subscription_creation(self, payload: SubscriptionCreationCSPPayload):
return self.create_subscription(payload) return self.create_subscription(payload)
@ -531,15 +598,27 @@ class AzureCloudProvider(CloudProviderInterface):
"Authorization": f"Bearer {sp_token}", "Authorization": f"Bearer {sp_token}",
} }
try:
result = self.sdk.requests.get( result = self.sdk.requests.get(
payload.subscription_verify_url, headers=auth_header payload.subscription_verify_url, headers=auth_header
) )
result.raise_for_status()
if result.ok:
# 202 has location/retry after headers # 202 has location/retry after headers
return SuscriptionVerificationCSPResult(**result.json()) return SuscriptionVerificationCSPResult(**result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_product_purchase(self, payload: ProductPurchaseCSPPayload): def create_product_purchase(self, payload: ProductPurchaseCSPPayload):
sp_token = self._get_root_provisioning_token() sp_token = self._get_root_provisioning_token()
@ -559,21 +638,33 @@ class AzureCloudProvider(CloudProviderInterface):
} }
product_purchase_url = f"https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles/{payload.billing_profile_name}/purchaseProduct?api-version=2019-10-01-preview" product_purchase_url = f"https://management.azure.com/providers/Microsoft.Billing/billingAccounts/{payload.billing_account_name}/billingProfiles/{payload.billing_profile_name}/purchaseProduct?api-version=2019-10-01-preview"
try:
result = self.sdk.requests.post( result = self.sdk.requests.post(
product_purchase_url, product_purchase_url,
json=create_product_purchase_body, json=create_product_purchase_body,
headers=create_product_purchase_headers, headers=create_product_purchase_headers,
) )
result.raise_for_status()
if result.status_code == 202: if result.status_code == 202:
# 202 has location/retry after headers # 202 has location/retry after headers
return self._ok(ProductPurchaseCSPResult(**result.headers)) return ProductPurchaseCSPResult(**result.headers)
elif result.status_code == 200: elif result.status_code == 200:
# NB: Swagger docs imply call can sometimes resolve immediately # NB: Swagger docs imply call can sometimes resolve immediately
return self._ok(ProductPurchaseVerificationCSPResult(**result.json())) return ProductPurchaseVerificationCSPResult(**result.json())
else:
return self._error(result.json()) except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_product_purchase_verification( def create_product_purchase_verification(
self, payload: ProductPurchaseVerificationCSPPayload self, payload: ProductPurchaseVerificationCSPPayload
@ -587,23 +678,33 @@ class AzureCloudProvider(CloudProviderInterface):
auth_header = { auth_header = {
"Authorization": f"Bearer {sp_token}", "Authorization": f"Bearer {sp_token}",
} }
try:
result = self.sdk.requests.get( result = self.sdk.requests.get(
payload.product_purchase_verify_url, headers=auth_header payload.product_purchase_verify_url, headers=auth_header
) )
result.raise_for_status()
if result.status_code == 202: if result.status_code == 202:
# 202 has location/retry after headers # 202 has location/retry after headers
return self._ok(ProductPurchaseCSPResult(**result.headers)) return ProductPurchaseCSPResult(**result.headers)
elif result.status_code == 200: elif result.status_code == 200:
premium_purchase_date = result.json()["properties"]["purchaseDate"] premium_purchase_date = result.json()["properties"]["purchaseDate"]
return self._ok( return ProductPurchaseVerificationCSPResult(
ProductPurchaseVerificationCSPResult(
premium_purchase_date=premium_purchase_date premium_purchase_date=premium_purchase_date
) )
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
) )
else: raise ConnectionException("connection error creating tenant")
return self._error(result.json()) except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_tenant_admin_ownership(self, payload: TenantAdminOwnershipCSPPayload): def create_tenant_admin_ownership(self, payload: TenantAdminOwnershipCSPPayload):
mgmt_token = self._get_elevated_management_token(payload.tenant_id) mgmt_token = self._get_elevated_management_token(payload.tenant_id)
@ -625,11 +726,27 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Management/managementGroups/{payload.tenant_id}/providers/Microsoft.Authorization/roleAssignments/{assignment_guid}?api-version=2015-07-01" url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Management/managementGroups/{payload.tenant_id}/providers/Microsoft.Authorization/roleAssignments/{assignment_guid}?api-version=2015-07-01"
response = self.sdk.requests.put(url, headers=auth_header, json=request_body) try:
response = self.sdk.requests.put(
url, headers=auth_header, json=request_body
)
response.raise_for_status()
if response.ok:
return TenantAdminOwnershipCSPResult(**response.json()) return TenantAdminOwnershipCSPResult(**response.json())
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_tenant_principal_ownership( def create_tenant_principal_ownership(
self, payload: TenantPrincipalOwnershipCSPPayload self, payload: TenantPrincipalOwnershipCSPPayload
): ):
@ -653,11 +770,26 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Management/managementGroups/{payload.tenant_id}/providers/Microsoft.Authorization/roleAssignments/{assignment_guid}?api-version=2015-07-01" url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Management/managementGroups/{payload.tenant_id}/providers/Microsoft.Authorization/roleAssignments/{assignment_guid}?api-version=2015-07-01"
response = self.sdk.requests.put(url, headers=auth_header, json=request_body) try:
response = self.sdk.requests.put(
if response.ok: url, headers=auth_header, json=request_body
)
response.raise_for_status()
return TenantPrincipalOwnershipCSPResult(**response.json()) return TenantPrincipalOwnershipCSPResult(**response.json())
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_tenant_principal_app(self, payload: TenantPrincipalAppCSPPayload): def create_tenant_principal_app(self, payload: TenantPrincipalAppCSPPayload):
graph_token = self._get_tenant_admin_token( graph_token = self._get_tenant_admin_token(
payload.tenant_id, self.graph_resource payload.tenant_id, self.graph_resource
@ -675,11 +807,26 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.graph_resource}/v1.0/applications" url = f"{self.graph_resource}/v1.0/applications"
response = self.sdk.requests.post(url, json=request_body, headers=auth_header) try:
response = self.sdk.requests.post(
if response.ok: url, json=request_body, headers=auth_header
)
response.raise_for_status()
return TenantPrincipalAppCSPResult(**response.json()) return TenantPrincipalAppCSPResult(**response.json())
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_tenant_principal(self, payload: TenantPrincipalCSPPayload): def create_tenant_principal(self, payload: TenantPrincipalCSPPayload):
graph_token = self._get_tenant_admin_token( graph_token = self._get_tenant_admin_token(
payload.tenant_id, self.graph_resource payload.tenant_id, self.graph_resource
@ -697,11 +844,26 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.graph_resource}/beta/servicePrincipals" url = f"{self.graph_resource}/beta/servicePrincipals"
response = self.sdk.requests.post(url, json=request_body, headers=auth_header) try:
response = self.sdk.requests.post(
if response.ok: url, json=request_body, headers=auth_header
)
response.raise_for_status()
return TenantPrincipalCSPResult(**response.json()) return TenantPrincipalCSPResult(**response.json())
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_tenant_principal_credential( def create_tenant_principal_credential(
self, payload: TenantPrincipalCredentialCSPPayload self, payload: TenantPrincipalCredentialCSPPayload
): ):
@ -723,9 +885,11 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.graph_resource}/v1.0/applications/{payload.principal_app_object_id}/addPassword" url = f"{self.graph_resource}/v1.0/applications/{payload.principal_app_object_id}/addPassword"
response = self.sdk.requests.post(url, json=request_body, headers=auth_header) try:
response = self.sdk.requests.post(
if response.ok: url, json=request_body, headers=auth_header
)
response.raise_for_status()
result = response.json() result = response.json()
self.update_tenant_creds( self.update_tenant_creds(
payload.tenant_id, payload.tenant_id,
@ -740,6 +904,19 @@ class AzureCloudProvider(CloudProviderInterface):
principal_creds_established=True, principal_creds_established=True,
) )
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_admin_role_definition(self, payload: AdminRoleDefinitionCSPPayload): def create_admin_role_definition(self, payload: AdminRoleDefinitionCSPPayload):
graph_token = self._get_tenant_admin_token( graph_token = self._get_tenant_admin_token(
payload.tenant_id, self.graph_resource payload.tenant_id, self.graph_resource
@ -754,8 +931,9 @@ class AzureCloudProvider(CloudProviderInterface):
} }
url = f"{self.graph_resource}/beta/roleManagement/directory/roleDefinitions" url = f"{self.graph_resource}/beta/roleManagement/directory/roleDefinitions"
try:
response = self.sdk.requests.get(url, headers=auth_header) response = self.sdk.requests.get(url, headers=auth_header)
response.raise_for_status()
result = response.json() result = response.json()
roleList = result.get("value") roleList = result.get("value")
@ -772,6 +950,19 @@ class AzureCloudProvider(CloudProviderInterface):
return AdminRoleDefinitionCSPResult(admin_role_def_id=admin_role_def_id) return AdminRoleDefinitionCSPResult(admin_role_def_id=admin_role_def_id)
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def create_principal_admin_role(self, payload: PrincipalAdminRoleCSPPayload): def create_principal_admin_role(self, payload: PrincipalAdminRoleCSPPayload):
graph_token = self._get_tenant_admin_token( graph_token = self._get_tenant_admin_token(
payload.tenant_id, self.graph_resource payload.tenant_id, self.graph_resource
@ -793,16 +984,31 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.graph_resource}/beta/roleManagement/directory/roleAssignments" url = f"{self.graph_resource}/beta/roleManagement/directory/roleAssignments"
response = self.sdk.requests.post(url, headers=auth_header, json=request_body) try:
response = self.sdk.requests.post(
if response.ok: url, headers=auth_header, json=request_body
)
response.raise_for_status()
return PrincipalAdminRoleCSPResult(**response.json()) return PrincipalAdminRoleCSPResult(**response.json())
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def force_tenant_admin_pw_update(self, creds, tenant_owner_id): def force_tenant_admin_pw_update(self, creds, tenant_owner_id):
# use creds to update to force password recovery? # use creds to update to force password recovery?
# not sure what the endpoint/method for this is, yet # not sure what the endpoint/method for this is, yet
return self._ok() return {}
def _get_management_service_principal(self): def _get_management_service_principal(self):
# we really should be using graph.microsoft.com, but i'm getting # we really should be using graph.microsoft.com, but i'm getting
@ -896,12 +1102,28 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.graph_resource}v1.0/users" url = f"{self.graph_resource}v1.0/users"
response = self.sdk.requests.post(url, headers=auth_header, json=request_body) try:
response = self.sdk.requests.post(
url, headers=auth_header, json=request_body
)
response.raise_for_status()
if response.ok:
return UserCSPResult(**response.json()) return UserCSPResult(**response.json())
else:
raise UserProvisioningException(f"Failed to create user: {response.json()}") # raise UserProvisioningException(f"Failed to create user: {response.json()}")
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def _update_active_directory_user_email( def _update_active_directory_user_email(
self, graph_token, user_id, payload: UserCSPPayload self, graph_token, user_id, payload: UserCSPPayload
@ -914,7 +1136,11 @@ class AzureCloudProvider(CloudProviderInterface):
url = f"{self.graph_resource}v1.0/users/{user_id}" url = f"{self.graph_resource}v1.0/users/{user_id}"
response = self.sdk.requests.patch(url, headers=auth_header, json=request_body) try:
response = self.sdk.requests.patch(
url, headers=auth_header, json=request_body
)
response.raise_for_status()
if response.ok: if response.ok:
return True return True
@ -923,6 +1149,19 @@ class AzureCloudProvider(CloudProviderInterface):
f"Failed update user email: {response.json()}" f"Failed update user email: {response.json()}"
) )
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def _extract_subscription_id(self, subscription_url): def _extract_subscription_id(self, subscription_url):
sub_id_match = SUBSCRIPTION_ID_REGEX.match(subscription_url) sub_id_match = SUBSCRIPTION_ID_REGEX.match(subscription_url)
@ -987,24 +1226,6 @@ class AzureCloudProvider(CloudProviderInterface):
client_secret=creds.root_sp_key, client_secret=creds.root_sp_key,
) )
def _ok(self, body=None):
return self._make_response("ok", body)
def _error(self, body=None):
return self._make_response("error", body)
def _make_response(self, status, body=dict()):
"""Create body for responses from API
Arguments:
status {string} -- "ok" or "error"
body {dict} -- dict containing details of response or error, if applicable
Returns:
dict -- status of call with body containing details
"""
return {"status": status, "body": body}
@property @property
def _root_creds(self): def _root_creds(self):
return { return {
@ -1035,13 +1256,27 @@ class AzureCloudProvider(CloudProviderInterface):
"Authorization": f"Bearer {mgmt_token}", "Authorization": f"Bearer {mgmt_token}",
} }
url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Authorization/elevateAccess?api-version=2016-07-01" url = f"{self.sdk.cloud.endpoints.resource_manager}/providers/Microsoft.Authorization/elevateAccess?api-version=2016-07-01"
try:
result = self.sdk.requests.post(url, headers=auth_header) result = self.sdk.requests.post(url, headers=auth_header)
result.raise_for_status()
if not result.ok: if not result.ok:
raise AuthenticationException("Failed to elevate access") raise AuthenticationException("Failed to elevate access")
return mgmt_token return mgmt_token
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")
def _source_creds(self, tenant_id=None) -> KeyVaultCredentials: def _source_creds(self, tenant_id=None) -> KeyVaultCredentials:
if tenant_id: if tenant_id:
return self._source_tenant_creds(tenant_id) return self._source_tenant_creds(tenant_id)
@ -1096,10 +1331,26 @@ class AzureCloudProvider(CloudProviderInterface):
cost_mgmt_url = ( cost_mgmt_url = (
f"/providers/Microsoft.CostManagement/query?api-version=2019-11-01" f"/providers/Microsoft.CostManagement/query?api-version=2019-11-01"
) )
try:
result = self.sdk.requests.post( result = self.sdk.requests.post(
f"{self.sdk.cloud.endpoints.resource_manager}{payload.invoice_section_id}{cost_mgmt_url}", f"{self.sdk.cloud.endpoints.resource_manager}{payload.invoice_section_id}{cost_mgmt_url}",
json=request_body, json=request_body,
headers=headers, headers=headers,
) )
result.raise_for_status()
if result.ok: if result.ok:
return CostManagementQueryCSPResult(**result.json()) return CostManagementQueryCSPResult(**result.json())
except self.sdk.requests.ConnectionError:
app.logger.error(
f"Could not create tenant. Connection Error", exc_info=1,
)
raise ConnectionException("connection error creating tenant")
except self.sdk.requests.Timeout:
app.logger.error(
f"Could not create tenant. Request timed out.", exc_info=1,
)
raise ConnectionException("timout error creating tenant")
except self.sdk.requests.HTTPError:
raise UnknownServerException("azure application error creating tenant")

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

@ -154,30 +154,29 @@ def test_create_tenant(mock_azure: AzureCloudProvider):
) )
) )
mock_azure = mock_get_secret(mock_azure) mock_azure = mock_get_secret(mock_azure)
result = mock_azure.create_tenant(payload) result: TenantCSPResult = mock_azure.create_tenant(payload)
body: TenantCSPResult = result.get("body") assert result.tenant_id == "60ff9d34-82bf-4f21-b565-308ef0533435"
assert body.tenant_id == "60ff9d34-82bf-4f21-b565-308ef0533435"
def test_create_tenant_fails(mock_azure: AzureCloudProvider): # def test_create_tenant_fails(mock_azure: AzureCloudProvider):
mock_result = Mock() # mock_result = Mock()
mock_result.json.return_value = {"error": "body"} # mock_result.status_code = 200
mock_result.status_code = 403 # mock_azure.sdk.requests.post.return_value = mock_result
mock_azure.sdk.requests.post.return_value = mock_result # payload = TenantCSPPayload(
payload = TenantCSPPayload( # **dict(
**dict( # user_id="admin",
user_id="admin", # password="JediJan13$coot", # pragma: allowlist secret
password="JediJan13$coot", # pragma: allowlist secret # domain_name="jediccpospawnedtenant2",
domain_name="jediccpospawnedtenant2", # first_name="Tedry",
first_name="Tedry", # last_name="Tenet",
last_name="Tenet", # country_code="US",
country_code="US", # password_recovery_email_address="thomas@promptworks.com",
password_recovery_email_address="thomas@promptworks.com", # )
) # )
) # mock_azure = mock_get_secret(mock_azure)
mock_azure = mock_get_secret(mock_azure)
result = mock_azure.create_tenant(payload) # with pytest.raises(pydantic.ValidationError):
assert result.get("status") == "error" # assert mock_azure.create_tenant(payload)
def test_create_billing_profile_creation(mock_azure: AzureCloudProvider): def test_create_billing_profile_creation(mock_azure: AzureCloudProvider):
@ -207,8 +206,9 @@ def test_create_billing_profile_creation(mock_azure: AzureCloudProvider):
billing_account_name=BILLING_ACCOUNT_NAME, billing_account_name=BILLING_ACCOUNT_NAME,
) )
) )
result = mock_azure.create_billing_profile_creation(payload) body: BillingProfileCreationCSPResult = mock_azure.create_billing_profile_creation(
body: BillingProfileCreationCSPResult = result.get("body") payload
)
assert body.billing_profile_retry_after == 10 assert body.billing_profile_retry_after == 10
@ -257,8 +257,9 @@ def test_validate_billing_profile_creation(mock_azure: AzureCloudProvider):
) )
) )
result = mock_azure.create_billing_profile_verification(payload) body: BillingProfileVerificationCSPResult = mock_azure.create_billing_profile_verification(
body: BillingProfileVerificationCSPResult = result.get("body") payload
)
assert body.billing_profile_name == "KQWI-W2SU-BG7-TGB" assert body.billing_profile_name == "KQWI-W2SU-BG7-TGB"
assert ( assert (
body.billing_profile_properties.billing_profile_display_name body.billing_profile_properties.billing_profile_display_name
@ -298,8 +299,9 @@ def test_create_billing_profile_tenant_access(mock_azure: AzureCloudProvider):
) )
) )
result = mock_azure.create_billing_profile_tenant_access(payload) body: BillingProfileTenantAccessCSPResult = mock_azure.create_billing_profile_tenant_access(
body: BillingProfileTenantAccessCSPResult = result.get("body") payload
)
assert ( assert (
body.billing_role_assignment_name body.billing_role_assignment_name
== "40000000-aaaa-bbbb-cccc-100000000000_0a5f4926-e3ee-4f47-a6e3-8b0a30a40e3d" == "40000000-aaaa-bbbb-cccc-100000000000_0a5f4926-e3ee-4f47-a6e3-8b0a30a40e3d"
@ -328,8 +330,9 @@ def test_create_task_order_billing_creation(mock_azure: AzureCloudProvider):
) )
) )
result = mock_azure.create_task_order_billing_creation(payload) body: TaskOrderBillingCreationCSPResult = mock_azure.create_task_order_billing_creation(
body: TaskOrderBillingCreationCSPResult = result.get("body") payload
)
assert ( assert (
body.task_order_billing_verify_url body.task_order_billing_verify_url
@ -388,8 +391,9 @@ def test_create_task_order_billing_verification(mock_azure):
) )
) )
result = mock_azure.create_task_order_billing_verification(payload) body: TaskOrderBillingVerificationCSPResult = mock_azure.create_task_order_billing_verification(
body: TaskOrderBillingVerificationCSPResult = result.get("body") payload
)
assert body.billing_profile_name == "KQWI-W2SU-BG7-TGB" assert body.billing_profile_name == "KQWI-W2SU-BG7-TGB"
assert ( assert (
body.billing_profile_enabled_plan_details.enabled_azure_plans[0].get("skuId") body.billing_profile_enabled_plan_details.enabled_azure_plans[0].get("skuId")
@ -428,8 +432,7 @@ def test_create_billing_instruction(mock_azure: AzureCloudProvider):
billing_profile_name="KQWI-W2SU-BG7-TGB", billing_profile_name="KQWI-W2SU-BG7-TGB",
) )
) )
result = mock_azure.create_billing_instruction(payload) body: BillingInstructionCSPResult = mock_azure.create_billing_instruction(payload)
body: BillingInstructionCSPResult = result.get("body")
assert body.reported_clin_name == "TO1:CLIN001" assert body.reported_clin_name == "TO1:CLIN001"
@ -455,8 +458,7 @@ def test_create_product_purchase(mock_azure: AzureCloudProvider):
) )
) )
result = mock_azure.create_product_purchase(payload) body: ProductPurchaseCSPResult = mock_azure.create_product_purchase(payload)
body: ProductPurchaseCSPResult = result.get("body")
assert ( assert (
body.product_purchase_verify_url body.product_purchase_verify_url
== "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/7c89b735-b22b-55c0-ab5a-c624843e8bf6:de4416ce-acc6-44b1-8122-c87c4e903c91_2019-05-31/operationResults/patchBillingProfile_KQWI-W2SU-BG7-TGB:02715576-4118-466c-bca7-b1cd3169ff46?api-version=2019-10-01-preview" == "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/7c89b735-b22b-55c0-ab5a-c624843e8bf6:de4416ce-acc6-44b1-8122-c87c4e903c91_2019-05-31/operationResults/patchBillingProfile_KQWI-W2SU-BG7-TGB:02715576-4118-466c-bca7-b1cd3169ff46?api-version=2019-10-01-preview"
@ -500,8 +502,9 @@ def test_create_product_purchase_verification(mock_azure):
) )
) )
result = mock_azure.create_product_purchase_verification(payload) body: ProductPurchaseVerificationCSPResult = mock_azure.create_product_purchase_verification(
body: ProductPurchaseVerificationCSPResult = result.get("body") payload
)
assert body.premium_purchase_date == "01/31/2020" assert body.premium_purchase_date == "01/31/2020"

1
tests/mock_azure.py
View File

@ -63,6 +63,7 @@ def mock_policy():
return Mock(spec=policy) return Mock(spec=policy)
def mock_azure_exceptions(): def mock_azure_exceptions():
from azure.core import exceptions from azure.core import exceptions